use InstrumentationHandleManager

Author: matt-hensley

src/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs

@@ -53,7 +53,8 @@ public SqlClientDiagnosticListener(string sourceName)
 
     public override void OnEventWritten(string name, object? payload)
     {
-        if (SqlClientInstrumentation.TracingHandles == 0 && SqlClientInstrumentation.MetricHandles == 0)
+        if (SqlClientInstrumentation.Instance.HandleManager.TracingHandles == 0
+            && SqlClientInstrumentation.Instance.HandleManager.MetricHandles == 0)
         {
             return;
         }
@@ -304,7 +305,7 @@ public override void OnEventWritten(string name, object? payload)
 
     private void RecordDuration(Activity? activity, object? payload, bool hasError = false)
     {
-        if (SqlClientInstrumentation.MetricHandles == 0)
+        if (SqlClientInstrumentation.Instance.HandleManager.MetricHandles == 0)
         {
             return;
         }

src/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlEventSourceListener.netfx.cs

@@ -124,7 +124,8 @@ private void OnBeginExecute(EventWrittenEventArgs eventData)
                 (https://github.com/dotnet/SqlClient/blob/f4568ce68da21db3fe88c0e72e1287368aaa1dc8/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs#L6641)
          */
 
-        if (SqlClientInstrumentation.TracingHandles == 0 && SqlClientInstrumentation.MetricHandles == 0)
+        if (SqlClientInstrumentation.Instance.HandleManager.TracingHandles == 0
+            && SqlClientInstrumentation.Instance.HandleManager.MetricHandles == 0)
         {
             return;
         }
@@ -186,7 +187,8 @@ private void OnEndExecute(EventWrittenEventArgs eventData)
             [2] -> SqlExceptionNumber
          */
 
-        if (SqlClientInstrumentation.TracingHandles == 0 && SqlClientInstrumentation.MetricHandles == 0)
+        if (SqlClientInstrumentation.Instance.HandleManager.TracingHandles == 0
+            && SqlClientInstrumentation.Instance.HandleManager.MetricHandles == 0)
         {
             return;
         }
@@ -197,7 +199,8 @@ private void OnEndExecute(EventWrittenEventArgs eventData)
             return;
         }
 
-        if (SqlClientInstrumentation.TracingHandles == 0 && SqlClientInstrumentation.MetricHandles != 0)
+        if (SqlClientInstrumentation.Instance.HandleManager.TracingHandles == 0
+            && SqlClientInstrumentation.Instance.HandleManager.MetricHandles != 0)
         {
             this.RecordDuration(null, eventData);
             return;
@@ -239,7 +242,7 @@ private void OnEndExecute(EventWrittenEventArgs eventData)
 
     private void RecordDuration(Activity? activity, EventWrittenEventArgs eventData)
     {
-        if (SqlClientInstrumentation.MetricHandles == 0)
+        if (SqlClientInstrumentation.Instance.HandleManager.MetricHandles == 0)
         {
             return;
         }

src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj

@@ -23,6 +23,7 @@
     <Compile Include="$(RepoRoot)\src\Shared\EnvironmentVariables\*.cs" Link="Includes\EnvironmentVariables\%(Filename).cs" />
     <Compile Include="$(RepoRoot)\src\Shared\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
     <Compile Include="$(RepoRoot)\src\Shared\Guard.cs" Link="Includes\Guard.cs" />
+    <Compile Include="$(RepoRoot)\src\Shared\InstrumentationHandleManager.cs" Link="Includes\InstrumentationHandleManager.cs" />
     <Compile Include="$(RepoRoot)\src\Shared\ListenerHandler.cs" Link="Includes\ListenerHandler.cs" />
     <Compile Include="$(RepoRoot)\src\Shared\NullableAttributes.cs" Link="Includes\NullableAttributes.cs" />
     <Compile Include="$(RepoRoot)\src\Shared\PropertyFetcher.cs" Link="Includes\PropertyFetcher.cs" />

src/OpenTelemetry.Instrumentation.SqlClient/SqlClientInstrumentation.cs

@@ -18,12 +18,12 @@ internal sealed class SqlClientInstrumentation : IDisposable
 {
     public static readonly SqlClientInstrumentation Instance = new SqlClientInstrumentation();
 
+    public readonly InstrumentationHandleManager HandleManager = new();
+
     internal const string SqlClientDiagnosticListenerName = "SqlClientDiagnosticListener";
 #if NET
     internal const string SqlClientTrimmingUnsupportedMessage = "Trimming is not yet supported with SqlClient instrumentation.";
 #endif
-    internal static int MetricHandles;
-    internal static int TracingHandles;
 #if NETFRAMEWORK
     private readonly SqlEventSourceListener sqlEventSourceListener;
 #else
@@ -62,10 +62,6 @@ private SqlClientInstrumentation()
 
     public static SqlClientTraceInstrumentationOptions TracingOptions { get; set; } = new SqlClientTraceInstrumentationOptions();
 
-    public static IDisposable AddMetricHandle() => new MetricHandle();
-
-    public static IDisposable AddTracingHandle() => new TracingHandle();
-
     /// <inheritdoc/>
     public void Dispose()
     {
@@ -75,48 +71,4 @@ public void Dispose()
         this.diagnosticSourceSubscriber?.Dispose();
 #endif
     }
-
-#if NET
-    [RequiresUnreferencedCode(SqlClientTrimmingUnsupportedMessage)]
-#endif
-    private sealed class MetricHandle : IDisposable
-    {
-        private bool disposed;
-
-        public MetricHandle()
-        {
-            Interlocked.Increment(ref MetricHandles);
-        }
-
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                Interlocked.Decrement(ref MetricHandles);
-                this.disposed = true;
-            }
-        }
-    }
-
-#if NET
-    [RequiresUnreferencedCode(SqlClientTrimmingUnsupportedMessage)]
-#endif
-    private sealed class TracingHandle : IDisposable
-    {
-        private bool disposed;
-
-        public TracingHandle()
-        {
-            Interlocked.Increment(ref TracingHandles);
-        }
-
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                Interlocked.Decrement(ref TracingHandles);
-                this.disposed = true;
-            }
-        }
-    }
 }

