Merge branch 'main' into vibankwa/otlp-retry-part1-client-refactor

open-telemetry · Feb 9, 2024 · 52b20b0 · 52b20b0
2 parents 5fb05a6 + f214d27
commit 52b20b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md
@@ -12,6 +12,7 @@
   `SqlClientTraceInstrumentationOptions`.
   ([#5285](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5285))
 * **Breaking Change**: Stop emitting `db.statement_type` attribute.
+  This attribute was never a part of the [semantic conventions](https://github.com/open-telemetry/semantic-conventions/blob/v1.24.0/docs/database/database-spans.md#call-level-attributes).
   ([#5301](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5301))
 
 ## 1.6.0-beta.3

diff --git a/test/Benchmarks/Logs/LogBenchmarks.cs b/test/Benchmarks/Logs/LogBenchmarks.cs
@@ -72,6 +72,15 @@ public LogBenchmarks()
         this.loggerWithThreeProcessors = this.loggerFactoryWithThreeProcessor.CreateLogger<LogBenchmarks>();
     }
 
+    [GlobalCleanup]
+    public void GlobalCleanup()
+    {
+        this.loggerFactoryWithNoListener.Dispose();
+        this.loggerFactoryWithOneProcessor.Dispose();
+        this.loggerFactoryWithTwoProcessor.Dispose();
+        this.loggerFactoryWithThreeProcessor.Dispose();
+    }
+
     [Benchmark]
     public void NoListenerStringInterpolation()
     {