Removed static activity source from hosting (#31483)

* Removed static activity source from hosting
- Get it from DI instead

* Fixed test

Author: davidfowl

src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs

@@ -86,6 +86,7 @@ public GenericWebHostBuilder(IHostBuilder builder, WebHostBuilderOptions options
                 // We need to flow this differently
                 services.TryAddSingleton(sp => new DiagnosticListener("Microsoft.AspNetCore"));
                 services.TryAddSingleton<DiagnosticSource>(sp => sp.GetRequiredService<DiagnosticListener>());
+                services.TryAddSingleton(sp => new ActivitySource("Microsoft.AspNetCore"));
 
                 services.TryAddSingleton<IHttpContextFactory, DefaultHttpContextFactory>();
                 services.TryAddScoped<IMiddlewareFactory, MiddlewareFactory>();

src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs

@@ -24,6 +24,7 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
                                      IServer server,
                                      ILoggerFactory loggerFactory,
                                      DiagnosticListener diagnosticListener,
+                                     ActivitySource activitySource,
                                      IHttpContextFactory httpContextFactory,
                                      IApplicationBuilderFactory applicationBuilderFactory,
                                      IEnumerable<IStartupFilter> startupFilters,
@@ -35,6 +36,7 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
             Logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Hosting.Diagnostics");
             LifetimeLogger = loggerFactory.CreateLogger("Microsoft.Hosting.Lifetime");
             DiagnosticListener = diagnosticListener;
+            ActivitySource = activitySource;
             HttpContextFactory = httpContextFactory;
             ApplicationBuilderFactory = applicationBuilderFactory;
             StartupFilters = startupFilters;
@@ -48,6 +50,7 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
         // Only for high level lifetime events
         public ILogger LifetimeLogger { get; }
         public DiagnosticListener DiagnosticListener { get; }
+        public ActivitySource ActivitySource { get; }
         public IHttpContextFactory HttpContextFactory { get; }
         public IApplicationBuilderFactory ApplicationBuilderFactory { get; }
         public IEnumerable<IStartupFilter> StartupFilters { get; }
@@ -111,7 +114,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
                 application = ErrorPageBuilder.BuildErrorPageApplication(HostingEnvironment.ContentRootFileProvider, Logger, showDetailedErrors, ex);
             }
 
-            var httpApplication = new HostingApplication(application, Logger, DiagnosticListener, HttpContextFactory);
+            var httpApplication = new HostingApplication(application, Logger, DiagnosticListener, ActivitySource, HttpContextFactory);
 
             await Server.StartAsync(httpApplication, cancellationToken);
 

src/Hosting/Hosting/src/Internal/HostingApplication.cs

@@ -23,10 +23,11 @@ public HostingApplication(
             RequestDelegate application,
             ILogger logger,
             DiagnosticListener diagnosticSource,
+            ActivitySource activitySource,
             IHttpContextFactory httpContextFactory)
         {
             _application = application;
-            _diagnostics = new HostingApplicationDiagnostics(logger, diagnosticSource);
+            _diagnostics = new HostingApplicationDiagnostics(logger, diagnosticSource, activitySource);
             if (httpContextFactory is DefaultHttpContextFactory factory)
             {
                 _defaultHttpContextFactory = factory;

src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs

@@ -24,16 +24,15 @@ internal class HostingApplicationDiagnostics
         private const string DeprecatedDiagnosticsEndRequestKey = "Microsoft.AspNetCore.Hosting.EndRequest";
         private const string DiagnosticsUnhandledExceptionKey = "Microsoft.AspNetCore.Hosting.UnhandledException";
 
-        private const string ActivitySourceName = "Microsoft.AspNetCore.Hosting";
-        private static readonly ActivitySource _activitySource = new ActivitySource(ActivitySourceName);
-
+        private readonly ActivitySource _activitySource;
         private readonly DiagnosticListener _diagnosticListener;
         private readonly ILogger _logger;
 
-        public HostingApplicationDiagnostics(ILogger logger, DiagnosticListener diagnosticListener)
+        public HostingApplicationDiagnostics(ILogger logger, DiagnosticListener diagnosticListener, ActivitySource activitySource)
         {
             _logger = logger;
             _diagnosticListener = diagnosticListener;
+            _activitySource = activitySource;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Hosting/Hosting/src/Internal/WebHost.cs

@@ -155,8 +155,9 @@ public virtual async Task StartAsync(CancellationToken cancellationToken = defau
             await _hostedServiceExecutor.StartAsync(cancellationToken).ConfigureAwait(false);
 
             var diagnosticSource = _applicationServices.GetRequiredService<DiagnosticListener>();
+            var activitySource = _applicationServices.GetRequiredService<ActivitySource>();
             var httpContextFactory = _applicationServices.GetRequiredService<IHttpContextFactory>();
-            var hostingApp = new HostingApplication(application, _logger, diagnosticSource, httpContextFactory);
+            var hostingApp = new HostingApplication(application, _logger, diagnosticSource, activitySource, httpContextFactory);
             await Server.StartAsync(hostingApp, cancellationToken).ConfigureAwait(false);
             _startedServer = true;
 

src/Hosting/Hosting/src/WebHostBuilder.cs

@@ -292,6 +292,7 @@ private IServiceCollection BuildCommonServices(out AggregateException? hostingSt
 
             services.TryAddSingleton(sp => new DiagnosticListener("Microsoft.AspNetCore"));
             services.TryAddSingleton<DiagnosticSource>(sp => sp.GetRequiredService<DiagnosticListener>());
+            services.TryAddSingleton(sp => new ActivitySource("Microsoft.AspNetCore"));
 
             services.AddTransient<IApplicationBuilderFactory, ApplicationBuilderFactory>();
             services.AddTransient<IHttpContextFactory, DefaultHttpContextFactory>();
@@ -346,6 +347,9 @@ private void AddApplicationServices(IServiceCollection services, IServiceProvide
             var listener = hostingServiceProvider.GetService<DiagnosticListener>();
             services.Replace(ServiceDescriptor.Singleton(typeof(DiagnosticListener), listener!));
             services.Replace(ServiceDescriptor.Singleton(typeof(DiagnosticSource), listener!));
+
+            var activitySource = hostingServiceProvider.GetService<ActivitySource>();
+            services.Replace(ServiceDescriptor.Singleton(typeof(ActivitySource), activitySource!));
         }
 
         private string ResolveContentRootPath(string contentRootPath, string basePath)

src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs

@@ -390,7 +390,7 @@ public void ActivityBaggagePreservesItemsOrder()
             hostingApplication.CreateContext(features);
             Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", Activity.Current.OperationName);
 
-            var expectedBaggage = new []
+            var expectedBaggage = new[]
             {
                 KeyValuePair.Create("Key1","value1"),
                 KeyValuePair.Create("Key2","value2"),
@@ -493,17 +493,18 @@ public void ActivityOnImportHookIsCalled()
             Assert.True(Activity.Current.Recorded);
         }
 
-        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/30582")]
+        [Fact]
         public void ActivityListenersAreCalled()
         {
             var hostingApplication = CreateApplication(out var features);
+            var parentSpanId = "";
             using var listener = new ActivityListener
             {
                 ShouldListenTo = activitySource => true,
                 Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,
                 ActivityStarted = activity =>
                 {
-                    Assert.Equal("0123456789abcdef", Activity.Current.ParentSpanId.ToHexString());
+                    parentSpanId = Activity.Current.ParentSpanId.ToHexString();
                 }
             };
 
@@ -518,7 +519,9 @@ public void ActivityListenersAreCalled()
                     {"baggage", "Key1=value1, Key2=value2"}
                 }
             });
+
             hostingApplication.CreateContext(features);
+            Assert.Equal("0123456789abcdef", parentSpanId);
         }
 
 
@@ -533,7 +536,7 @@ private static void AssertProperty<T>(object o, string name)
         }
 
         private static HostingApplication CreateApplication(out FeatureCollection features,
-            DiagnosticListener diagnosticListener = null, ILogger logger = null, Action<DefaultHttpContext> configure = null)
+            DiagnosticListener diagnosticListener = null, ActivitySource activitySource = null, ILogger logger = null, Action<DefaultHttpContext> configure = null)
         {
             var httpContextFactory = new Mock<IHttpContextFactory>();
 
@@ -548,6 +551,7 @@ private static HostingApplication CreateApplication(out FeatureCollection featur
                 ctx => Task.CompletedTask,
                 logger ?? new NullScopeLogger(),
                 diagnosticListener ?? new NoopDiagnosticListener(),
+                activitySource ?? new ActivitySource("Microsoft.AspNetCore"),
                 httpContextFactory.Object);
 
             return hostingApplication;

src/Hosting/Hosting/test/HostingApplicationTests.cs

@@ -102,6 +102,7 @@ private static HostingApplication CreateApplication(IHttpContextFactory httpCont
                 ctx => Task.CompletedTask,
                 NullLogger.Instance,
                 new DiagnosticListener("Microsoft.AspNetCore"),
+                new ActivitySource("Microsoft.AspNetCore"),
                 httpContextFactory);
 
             return hostingApplication;