From a47dccf128c53f0ecfb83045dd75397a694886eb Mon Sep 17 00:00:00 2001
From: Tyler Yahn <codingalias@gmail.com>
Date: Tue, 13 Apr 2021 10:13:51 -0700
Subject: [PATCH 1/2] Remove the WithDisabled option from Jaeger exporter

---
 CHANGELOG.md                          |  2 ++
 exporters/trace/jaeger/jaeger.go      | 15 ---------------
 exporters/trace/jaeger/jaeger_test.go | 16 ----------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5008d9bcfad..7927e392a33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,6 +90,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`. (TBD)
 
 ## [0.19.0] - 2021-03-18
 
diff --git a/exporters/trace/jaeger/jaeger.go b/exporters/trace/jaeger/jaeger.go
index f397fd9d820..038e4ede134 100644
--- a/exporters/trace/jaeger/jaeger.go
+++ b/exporters/trace/jaeger/jaeger.go
@@ -57,8 +57,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
@@ -82,18 +80,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 {
@@ -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 {
diff --git a/exporters/trace/jaeger/jaeger_test.go b/exporters/trace/jaeger/jaeger_test.go
index d74e6cde6c2..a8313fd8943 100644
--- a/exporters/trace/jaeger/jaeger_test.go
+++ b/exporters/trace/jaeger/jaeger_test.go
@@ -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 {
@@ -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),

From 971520fb067145e5a0f4bc27f733acd96ab63ce0 Mon Sep 17 00:00:00 2001
From: Tyler Yahn <codingalias@gmail.com>
Date: Tue, 13 Apr 2021 10:55:03 -0700
Subject: [PATCH 2/2] Update PR number

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7927e392a33..13686158f7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,7 +91,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - 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`. (TBD)
+  To disable the exporter unregister it from the `TracerProvider` or use a no-operation `TracerProvider`. (#1806)
 
 ## [0.19.0] - 2021-03-18