Make the SDK more forgiving for ObjectDisposedException (open-telemet…

…ry#3291)
stephenlautier · May 19, 2022 · fd63991 · fd63991
1 parent a3e619f
commit fd63991
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/src/OpenTelemetry/BatchExportProcessor.cs b/src/OpenTelemetry/BatchExportProcessor.cs
@@ -100,7 +100,13 @@ protected override void OnExport(T data)
             {
                 if (this.circularBuffer.Count >= this.maxExportBatchSize)
                 {
-                    this.exportTrigger.Set();
+                    try
+                    {
+                        this.exportTrigger.Set();
+                    }
+                    catch (ObjectDisposedException)
+                    {
+                    }
                 }
 
                 return; // enqueue succeeded
@@ -121,7 +127,14 @@ protected override bool OnForceFlush(int timeoutMilliseconds)
                 return true; // nothing to flush
             }
 
-            this.exportTrigger.Set();
+            try
+            {
+                this.exportTrigger.Set();
+            }
+            catch (ObjectDisposedException)
+            {
+                return false;
+            }
 
             if (timeoutMilliseconds == 0)
             {
@@ -186,7 +199,15 @@ protected override bool OnForceFlush(int timeoutMilliseconds)
         protected override bool OnShutdown(int timeoutMilliseconds)
         {
             this.shutdownDrainTarget = this.circularBuffer.AddedCount;
-            this.shutdownTrigger.Set();
+
+            try
+            {
+                this.shutdownTrigger.Set();
+            }
+            catch (ObjectDisposedException)
+            {
+                return false;
+            }
 
             OpenTelemetrySdkEventSource.Log.DroppedExportProcessorItems(this.GetType().Name, this.exporter.GetType().Name, this.droppedCount);
 

diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 * Fix null reference exception when a metric view does not match an instrument.
   ([#3285](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3285))
+* Swallow `ObjectDisposedException` in `BatchExportProcessor` and
+* `PeriodicExportingMetricReader`.
+  ([#3291](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3291))
 
 ## 1.3.0-beta.2
 

diff --git a/src/OpenTelemetry/Metrics/PeriodicExportingMetricReader.cs b/src/OpenTelemetry/Metrics/PeriodicExportingMetricReader.cs
@@ -75,7 +75,14 @@ protected override bool OnShutdown(int timeoutMilliseconds)
         {
             var result = true;
 
-            this.shutdownTrigger.Set();
+            try
+            {
+                this.shutdownTrigger.Set();
+            }
+            catch (ObjectDisposedException)
+            {
+                return false;
+            }
 
             if (timeoutMilliseconds == Timeout.Infinite)
             {