Commitf67beca

and

authored

[release/9.0] Readd DiagnosticSource to KestrelServerImpl (#60202)

* Readd DiagnosticSource to KestrelServerImpl* null---------Co-authored-by: Brennan <brecon@microsoft.com>

1 parent8b2b207 commitf67becaCopy full SHA for f67beca

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,9 @@ public KestrelServerImpl(`
`39`	`39`	`IEnumerable<IMultiplexedConnectionListenerFactory>multiplexedFactories,`
`40`	`40`	`IHttpsConfigurationServicehttpsConfigurationService,`
`41`	`41`	`ILoggerFactoryloggerFactory,`
	`42`	`+DiagnosticSource?diagnosticSource,`
`42`	`43`	`KestrelMetricsmetrics)`
`43`		`-:this(transportFactories,multiplexedFactories,httpsConfigurationService,CreateServiceContext(options,loggerFactory,diagnosticSource:null,metrics))`
	`44`	`+:this(transportFactories,multiplexedFactories,httpsConfigurationService,CreateServiceContext(options,loggerFactory,diagnosticSource,metrics))`
`44`	`45`	`{`
`45`	`46`	`}`
`46`	`47`
`@@ -111,7 +112,8 @@ private static ServiceContext CreateServiceContext(IOptions<KestrelServerOptions`
`111`	`112`
`112`	`113`	`publicKestrelServerOptionsOptions=>ServiceContext.ServerOptions;`
`113`	`114`
`114`		`-privateServiceContextServiceContext{get;}`
	`115`	`+// Internal for testing`
	`116`	`+internalServiceContextServiceContext{get;}`
`115`	`117`
`116`	`118`	`privateKestrelTraceTrace=>ServiceContext.Log;`
`117`	`119`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public KestrelServer(IOptions<KestrelServerOptions> options, IConnectionListener`
`36`	`36`	`Array.Empty<IMultiplexedConnectionListenerFactory>(),`
`37`	`37`	`newSimpleHttpsConfigurationService(),`
`38`	`38`	`loggerFactory,`
	`39`	`+diagnosticSource:null,`
`39`	`40`	`newKestrelMetrics(newDummyMeterFactory()));`
`40`	`41`	`}`
`41`	`42`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,7 @@ private static KestrelServerImpl CreateKestrelServer(`
`309`	`309`	`multiplexedFactories,`
`310`	`310`	`httpsConfigurationService,`
`311`	`311`	`loggerFactory??newLoggerFactory(new[]{newKestrelTestLoggerProvider()}),`
	`312`	`+diagnosticSource:null,`
`312`	`313`	`metrics??newKestrelMetrics(newTestMeterFactory()));`
`313`	`314`	`}`
`314`	`315`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,12 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`	`4`	`usingSystem.Collections;`
	`5`	`+usingSystem.IO.Pipelines;`
`5`	`6`	`usingMicrosoft.AspNetCore.Connections;`
`6`	`7`	`usingMicrosoft.AspNetCore.Hosting;`
`7`	`8`	`usingMicrosoft.AspNetCore.Hosting.Server;`
`8`	`9`	`usingMicrosoft.AspNetCore.Server.Kestrel.Core;`
	`10`	`+usingMicrosoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;`
`9`	`11`	`usingMicrosoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Internal;`
`10`	`12`	`usingMicrosoft.AspNetCore.Server.Kestrel.Transport.Sockets;`
`11`	`13`	`usingMicrosoft.Extensions.DependencyInjection;`
`@@ -107,6 +109,11 @@ public void ServerIsKestrelServerImpl()`
`107`	`109`	`.UseKestrel()`
`108`	`110`	`.Configure(app=>{});`
`109`	`111`
`110`		`-Assert.IsType<KestrelServerImpl>(hostBuilder.Build().Services.GetService<IServer>());`
	`112`	`+varserver=Assert.IsType<KestrelServerImpl>(hostBuilder.Build().Services.GetService<IServer>());`
	`113`	`+`
	`114`	`+Assert.NotNull(server.ServiceContext.DiagnosticSource);`
	`115`	`+Assert.IsType<KestrelMetrics>(server.ServiceContext.Metrics);`
	`116`	`+Assert.Equal(PipeScheduler.ThreadPool,server.ServiceContext.Scheduler);`
	`117`	`+Assert.Equal(TimeProvider.System,server.ServiceContext.TimeProvider);`
`111`	`118`	`}`
`112`	`119`	`}`

Comments

(0)