Merge pull request #8 from fidelity/Fix-Issue-1848

remove the SendDisposedMessage method
fidelity-contributions · Aug 31, 2022 · 41ce82d · 41ce82d
2 parents 3690c47 + 0b7aea7
commit 41ce82d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/OpenTelemetry.Exporter.Console/CHANGELOG.md b/src/OpenTelemetry.Exporter.Console/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 ## Unreleased
 
-* Changed error handling, `ConsoleExporter` will only output an error message with two call stacks the first time,
-  then the data will simply be deleted and nothing will be output.
+* Changed error handling, `ConsoleExporter` will only output an error message
+  with two call stacks the first time,
+  then the data will simply be dropped and nothing will be output.
   ([#1848](https://github.com/open-telemetry/opentelemetry-dotnet/issues/1848))
 
 ## 1.4.0-alpha.2

diff --git a/src/OpenTelemetry.Exporter.Console/ConsoleLogRecordExporter.cs b/src/OpenTelemetry.Exporter.Console/ConsoleLogRecordExporter.cs
@@ -38,7 +38,21 @@ public override ExportResult Export(in Batch<LogRecord> batch)
         {
             if (this.disposed)
             {
-                this.SendDisposedMessage();
+                if (!this.isDisposeMessageSent)
+                {
+                    lock (this.disposeLockObj)
+                    {
+                        if (!this.isDisposeMessageSent)
+                        {
+                            this.isDisposeMessageSent = true;
+                            this.WriteLine("The console exporter is still being invoked after it has been disposed. This could be the result of invalid lifecycle management of the OpenTelemetry .NET SDK.");
+                            this.WriteLine(Environment.StackTrace);
+                            this.WriteLine(Environment.NewLine + "The console exporter has been disposed");
+                            this.WriteLine(this.disposedStackTrace);
+                        }
+                    }
+                }
+
                 return ExportResult.Failure;
             }
 
@@ -157,23 +171,5 @@ protected override void Dispose(bool disposing)
 
             base.Dispose(disposing);
         }
-
-        private void SendDisposedMessage()
-        {
-            if (!this.isDisposeMessageSent)
-            {
-                lock (this.disposeLockObj)
-                {
-                    if (!this.isDisposeMessageSent)
-                    {
-                        this.isDisposeMessageSent = true;
-                        this.WriteLine("The console exporter is still being invoked after it has been disposed. This could be the result of invalid lifecycle management of the OpenTelemetry .NET SDK.");
-                        this.WriteLine(Environment.StackTrace);
-                        this.WriteLine(Environment.NewLine + "The console exporter has been disposed");
-                        this.WriteLine(this.disposedStackTrace);
-                    }
-                }
-            }
-        }
     }
 }