Skip to content

Commit

Permalink
Remove the WithDisabled option from Jaeger exporter (#1806)
Browse files Browse the repository at this point in the history
* Remove the WithDisabled option from Jaeger exporter

* Update PR number
  • Loading branch information
MrAlias authored Apr 19, 2021
1 parent 6867faa commit 1b9f16d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 31 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- The `trace.FlagsDebug` and `trace.FlagsDeferred` constants have been removed and will be localized to the B3 propagator. (#1770)
- Remove `Process` configuration, `WithProcessFromEnv` and `ProcessFromEnv`, and type from the Jaeger exporter package.
The information that could be configured in the `Process` struct should be configured in a `Resource` instead. (#1776, #1804)
- Remove the `WithDisabled` option from the Jaeger exporter.
To disable the exporter unregister it from the `TracerProvider` or use a no-operation `TracerProvider`. (#1806)

## [0.19.0] - 2021-03-18

Expand Down
15 changes: 0 additions & 15 deletions exporters/trace/jaeger/jaeger.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ type options struct {

// TracerProviderOptions defines the options for tracer provider of sdk.
TracerProviderOptions []sdktrace.TracerProviderOption

Disabled bool
}

// WithBufferMaxCount defines the total number of traces that can be buffered in memory
Expand All @@ -81,18 +79,8 @@ func WithSDKOptions(opts ...sdktrace.TracerProviderOption) Option {
}
}

// WithDisabled option will cause pipeline methods to use
// a no-op provider
func WithDisabled(disabled bool) Option {
return func(o *options) {
o.Disabled = disabled
}
}

// NewRawExporter returns an OTel Exporter implementation that exports the
// collected spans to Jaeger.
//
// It will IGNORE Disabled option.
func NewRawExporter(endpointOption EndpointOption, opts ...Option) (*Exporter, error) {
uploader, err := endpointOption()
if err != nil {
Expand Down Expand Up @@ -149,9 +137,6 @@ func NewExportPipeline(endpointOption EndpointOption, opts ...Option) (trace.Tra
for _, opt := range opts {
opt(&o)
}
if o.Disabled {
return trace.NewNoopTracerProvider(), func() {}, nil
}

exporter, err := NewRawExporter(endpointOption, opts...)
if err != nil {
Expand Down
16 changes: 0 additions & 16 deletions exporters/trace/jaeger/jaeger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,6 @@ func TestInstallNewPipeline(t *testing.T) {
endpoint: WithAgentEndpoint(),
expectedProvider: &sdktrace.TracerProvider{},
},
{
name: "with disabled",
endpoint: WithCollectorEndpoint(collectorEndpoint),
options: []Option{
WithDisabled(true),
},
expectedProvider: trace.NewNoopTracerProvider(),
},
}

for _, tc := range testCases {
Expand Down Expand Up @@ -101,14 +93,6 @@ func TestNewExportPipeline(t *testing.T) {
endpoint: WithCollectorEndpoint(collectorEndpoint),
expectedProviderType: &sdktrace.TracerProvider{},
},
{
name: "with disabled",
endpoint: WithCollectorEndpoint(collectorEndpoint),
options: []Option{
WithDisabled(true),
},
expectedProviderType: trace.NewNoopTracerProvider(),
},
{
name: "always on",
endpoint: WithCollectorEndpoint(collectorEndpoint),
Expand Down

0 comments on commit 1b9f16d

Please sign in to comment.