Moved OpenTelemetryEventSourceLogEmitter extension to OpenTelemetryLo…

…ggerOptions.

src/OpenTelemetry.Extensions.EventSource/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt

@@ -1,6 +1,6 @@
 #nullable enable
 OpenTelemetry.Logs.OpenTelemetryEventSourceLogEmitter
 OpenTelemetry.Logs.OpenTelemetryEventSourceLogEmitter.OpenTelemetryEventSourceLogEmitter(OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider, System.Func<string!, System.Diagnostics.Tracing.EventLevel?>! shouldListenToFunc, bool disposeProvider = true) -> void
-OpenTelemetry.Logs.OpenTelemetryEventSourceServiceCollectionExtensions
+OpenTelemetry.Logs.OpenTelemetryEventSourceLoggerOptionsExtensions
 override OpenTelemetry.Logs.OpenTelemetryEventSourceLogEmitter.Dispose() -> void
-static OpenTelemetry.Logs.OpenTelemetryEventSourceServiceCollectionExtensions.AddOpenTelemetryEventSourceLogEmitter(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Func<string!, System.Diagnostics.Tracing.EventLevel?>! shouldListenToFunc) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static OpenTelemetry.Logs.OpenTelemetryEventSourceLoggerOptionsExtensions.AddEventSourceLogEmitter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! options, System.Func<string!, System.Diagnostics.Tracing.EventLevel?>! shouldListenToFunc) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!

src/OpenTelemetry.Extensions.EventSource/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt

@@ -1,6 +1,6 @@
 #nullable enable
 OpenTelemetry.Logs.OpenTelemetryEventSourceLogEmitter
 OpenTelemetry.Logs.OpenTelemetryEventSourceLogEmitter.OpenTelemetryEventSourceLogEmitter(OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider, System.Func<string!, System.Diagnostics.Tracing.EventLevel?>! shouldListenToFunc, bool disposeProvider = true) -> void
-OpenTelemetry.Logs.OpenTelemetryEventSourceServiceCollectionExtensions
+OpenTelemetry.Logs.OpenTelemetryEventSourceLoggerOptionsExtensions
 override OpenTelemetry.Logs.OpenTelemetryEventSourceLogEmitter.Dispose() -> void
-static OpenTelemetry.Logs.OpenTelemetryEventSourceServiceCollectionExtensions.AddOpenTelemetryEventSourceLogEmitter(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Func<string!, System.Diagnostics.Tracing.EventLevel?>! shouldListenToFunc) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static OpenTelemetry.Logs.OpenTelemetryEventSourceLoggerOptionsExtensions.AddEventSourceLogEmitter(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! options, System.Func<string!, System.Diagnostics.Tracing.EventLevel?>! shouldListenToFunc) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!

src/OpenTelemetry.Extensions.EventSource/OpenTelemetryEventSourceServiceCollectionExtensions.cs → src/OpenTelemetry.Extensions.EventSource/OpenTelemetryEventSourceLoggerOptionsExtensions.cs

