Tweaks and trim warning cleanup.

open-telemetry · Nov 7, 2024 · 3e11aac · 3e11aac
1 parent e265c83
commit 3e11aac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/SqlClientInstrumentation.cs b/src/OpenTelemetry.Instrumentation.SqlClient/SqlClientInstrumentation.cs
@@ -11,6 +11,9 @@ namespace OpenTelemetry.Instrumentation.SqlClient;
 /// <summary>
 /// SqlClient instrumentation.
 /// </summary>
+#if NET
+[RequiresUnreferencedCode(SqlClientTrimmingUnsupportedMessage)]
+#endif
 internal sealed class SqlClientInstrumentation : IDisposable
 {
     public static readonly SqlClientInstrumentation Instance = new SqlClientInstrumentation();
@@ -42,9 +45,6 @@ internal sealed class SqlClientInstrumentation : IDisposable
     /// <summary>
     /// Initializes a new instance of the <see cref="SqlClientInstrumentation"/> class.
     /// </summary>
-#if NET
-    [RequiresUnreferencedCode(SqlClientTrimmingUnsupportedMessage)]
-#endif
     private SqlClientInstrumentation()
     {
 #if NETFRAMEWORK
@@ -61,6 +61,8 @@ private SqlClientInstrumentation()
 
     public static SqlClientTraceInstrumentationOptions TracingOptions { get; set; } = new SqlClientTraceInstrumentationOptions();
 
+    public static IDisposable AddTracingHandle() => new TracingHandle();
+
     /// <inheritdoc/>
     public void Dispose()
     {
@@ -71,7 +73,10 @@ public void Dispose()
 #endif
     }
 
-    internal class TracingHandle : IDisposable
+#if NET
+    [RequiresUnreferencedCode(SqlClientTrimmingUnsupportedMessage)]
+#endif
+    private sealed class TracingHandle : IDisposable
     {
         private bool disposed;
 

diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/TracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.SqlClient/TracerProviderBuilderExtensions.cs
@@ -52,7 +52,6 @@ public static TracerProviderBuilder AddSqlClientInstrumentation(
 #if NET
     [RequiresUnreferencedCode(SqlClientInstrumentation.SqlClientTrimmingUnsupportedMessage)]
 #endif
-
     public static TracerProviderBuilder AddSqlClientInstrumentation(
         this TracerProviderBuilder builder,
         string? name,
@@ -71,7 +70,7 @@ public static TracerProviderBuilder AddSqlClientInstrumentation(
         {
             var sqlOptions = sp.GetRequiredService<IOptionsMonitor<SqlClientTraceInstrumentationOptions>>().Get(name);
             SqlClientInstrumentation.TracingOptions = sqlOptions;
-            return new SqlClientInstrumentation.TracingHandle();
+            return SqlClientInstrumentation.AddTracingHandle();
         });
 
         builder.AddSource(SqlActivitySourceHelper.ActivitySourceName);