Added missing event ids for hosting events (#31149)

davidfowl · web-flow · commit f1b0157a111b · 2021-03-23T10:11:59.000-07:00
- Fixed slnf file
diff --git a/AspNetCore.sln b/AspNetCore.sln
@@ -1628,6 +1628,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTestApp", "src\Component
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebviewAppShared", "src\Components\WebView\Samples\WebviewAppShared\WebviewAppShared.csproj", "{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStartupAssembly1", "src\Hosting\test\testassets\TestStartupAssembly1\TestStartupAssembly1.csproj", "{262FF30C-34B4-462D-B5E2-0DABB9196E40}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -7699,6 +7701,18 @@ Global
 		{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}.Release|x64.Build.0 = Release|Any CPU
 		{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}.Release|x86.ActiveCfg = Release|Any CPU
 		{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}.Release|x86.Build.0 = Release|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x64.Build.0 = Debug|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x86.Build.0 = Debug|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x64.ActiveCfg = Release|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x64.Build.0 = Release|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x86.ActiveCfg = Release|Any CPU
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -8503,6 +8517,7 @@ Global
 		{94D0D6F3-8632-41DE-908B-47A787D570FF} = {5241CF68-66A0-4724-9BAA-36DB959A5B11}
 		{036C6BDA-7B69-4E8C-A921-822DA5972A56} = {94D0D6F3-8632-41DE-908B-47A787D570FF}
 		{64C3BAC8-C4F8-466A-9E84-0400EE54B25A} = {D3B76F4E-A980-45BF-AEA1-EA3175B0B5A1}
+		{262FF30C-34B4-462D-B5E2-0DABB9196E40} = {C1409A8F-555A-4A88-B803-C6D3E8B6C3B0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}
diff --git a/src/Hosting/Hosting.slnf b/src/Hosting/Hosting.slnf
@@ -1,34 +1,35 @@
-﻿{
+{
   "solution": {
     "path": "..\\..\\AspNetCore.sln",
-    "projects" : [
+    "projects": [
+      "src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
+      "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
       "src\\Hosting\\Hosting\\test\\Microsoft.AspNetCore.Hosting.Tests.csproj",
-      "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
-      "src\\Hosting\\samples\\GenericWebHost\\GenericWebHost.csproj",
-      "src\\Hosting\\samples\\SampleStartups\\SampleStartups.csproj",
       "src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
       "src\\Hosting\\Server.IntegrationTesting\\src\\Microsoft.AspNetCore.Server.IntegrationTesting.csproj",
       "src\\Hosting\\TestHost\\src\\Microsoft.AspNetCore.TestHost.csproj",
       "src\\Hosting\\TestHost\\test\\Microsoft.AspNetCore.TestHost.Tests.csproj",
       "src\\Hosting\\WindowsServices\\src\\Microsoft.AspNetCore.Hosting.WindowsServices.csproj",
       "src\\Hosting\\WindowsServices\\test\\Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj",
+      "src\\Hosting\\samples\\GenericWebHost\\GenericWebHost.csproj",
+      "src\\Hosting\\samples\\SampleStartups\\SampleStartups.csproj",
       "src\\Hosting\\test\\FunctionalTests\\Microsoft.AspNetCore.Hosting.FunctionalTests.csproj",
       "src\\Hosting\\test\\testassets\\IStartupInjectionAssemblyName\\IStartupInjectionAssemblyName.csproj",
-      "src\\Hosting\\test\\testassets\\Microsoft.AspNetCore.Hosting.TestSites\\Microsoft.AspNetCore.Hosting.TestSites.csproj",
       "src\\Hosting\\test\\testassets\\TestStartupAssembly1\\TestStartupAssembly1.csproj",
-      "src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
+      "src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
       "src\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
       "src\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
+      "src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
       "src\\Http\\Http\\src\\Microsoft.AspNetCore.Http.csproj",
-      "src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
-      "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
       "src\\Http\\Owin\\src\\Microsoft.AspNetCore.Owin.csproj",
-      "src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
+      "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
+      "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
+      "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
       "src\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj",
+      "src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
       "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
-      "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
-      "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj"
+      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
     ]
   }
-}
+}
diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs
@@ -5,23 +5,16 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
-using Microsoft.AspNetCore.Hosting.Views;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.StackTrace.Sources;
-using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Hosting
 {
@@ -126,15 +119,15 @@ public async Task StartAsync(CancellationToken cancellationToken)
             {
                 foreach (var address in addresses)
                 {
-                    LifetimeLogger.LogInformation("Now listening on: {address}", address);
+                    LifetimeLogger.ListeningOnAddress(address);
                 }
             }
 
             if (Logger.IsEnabled(LogLevel.Debug))
             {
                 foreach (var assembly in Options.WebHostOptions.GetFinalHostingStartupAssemblies())
                 {
-                    Logger.LogDebug("Loaded hosting startup assembly {assemblyName}", assembly);
+                    Logger.StartupAssemblyLoaded(assembly);
                 }
             }
 
diff --git a/src/Hosting/Hosting/src/Internal/HostingLoggerExtensions.cs b/src/Hosting/Hosting/src/Internal/HostingLoggerExtensions.cs
@@ -13,11 +13,27 @@ namespace Microsoft.AspNetCore.Hosting
 {
     internal static class HostingLoggerExtensions
     {
+        private static readonly Action<ILogger, string, Exception?> _startupAssemblyLoaded =
+                LoggerMessage.Define<string>(LogLevel.Debug, LoggerEventIds.HostingStartupAssemblyLoaded, "Loaded hosting startup assembly {assemblyName}");
+
+        private static readonly Action<ILogger, string, Exception?> _listeningOnAddress =
+                LoggerMessage.Define<string>(LogLevel.Information, LoggerEventIds.ServerListeningOnAddresses, "Now listening on: {address}");
+
         public static IDisposable RequestScope(this ILogger logger, HttpContext httpContext)
         {
             return logger.BeginScope(new HostingLogScope(httpContext));
         }
 
+        public static void ListeningOnAddress(this ILogger logger, string address)
+        {
+            _listeningOnAddress(logger, address, null);
+        }
+
+        public static void StartupAssemblyLoaded(this ILogger logger, string assemblyName)
+        {
+            _startupAssemblyLoaded(logger, assemblyName, null);
+        }
+
         public static void ApplicationError(this ILogger logger, Exception exception)
         {
             logger.ApplicationError(
@@ -130,8 +146,8 @@ public KeyValuePair<string, object> this[int index]
             public HostingLogScope(HttpContext httpContext)
             {
                 _traceIdentifier = httpContext.TraceIdentifier;
-                _path = (httpContext.Request.PathBase.HasValue 
-                         ? httpContext.Request.PathBase + httpContext.Request.Path 
+                _path = (httpContext.Request.PathBase.HasValue
+                         ? httpContext.Request.PathBase + httpContext.Request.Path
                          : httpContext.Request.Path).ToString();
             }
 
diff --git a/src/Hosting/Hosting/src/Internal/LoggerEventIds.cs b/src/Hosting/Hosting/src/Internal/LoggerEventIds.cs
@@ -18,5 +18,7 @@ internal static class LoggerEventIds
         public static readonly EventId HostedServiceStopException = new EventId(10, "HostedServiceStopException");
         public static readonly EventId HostingStartupAssemblyException = new EventId(11, "HostingStartupAssemblyException");
         public static readonly EventId ServerShutdownException = new EventId(12, "ServerShutdownException");
+        public static readonly EventId HostingStartupAssemblyLoaded = new EventId(13, "HostingStartupAssemblyLoaded");
+        public static readonly EventId ServerListeningOnAddresses = new EventId(14, "ServerListeningOnAddresses");
     }
 }
diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs
@@ -6,25 +6,20 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.ExceptionServices;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
-using Microsoft.AspNetCore.Hosting.Views;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.StackTrace.Sources;
-using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Hosting
 {
@@ -176,7 +171,7 @@ public virtual async Task StartAsync(CancellationToken cancellationToken = defau
             {
                 foreach (var assembly in _options.GetFinalHostingStartupAssemblies())
                 {
-                    _logger.LogDebug("Loaded hosting startup assembly {assemblyName}", assembly);
+                    _logger.StartupAssemblyLoaded(assembly);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -5,23 +5,16 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Diagnostics;`
`7`	`7`	`using System.Linq;`
`8`		`-using System.Reflection;`
`9`		`-using System.Runtime.InteropServices;`
`10`	`8`	`using System.Threading;`
`11`	`9`	`using System.Threading.Tasks;`
`12`		`-using Microsoft.AspNetCore.Builder;`
`13`	`10`	`using Microsoft.AspNetCore.Hosting.Builder;`
`14`	`11`	`using Microsoft.AspNetCore.Hosting.Server;`
`15`	`12`	`using Microsoft.AspNetCore.Hosting.Server.Features;`
`16`		`-using Microsoft.AspNetCore.Hosting.Views;`
`17`	`13`	`using Microsoft.AspNetCore.Http;`
`18`	`14`	`using Microsoft.Extensions.Configuration;`
`19`		`-using Microsoft.Extensions.FileProviders;`
`20`	`15`	`using Microsoft.Extensions.Hosting;`
`21`	`16`	`using Microsoft.Extensions.Logging;`
`22`	`17`	`using Microsoft.Extensions.Options;`
`23`		`-using Microsoft.Extensions.StackTrace.Sources;`
`24`		`-using Microsoft.Net.Http.Headers;`
`25`	`18`
`26`	`19`	`namespace Microsoft.AspNetCore.Hosting`
`27`	`20`	`{`
`@@ -126,15 +119,15 @@ public async Task StartAsync(CancellationToken cancellationToken)`
`126`	`119`	`{`
`127`	`120`	`foreach (var address in addresses)`
`128`	`121`	`{`
`129`		`- LifetimeLogger.LogInformation("Now listening on: {address}", address);`
	`122`	`+ LifetimeLogger.ListeningOnAddress(address);`
`130`	`123`	`}`
`131`	`124`	`}`
`132`	`125`
`133`	`126`	`if (Logger.IsEnabled(LogLevel.Debug))`
`134`	`127`	`{`
`135`	`128`	`foreach (var assembly in Options.WebHostOptions.GetFinalHostingStartupAssemblies())`
`136`	`129`	`{`
`137`		`- Logger.LogDebug("Loaded hosting startup assembly {assemblyName}", assembly);`
	`130`	`+ Logger.StartupAssemblyLoaded(assembly);`
`138`	`131`	`}`
`139`	`132`	`}`
`140`	`133`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,27 @@ namespace Microsoft.AspNetCore.Hosting`
`13`	`13`	`{`
`14`	`14`	`internal static class HostingLoggerExtensions`
`15`	`15`	`{`
	`16`	`+ private static readonly Action<ILogger, string, Exception?> _startupAssemblyLoaded =`
	`17`	`+ LoggerMessage.Define<string>(LogLevel.Debug, LoggerEventIds.HostingStartupAssemblyLoaded, "Loaded hosting startup assembly {assemblyName}");`
	`18`	`+`
	`19`	`+ private static readonly Action<ILogger, string, Exception?> _listeningOnAddress =`
	`20`	`+ LoggerMessage.Define<string>(LogLevel.Information, LoggerEventIds.ServerListeningOnAddresses, "Now listening on: {address}");`
	`21`	`+`
`16`	`22`	`public static IDisposable RequestScope(this ILogger logger, HttpContext httpContext)`
`17`	`23`	`{`
`18`	`24`	`return logger.BeginScope(new HostingLogScope(httpContext));`
`19`	`25`	`}`
`20`	`26`
	`27`	`+ public static void ListeningOnAddress(this ILogger logger, string address)`
	`28`	`+ {`
	`29`	`+ _listeningOnAddress(logger, address, null);`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ public static void StartupAssemblyLoaded(this ILogger logger, string assemblyName)`
	`33`	`+ {`
	`34`	`+ _startupAssemblyLoaded(logger, assemblyName, null);`
	`35`	`+ }`
	`36`	`+`
`21`	`37`	`public static void ApplicationError(this ILogger logger, Exception exception)`
`22`	`38`	`{`
`23`	`39`	`logger.ApplicationError(`
`@@ -130,8 +146,8 @@ public KeyValuePair<string, object> this[int index]`
`130`	`146`	`public HostingLogScope(HttpContext httpContext)`
`131`	`147`	`{`
`132`	`148`	`_traceIdentifier = httpContext.TraceIdentifier;`
`133`		`- _path = (httpContext.Request.PathBase.HasValue`
`134`		`- ? httpContext.Request.PathBase + httpContext.Request.Path`
	`149`	`+ _path = (httpContext.Request.PathBase.HasValue`
	`150`	`+ ? httpContext.Request.PathBase + httpContext.Request.Path`
`135`	`151`	`: httpContext.Request.Path).ToString();`
`136`	`152`	`}`
`137`	`153`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,7 @@ internal static class LoggerEventIds`
`18`	`18`	`public static readonly EventId HostedServiceStopException = new EventId(10, "HostedServiceStopException");`
`19`	`19`	`public static readonly EventId HostingStartupAssemblyException = new EventId(11, "HostingStartupAssemblyException");`
`20`	`20`	`public static readonly EventId ServerShutdownException = new EventId(12, "ServerShutdownException");`
	`21`	`+ public static readonly EventId HostingStartupAssemblyLoaded = new EventId(13, "HostingStartupAssemblyLoaded");`
	`22`	`+ public static readonly EventId ServerListeningOnAddresses = new EventId(14, "ServerListeningOnAddresses");`
`21`	`23`	`}`
`22`	`24`	`}`