Zipkin Jaeger Exporter fixes

open-telemetry · Feb 23, 2022 · e8e10e7 · e8e10e7
1 parent 72ade32
commit e8e10e7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md b/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md
@@ -7,6 +7,10 @@
   in the [specification](https://github.com/open-telemetry/opentelemetry-specification/blob/9a0a3300c6269c2837a1d7c9c5232ec816f63222/specification/sdk-environment-variables.md?plain=1#L129).
   ([#2914](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2914))
 
+* Use SuppressInstrumentationScope in Export method to prevent
+  internal operations from being instrumented.
+  ([#2935](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2935))
+
 ## 1.2.0-rc2
 
 Released 2022-Feb-02

diff --git a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs
@@ -94,6 +94,9 @@ internal JaegerExporter(JaegerExporterOptions options, TProtocolFactory protocol
         /// <inheritdoc/>
         public override ExportResult Export(in Batch<Activity> activityBatch)
         {
+            // Prevent Jaeger's HTTP operations from being instrumented.
+            using var scope = SuppressInstrumentationScope.Begin();
+
             try
             {
                 if (this.Batch == null)

diff --git a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Modified Export method to catch all exceptions.
+  ([#2935](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2935))
+
 ## 1.2.0-rc2
 
 Released 2022-Feb-02

diff --git a/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs b/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs
@@ -60,16 +60,16 @@ public ZipkinExporter(ZipkinExporterOptions options, HttpClient client = null)
         /// <inheritdoc/>
         public override ExportResult Export(in Batch<Activity> batch)
         {
-            if (this.LocalEndpoint == null)
-            {
-                this.SetLocalEndpointFromResource(this.ParentProvider.GetResource());
-            }
-
             // Prevent Zipkin's HTTP operations from being instrumented.
             using var scope = SuppressInstrumentationScope.Begin();
 
             try
             {
+                if (this.LocalEndpoint == null)
+                {
+                    this.SetLocalEndpointFromResource(this.ParentProvider.GetResource());
+                }
+
                 var requestUri = this.options.Endpoint;
 
                 using var request = new HttpRequestMessage(HttpMethod.Post, requestUri)