Sdk diagnostic listener EventLevel based on configured LogLevel

src/OpenTelemetry.AutoInstrumentation/Diagnostics/SdkSelfDiagnosticsEventListener.cs

@@ -34,10 +34,10 @@ internal class SdkSelfDiagnosticsEventListener : EventListener
     private readonly IOtelLogger log;
     private readonly List<EventSource>? eventSourcesBeforeConstructor = new();
 
-    public SdkSelfDiagnosticsEventListener(EventLevel eventLevel, IOtelLogger logger)
+    public SdkSelfDiagnosticsEventListener(IOtelLogger logger)
     {
         log = logger;
-        logLevel = eventLevel;
+        logLevel = LogLevelToEventLevel(logger.Level);
 
         List<EventSource>? eventSources;
         lock (lockObj)
@@ -120,4 +120,16 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
                 break;
         }
     }
+
+    private static EventLevel LogLevelToEventLevel(LogLevel loggerLevel)
+    {
+        return loggerLevel switch
+        {
+            LogLevel.Debug => EventLevel.Verbose,
+            LogLevel.Error => EventLevel.Error,
+            LogLevel.Warning => EventLevel.Warning,
+            LogLevel.Information => EventLevel.Informational,
+            _ => throw new ArgumentOutOfRangeException(nameof(loggerLevel), loggerLevel, null)
+        };
+    }
 }

src/OpenTelemetry.AutoInstrumentation/Instrumentation.cs

@@ -14,7 +14,6 @@
 // limitations under the License.
 // </copyright>
 
-using System.Diagnostics.Tracing;
 using OpenTelemetry.AutoInstrumentation.Configurations;
 using OpenTelemetry.AutoInstrumentation.Diagnostics;
 using OpenTelemetry.AutoInstrumentation.Loading;
@@ -115,7 +114,7 @@ public static void Initialize()
             if (TracerSettings.Value.TracesEnabled || MetricSettings.Value.MetricsEnabled)
             {
                 // Initialize SdkSelfDiagnosticsEventListener to create an EventListener for the OpenTelemetry SDK
-                _sdkEventListener = new(EventLevel.Warning, Logger);
+                _sdkEventListener = new(Logger);
 
                 // Register to shutdown events
                 AppDomain.CurrentDomain.ProcessExit += OnExit;

src/OpenTelemetry.AutoInstrumentation/Logging/IOtelLogger.cs

@@ -18,6 +18,8 @@ namespace OpenTelemetry.AutoInstrumentation.Logging;
 
 internal interface IOtelLogger
 {
+    LogLevel Level { get; }
+
     bool IsEnabled(LogLevel level);
 
     void Debug(string messageTemplate, bool writeToEventLog = true);

src/OpenTelemetry.AutoInstrumentation/Logging/InternalLogger.cs

@@ -21,17 +21,18 @@ internal class InternalLogger : IOtelLogger
     private static readonly object[] NoPropertyValues = Array.Empty<object>();
 
     private readonly ISink _sink;
-    private readonly LogLevel _logLevel;
 
     internal InternalLogger(ISink sink, LogLevel logLevel)
     {
         _sink = sink ?? throw new ArgumentNullException(nameof(sink));
-        _logLevel = logLevel;
+        Level = logLevel;
     }
 
+    public LogLevel Level { get; }
+
     public bool IsEnabled(LogLevel level)
     {
-        return level <= _logLevel;
+        return level <= Level;
     }
 
     public void Debug(string messageTemplate, bool writeToEventLog)

src/OpenTelemetry.AutoInstrumentation/Logging/NoopLogger.cs

@@ -27,6 +27,8 @@ private NoopLogger()
     {
     }
 
+    public LogLevel Level => default;
+
     public bool IsEnabled(LogLevel level)
     {
         return false;

test/OpenTelemetry.AutoInstrumentation.Tests/Diagnostics/SdkSelfDiagnosticsEventListenerTests.cs

@@ -16,10 +16,8 @@
 
 // Source originated from https://github.com/open-telemetry/opentelemetry-dotnet/blob/23609730ddd73c860553de847e67c9b2226cff94/test/OpenTelemetry.Tests/Internal/SelfDiagnosticsEventListenerTest.cs
 
-using System.Collections.Generic;
 using System.Diagnostics.Tracing;
-using FluentAssertions;
-using FluentAssertions.Execution;
+using Moq;
 using OpenTelemetry.AutoInstrumentation.Diagnostics;
 using OpenTelemetry.AutoInstrumentation.Logging;
 using Xunit;
@@ -35,33 +33,35 @@ public class SdkSelfDiagnosticsEventListenerTests
     [Fact]
     public void EventSourceSetup_LowerSeverity()
     {
-        var testSink = new TestSink();
-        var logger = new InternalLogger(testSink, LogLevel.Debug);
-        using var listener = new SdkSelfDiagnosticsEventListener(EventLevel.Error, logger);
+        var logger = new Mock<IOtelLogger>();
+        logger.Setup(otelLogger => otelLogger.Level).Returns(LogLevel.Error);
+
+        using var listener = new SdkSelfDiagnosticsEventListener(logger.Object);
 
         // Emitting a Verbose event. Or any EventSource event with lower severity than Error.
         AspNetTelemetryEventSourceForTests.Log.ActivityRestored("123");
         OpenTelemetrySdkEventSourceForTests.Log.ActivityStarted("Activity started", "1");
 
-        testSink.Messages.Should().BeEmpty("events with lower severity than error should not be written.");
+        logger.Verify(otelLogger => otelLogger.Level, Times.Once);
+        logger.VerifyNoOtherCalls();
     }
 
     [Fact]
     public void EventSourceSetup_HigherSeverity()
     {
-        var testSink = new TestSink();
-        var logger = new InternalLogger(testSink, LogLevel.Debug);
-        using var listener = new SdkSelfDiagnosticsEventListener(EventLevel.Verbose, logger);
+        var logger = new Mock<IOtelLogger>();
+        logger.Setup(otelLogger => otelLogger.Level).Returns(LogLevel.Debug);
+
+        using var listener = new SdkSelfDiagnosticsEventListener(logger.Object);
 
         // Emitting a Verbose event. Or any EventSource event with lower severity than Error.
         AspNetTelemetryEventSourceForTests.Log.ActivityRestored("123");
         OpenTelemetrySdkEventSourceForTests.Log.ActivityStarted("Activity started", "1");
 
-        using (new AssertionScope())
-        {
-            testSink.Messages.Should().Contain(msg => msg.Contains("EventSource=OpenTelemetry-Instrumentation-AspNet-Telemetry-For-Tests, Message=Activity restored, Id='123'"));
-            testSink.Messages.Should().Contain(msg => msg.Contains("EventSource=OpenTelemetry-Sdk-For-Tests, Message=Activity started."));
-        }
+        logger.Verify(otelLogger => otelLogger.Level, Times.Once);
+        logger.Verify(otelLogger => otelLogger.Information("EventSource={0}, Message={1}", "OpenTelemetry-Instrumentation-AspNet-Telemetry-For-Tests", "Activity restored, Id='123'", false), Times.Once);
+        logger.Verify(otelLogger => otelLogger.Debug("EventSource={0}, Message={1}", "OpenTelemetry-Sdk-For-Tests", "Activity started. OperationName = 'Activity started', Id = '1'.", false), Times.Once);
+        logger.VerifyNoOtherCalls();
     }
 
     [EventSource(Name = "OpenTelemetry-Instrumentation-AspNet-Telemetry-For-Tests")]