Swallow ObjectDisposedException (#2844)

open-telemetry · Feb 2, 2022 · 1b8599b · 1b8599b
1 parent 102ac27
commit 1b8599b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/OpenTelemetry/BatchExportProcessor.cs b/src/OpenTelemetry/BatchExportProcessor.cs
@@ -240,6 +240,7 @@ private void ExporterProc()
                     }
                     catch (ObjectDisposedException)
                     {
+                        // the exporter is somehow disposed before the worker thread could finish its job
                         return;
                     }
                 }
@@ -251,8 +252,16 @@ private void ExporterProc()
                         this.exporter.Export(batch);
                     }
 
-                    this.dataExportedNotification.Set();
-                    this.dataExportedNotification.Reset();
+                    try
+                    {
+                        this.dataExportedNotification.Set();
+                        this.dataExportedNotification.Reset();
+                    }
+                    catch (ObjectDisposedException)
+                    {
+                        // the exporter is somehow disposed before the worker thread could finish its job
+                        return;
+                    }
                 }
 
                 if (this.circularBuffer.RemovedCount >= this.shutdownDrainTarget)

diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md
@@ -8,6 +8,10 @@
 * Fail-fast when using AddView with guaranteed conflict.
   ([2751](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2751))
 
+* Swallow `ObjectDisposedException` from the `BatchExportProcessor` worker
+  thread.
+  ([2844](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2844))
+
 ## 1.2.0-rc1
 
 Released 2021-Nov-29