src/OpenTelemetry.Instrumentation.SqlClient/SqlClientMeterProviderBuilderExtensions.cs

@@ -29,7 +29,7 @@ public static MeterProviderBuilder AddSqlClientInstrumentation(this MeterProvide
 
         builder.AddInstrumentation(sp =>
         {
-            return SqlClientInstrumentation.AddMetricHandle();
+            return SqlClientInstrumentation.Instance.HandleManager.AddMetricHandle();
         });
 
         builder.AddMeter(SqlActivitySourceHelper.MeterName);

src/OpenTelemetry.Instrumentation.SqlClient/TracerProviderBuilderExtensions.cs

@@ -70,7 +70,7 @@ public static TracerProviderBuilder AddSqlClientInstrumentation(
         {
             var sqlOptions = sp.GetRequiredService<IOptionsMonitor<SqlClientTraceInstrumentationOptions>>().Get(name);
             SqlClientInstrumentation.TracingOptions = sqlOptions;
-            return SqlClientInstrumentation.AddTracingHandle();
+            return SqlClientInstrumentation.Instance.HandleManager.AddTracingHandle();
         });
 
         builder.AddSource(SqlActivitySourceHelper.ActivitySourceName);

src/Shared/InstrumentationHandleManager.cs

@@ -3,8 +3,18 @@
 
 namespace OpenTelemetry.Instrumentation;
 
+#if NET
+using System.Diagnostics.CodeAnalysis;
+#endif
+
+#if NET
+[RequiresUnreferencedCode(InstrumentationHandleManagerTrimmingUnsupportedMessage)]
+#endif
 internal sealed class InstrumentationHandleManager
 {
+#if NET
+    internal const string InstrumentationHandleManagerTrimmingUnsupportedMessage = "Trimming is not yet supported for InstrumentationHandleManager.";
+#endif
     private int metricHandles;
     private int tracingHandles;
 
@@ -30,6 +40,9 @@ internal sealed class InstrumentationHandleManager
     /// <returns>An IDisposable object.</returns>
     public IDisposable AddTracingHandle() => new TracingHandle(this);
 
+#if NET
+    [RequiresUnreferencedCode(InstrumentationHandleManagerTrimmingUnsupportedMessage)]
+#endif
     private sealed class MetricHandle : IDisposable
     {
         private readonly InstrumentationHandleManager manager;
@@ -51,6 +64,9 @@ public void Dispose()
         }
     }
 
+#if NET
+    [RequiresUnreferencedCode(InstrumentationHandleManagerTrimmingUnsupportedMessage)]
+#endif
     private sealed class TracingHandle : IDisposable
     {
         private readonly InstrumentationHandleManager manager;