Add Serilog and Seq working in Docker

docker-compose.override.yml

@@ -7,6 +7,12 @@ version: '3.4'
 # An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance.
 
 services:
+  seq:
+    environment:
+      - ACCEPT_EULA=Y
+    ports:
+      - "5340:80"
+
   sql.data:
     environment:
       - SA_PASSWORD=Pass@word

docker-compose.yml

@@ -1,6 +1,9 @@
 version: '3.4'
 
 services:
+  seq:
+    image: datalust/seq:latest
+
   sql.data:
     image: microsoft/mssql-server-linux:2017-latest
 

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -51,7 +51,10 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.2" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
   </ItemGroup>

src/Services/Catalog/Catalog.API/Program.cs

@@ -9,65 +9,97 @@ using Microsoft.Extensions.Options;
 using Serilog;
 using System;
 using System.IO;
+
 namespace Microsoft.eShopOnContainers.Services.Catalog.API
 {
     public class Program
     {
-        public static void Main(string[] args)
+        private static readonly string ApplicationName = typeof(Program).Namespace;
+
+        public static int Main(string[] args)
         {
-            BuildWebHost(args)
+            var configuration = GetConfiguration();
-                .MigrateDbContext<CatalogContext>((context,services)=>
+
+            Log.Logger = CreateSerilogLogger(configuration);
+
+            try
+            {
+                Log.Information("Configuring web host ({Application})...", ApplicationName);
+                var host = BuildWebHost(configuration, args);
+
+                Log.Information("Applying migrations ({Application})...", ApplicationName);
+                host.MigrateDbContext<CatalogContext>((context, services) =>
                 {
                     var env = services.GetService<IHostingEnvironment>();
                     var settings = services.GetService<IOptions<CatalogSettings>>();
                     var logger = services.GetService<ILogger<CatalogContextSeed>>();
 
                     new CatalogContextSeed()
-                    .SeedAsync(context,env,settings,logger)
+                    .SeedAsync(context, env, settings, logger)
                     .Wait();
-
                 })
-                .MigrateDbContext<IntegrationEventLogContext>((_,__)=> { })
+                .MigrateDbContext<IntegrationEventLogContext>((_, __) => { });
-                .Run();
+
+                Log.Information("Starting web host ({Application})...", ApplicationName);
+                host.Run();
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", ApplicationName);
+                return 1;
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-             .UseStartup<Startup>()
+                .CaptureStartupErrors(false)
+                .UseStartup<Startup>()
                 .UseApplicationInsights()
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseWebRoot("Pics")
-                .ConfigureAppConfiguration((builderContext, config) =>
+                .UseConfiguration(configuration)
-                {
+                .UseSerilog()
-                    var builtConfig = config.Build();
+                .Build();
 
-                    var configurationBuilder = new ConfigurationBuilder();
+        private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
+        {
+            var seqServerUrl = configuration["Serilog:SeqServerUrl"];
 
-                    if (Convert.ToBoolean(builtConfig["UseVault"]))
+            return new LoggerConfiguration()
-                    {
+                .MinimumLevel.Verbose()
-                        configurationBuilder.AddAzureKeyVault(
+                .Enrich.WithMachineName()
-                            $"https://{builtConfig["Vault:Name"]}.vault.azure.net/",
+                .Enrich.WithProperty("Application", ApplicationName)
-                            builtConfig["Vault:ClientId"],
+                .Enrich.FromLogContext()
-                            builtConfig["Vault:ClientSecret"]);
+                .WriteTo.Console()
-                    }
+                .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
+                .ReadFrom.Configuration(configuration)
+                .CreateLogger();
+        }
 
-                    configurationBuilder.AddEnvironmentVariables();
+        private static IConfiguration GetConfiguration()
+        {
+            var builder = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                .AddEnvironmentVariables();
 
-                    config.AddConfiguration(configurationBuilder.Build());
+            var config = builder.Build();
-                })
+
-                .ConfigureLogging((hostingContext, builder) =>
+            if (config.GetValue<bool>("UseVault", false))
-                {
+            {
-                    builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
+                builder.AddAzureKeyVault(
-                    builder.AddConsole();
+                    $"https://{config["Vault:Name"]}.vault.azure.net/",
-                    builder.AddDebug();
+                    config["Vault:ClientId"],
-                })
+                    config["Vault:ClientSecret"]);
-                .UseSerilog((builderContext, config) =>
+            }
-                {
+
-                    config
+            return builder.Build();
-                        .MinimumLevel.Information()
+        }
-                        .Enrich.FromLogContext()
-                        .WriteTo.Console();
-                })
-                .Build();    
     }
 }

src/Services/Catalog/Catalog.API/Properties/launchSettings.json

@@ -13,7 +13,10 @@
       "launchBrowser": true,
       "launchUrl": "/swagger",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ConnectionString": "server=localhost,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "EventBusConnection": "localhost",
+        "Serilog:SeqServerUrl": "http://locahost:5340"
       }
     },
     "Microsoft.eShopOnContainers.Services.Catalog.API": {

src/Services/Catalog/Catalog.API/appsettings.json

@@ -2,12 +2,15 @@
   "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",
   "PicBaseUrl": "http://localhost:5101/api/v1/catalog/items/[0]/pic/",
   "UseCustomizationData": false,
-  "Logging": {
+  "Serilog": {
-    "IncludeScopes": false,
+    "SeqServerUrl": null,
-    "LogLevel": {
+    "MinimumLevel": {
-      "Default": "Trace",
+      "Default": "Information",
-      "System": "Information",
+      "Override": {
-      "Microsoft": "Information"
+        "Microsoft": "Warning",
+        "Microsoft.eShopOnContainers": "Information",
+        "System": "Warning"
+      }
     }
   },
   "AzureServiceBusEnabled": false,

src/Services/Catalog/Catalog.API/web.config

@@ -2,8 +2,10 @@
 <configuration>
   <system.webServer>
     <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
     </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" forwardWindowsAuthToken="false" stdoutLogEnabled="false" />
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" forwardWindowsAuthToken="false" stdoutLogEnabled="false">
+      <environmentVariables />
+    </aspNetCore>
   </system.webServer>
 </configuration>