Applied the dependency injection pattern to OtlpExporter (#1942)

* Applied the dependency injection pattern to OtlpExporter. * Changelog update.
open-telemetry · Mar 29, 2021 · efe2d96 · efe2d96
1 parent 5bf2b42
commit efe2d96
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md b/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+* When using OpenTelemetry.Extensions.Hosting you can now bind
+  `JaegerExporterOptions` to `IConfiguration` using the `Configure` extension
+  (ex:
+  `services.Configure<JaegerExporterOptions>(this.Configuration.GetSection("Jaeger"));`).
+  ([#1889](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1889))
+
 ## 1.1.0-beta1
 
 Released 2021-Mar-19

diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
@@ -13,6 +13,11 @@ please check the latest changes
   [spec](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/common.md).
   ([#1919](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1919))
 
+* When using OpenTelemetry.Extensions.Hosting you can now bind
+  `OtlpExporterOptions` to `IConfiguration` using the `Configure` extension (ex:
+  `services.Configure<OtlpExporterOptions>(this.Configuration.GetSection("Otlp"));`).
+  ([#1942](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1942))
+
 ## 1.1.0-beta1
 
 Released 2021-Mar-19

diff --git a/...emetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj b/...emetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj
@@ -49,6 +49,7 @@
     <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\PooledList.cs" Link="Includes\PooledList.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\PeerServiceResolver.cs" Link="Includes\PeerServiceResolver.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\ResourceSemanticConventions.cs" Link="Includes\ResourceSemanticConventions.cs" />
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\ServiceProviderExtensions.cs" Link="Includes\ServiceProviderExtensions.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporterHelperExtensions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporterHelperExtensions.cs
@@ -37,7 +37,19 @@ public static TracerProviderBuilder AddOtlpExporter(this TracerProviderBuilder b
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            var exporterOptions = new OtlpExporterOptions();
+            if (builder is IDeferredTracerProviderBuilder deferredTracerProviderBuilder)
+            {
+                return deferredTracerProviderBuilder.Configure((sp, builder) =>
+                {
+                    AddOtlpExporter(builder, sp.GetOptions<OtlpExporterOptions>(), configure);
+                });
+            }
+
+            return AddOtlpExporter(builder, new OtlpExporterOptions(), configure);
+        }
+
+        private static TracerProviderBuilder AddOtlpExporter(TracerProviderBuilder builder, OtlpExporterOptions exporterOptions, Action<OtlpExporterOptions> configure = null)
+        {
             configure?.Invoke(exporterOptions);
             var otlpExporter = new OtlpTraceExporter(exporterOptions);
 

diff --git a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+* When using OpenTelemetry.Extensions.Hosting you can now bind
+  `JaegerExporterOptions` to `IConfiguration` using the `Configure` extension
+  (ex:
+  `services.Configure<ZipkinExporterOptions>(this.Configuration.GetSection("Zipkin"));`).
+  ([#1889](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1889))
+
 ## 1.1.0-beta1
 
 Released 2021-Mar-19