Add TenantId CorrelationId to Loki

Author: jerviscui

src/plugins/SerilogTest/Program.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.HttpLogging;
+using Microsoft.AspNetCore.HttpOverrides;
 using Serilog;
 using Serilog.Core;
 using Serilog.Exceptions;
@@ -75,7 +76,15 @@ private static async Task Main(string[] args)
 
             var app = builder.Build();
 
-            _ = app.UseForwardedHeaders();
+            var forwardOptions = new ForwardedHeadersOptions
+            {
+                ForwardedHeaders = ForwardedHeaders.All,
+                ForwardLimit = null
+            };
+            //forwardOptions.KnownProxies.Add(new IPAddress(0L));
+            //forwardOptions.KnownNetworks.Add(new Microsoft.AspNetCore.HttpOverrides.IPNetwork(new IPAddress(0L), 0));
+
+            _ = app.UseForwardedHeaders(forwardOptions);
             _ = app.UseHttpsRedirection();
 
             _ = app.UseStaticFiles();

src/plugins/SerilogTest/SerilogTest.csproj

@@ -23,6 +23,7 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
     <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
+    <PackageReference Include="Serilog.Sinks.Loki.YetAnother" Version="3.0.7" />
   </ItemGroup>
 
   <ItemGroup>

src/plugins/SerilogTest/appsettings.json

@@ -57,20 +57,45 @@
           ]
         }
       },
+      //{
+      //  "Name": "GrafanaLoki",
+      //  "Args": {
+      //    "uri": "http://localhost:3100",
+      //    "period": "00:00:05",
+      //    "labels": [
+      //      {
+      //        "key": "service_name",
+      //        "value": "SerilogTest"
+      //      }
+      //    ],
+      //    "propertiesAsLabels": [
+      //      "EnvironmentName"
+      //    ]
+      //  }
+      //},
       {
-        "Name": "GrafanaLoki",
+        "Name": "Loki",
         "Args": {
-          "uri": "http://localhost:3100",
+          "configurations": {
+            "Url": "http://localhost:3100",
+            //"Credentials": {
+            //  "Password": "password",
+            //  "Username": "username"
+            //},
+            "Labels": [
+              {
+                "key": "service_name",
+                "value": "SerilogTest"
+              }
+            ],
+            "PropertiesAsLabels": [
+              "EnvironmentName"
+            ],
+            "EnrichTraceId": true,
+            "EnrichSpanId": true
+          },
           "period": "00:00:05",
-          "labels": [
-            {
-              "key": "service_name",
-              "value": "SerilogTest"
-            }
-          ],
-          "propertiesAsLabels": [
-            "EnvironmentName"
-          ]
+          "retryTimeLimit": "00:10:00"
         }
       }
     ]