Skip to content

Commit 73ed578

Browse files
committed
Fix tests
1 parent 46cc9cb commit 73ed578

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
2525
ILoggerFactory loggerFactory,
2626
DiagnosticListener diagnosticListener,
2727
ActivitySource activitySource,
28+
TextMapPropagator propagator,
2829
IHttpContextFactory httpContextFactory,
2930
IApplicationBuilderFactory applicationBuilderFactory,
3031
IEnumerable<IStartupFilter> startupFilters,
@@ -37,6 +38,7 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
3738
LifetimeLogger = loggerFactory.CreateLogger("Microsoft.Hosting.Lifetime");
3839
DiagnosticListener = diagnosticListener;
3940
ActivitySource = activitySource;
41+
Propagator = propagator;
4042
HttpContextFactory = httpContextFactory;
4143
ApplicationBuilderFactory = applicationBuilderFactory;
4244
StartupFilters = startupFilters;
@@ -51,6 +53,7 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
5153
public ILogger LifetimeLogger { get; }
5254
public DiagnosticListener DiagnosticListener { get; }
5355
public ActivitySource ActivitySource { get; }
56+
public TextMapPropagator Propagator { get; }
5457
public IHttpContextFactory HttpContextFactory { get; }
5558
public IApplicationBuilderFactory ApplicationBuilderFactory { get; }
5659
public IEnumerable<IStartupFilter> StartupFilters { get; }
@@ -114,7 +117,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
114117
application = ErrorPageBuilder.BuildErrorPageApplication(HostingEnvironment.ContentRootFileProvider, Logger, showDetailedErrors, ex);
115118
}
116119

117-
var httpApplication = new HostingApplication(application, Logger, DiagnosticListener, ActivitySource, HttpContextFactory);
120+
var httpApplication = new HostingApplication(application, Logger, DiagnosticListener, ActivitySource, Propagator, HttpContextFactory);
118121

119122
await Server.StartAsync(httpApplication, cancellationToken);
120123

src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ private static HostingApplication CreateApplication(out FeatureCollection featur
552552
logger ?? new NullScopeLogger(),
553553
diagnosticListener ?? new NoopDiagnosticListener(),
554554
activitySource ?? new ActivitySource("Microsoft.AspNetCore"),
555+
TextMapPropagator.Default,
555556
httpContextFactory.Object);
556557

557558
return hostingApplication;

src/Hosting/Hosting/test/HostingApplicationTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ private static HostingApplication CreateApplication(IHttpContextFactory httpCont
194194
NullLogger.Instance,
195195
new DiagnosticListener("Microsoft.AspNetCore"),
196196
activitySource ?? new ActivitySource("Microsoft.AspNetCore"),
197+
TextMapPropagator.Default,
197198
httpContextFactory);
198199

199200
return hostingApplication;

0 commit comments

Comments
 (0)