@@ -1,4 +1,4 @@
-// <copyright file="OpenTelemetryEventSourceServiceCollectionExtensions.cs" company="OpenTelemetry Authors">
+// <copyright file="OpenTelemetryEventSourceLoggerOptionsExtensions.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,42 +24,40 @@
 namespace OpenTelemetry.Logs
 {
     /// <summary>
-    /// Contains extension methods for registering OpenTelemetry EventSource utilities into application services.
+    /// Contains extension methods for registering OpenTelemetry EventSource utilities into logging services.
     /// </summary>
-    public static class OpenTelemetryEventSourceServiceCollectionExtensions
+    public static class OpenTelemetryEventSourceLoggerOptionsExtensions
     {
         /// <summary>
-        /// Registers into application services an <see cref="EventListener"/>
-        /// which will convert <see cref="EventSource"/> events into
-        /// OpenTelemetry logs.
+        /// Registers an <see cref="EventListener"/> which will convert <see
+        /// cref="EventSource"/> events into OpenTelemetry logs.
         /// </summary>
-        /// <param name="services"><see cref="IServiceCollection"/>.</param>
+        /// <param name="options"><see
+        /// cref="OpenTelemetryLoggerOptions"/>.</param>
         /// <param name="shouldListenToFunc">Callback function used to decide if
         /// events should be captured for a given <see
         /// cref="EventSource.Name"/>. Return <see langword="null"/> if no
         /// events should be captured.</param>
-        /// <returns>Supplied <see cref="IServiceCollection"/> for chaining calls.</returns>
-        public static IServiceCollection AddOpenTelemetryEventSourceLogEmitter(
-            this IServiceCollection services,
+        /// <returns>Supplied <see cref="OpenTelemetryLoggerOptions"/> for
+        /// chaining calls.</returns>
+        public static OpenTelemetryLoggerOptions AddEventSourceLogEmitter(
+            this OpenTelemetryLoggerOptions options,
             Func<string, EventLevel?> shouldListenToFunc)
         {
-            Guard.ThrowIfNull(services);
+            Guard.ThrowIfNull(options);
             Guard.ThrowIfNull(shouldListenToFunc);
 
-            services.TryAddSingleton<EventSourceManager>();
+            options.Services.TryAddSingleton<EventSourceManager>();
 
-            services.Configure<OpenTelemetryLoggerOptions>(options =>
+            options.Configure((sp, provider) =>
             {
-                options.Configure((sp, provider) =>
-                {
-                    var manager = sp.GetRequiredService<EventSourceManager>();
+                var manager = sp.GetRequiredService<EventSourceManager>();
 
-                    manager.Emitters.Add(
-                        new OpenTelemetryEventSourceLogEmitter(provider, shouldListenToFunc, disposeProvider: false));
-                });
+                manager.Emitters.Add(
+                    new OpenTelemetryEventSourceLogEmitter(provider, shouldListenToFunc, disposeProvider: false));
             });
 
-            return services;
+            return options;
         }
 
         internal sealed class EventSourceManager : IDisposable

src/OpenTelemetry.Extensions.EventSource/README.md

@@ -30,15 +30,11 @@ IHost host = Host.CreateDefaultBuilder(args)
         {
             options
                 .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("MyService"))
-                .AddConsoleExporter();
+                .AddConsoleExporter()
+                // Step 2: Register OpenTelemetryEventSourceLogEmitter to listen to events...
+                .AddEventSourceLogEmitter((name) => name == MyEventSource.Name ? EventLevel.Informational : null);
         });
     })
-    .ConfigureServices((hostContext, services) =>
-    {
-        // Step 2: Register OpenTelemetryEventSourceLogEmitter to listen to events...
-        services.AddOpenTelemetryEventSourceLogEmitter(
-            (name) => name == MyEventSource.Name ? EventLevel.Informational : null);
-    })
     .Build();
 
     host.Run();

test/OpenTelemetry.Extensions.EventSource.Tests/OpenTelemetryEventSourceServiceCollectionExtensionsTests.cs → test/OpenTelemetry.Extensions.EventSource.Tests/OpenTelemetryEventSourceLoggerOptionsExtensionsTests.cs

@@ -1,4 +1,4 @@
-// <copyright file="OpenTelemetryEventSourceServiceCollectionExtensionsTests.cs" company="OpenTelemetry Authors">
+// <copyright file="OpenTelemetryEventSourceLoggerOptionsExtensionsTests.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +25,7 @@
 
 namespace OpenTelemetry.Extensions.EventSource.Tests
 {
-    public class OpenTelemetryEventSourceServiceCollectionExtensionsTests
+    public class OpenTelemetryEventSourceLoggerOptionsExtensionsTests
     {
         [Fact]
         public void AddOpenTelemetryEventSourceLogEmitterTest()
@@ -36,19 +36,21 @@ public void AddOpenTelemetryEventSourceLogEmitterTest()
 
             services.AddLogging(configure =>
             {
-                configure.AddOpenTelemetry(options => options.AddInMemoryExporter(exportedItems));
+                configure.AddOpenTelemetry(options =>
+                {
+                    options
+                        .AddInMemoryExporter(exportedItems)
+                        .AddEventSourceLogEmitter((name) => name == TestEventSource.EventSourceName ? EventLevel.LogAlways : null);
+                });
             });
 
-            services.AddOpenTelemetryEventSourceLogEmitter(
-                (name) => name == TestEventSource.EventSourceName ? EventLevel.LogAlways : null);
-
-            OpenTelemetryEventSourceServiceCollectionExtensions.EventSourceManager? eventSourceManager = null;
+            OpenTelemetryEventSourceLoggerOptionsExtensions.EventSourceManager? eventSourceManager = null;
 
             using (var serviceProvider = services.BuildServiceProvider())
             {
                 var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
 
-                eventSourceManager = serviceProvider.GetRequiredService<OpenTelemetryEventSourceServiceCollectionExtensions.EventSourceManager>();
+                eventSourceManager = serviceProvider.GetRequiredService<OpenTelemetryEventSourceLoggerOptionsExtensions.EventSourceManager>();
 
                 Assert.Single(eventSourceManager.Emitters);