From 9e9d85de4d1eec0b9c25afd2e7b416e69158b86b Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Tue, 19 Feb 2019 22:01:55 +0300
Subject: [PATCH] add CorrelationIdLogEventEnricher

---
 .../AbpWebSiteWebModule.cs                    |  2 ++
 .../CorrelationIdLogEventEnricher.cs          | 28 +++++++++++++++++++
 abp_io/src/Volo.AbpWebSite.Web/Startup.cs     |  3 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 abp_io/src/Volo.AbpWebSite.Web/CorrelationIdLogEventEnricher.cs

diff --git a/abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs b/abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
index bbbce26cee..e6d888813c 100644
--- a/abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
+++ b/abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
@@ -140,6 +140,8 @@ namespace Volo.AbpWebSite
             var app = context.GetApplicationBuilder();
             var env = context.GetEnvironment();
 
+            app.UseCorrelationId();
+
             app.UseAbpRequestLocalization();
 
             if (env.IsDevelopment())
diff --git a/abp_io/src/Volo.AbpWebSite.Web/CorrelationIdLogEventEnricher.cs b/abp_io/src/Volo.AbpWebSite.Web/CorrelationIdLogEventEnricher.cs
new file mode 100644
index 0000000000..ee7b0bd248
--- /dev/null
+++ b/abp_io/src/Volo.AbpWebSite.Web/CorrelationIdLogEventEnricher.cs
@@ -0,0 +1,28 @@
+using Serilog.Core;
+using Serilog.Events;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Tracing;
+
+namespace Volo.AbpWebSite
+{
+    //This is for trial for now
+    public class CorrelationIdLogEventEnricher : ILogEventEnricher, ITransientDependency
+    {
+        private readonly ICorrelationIdProvider _correlationIdProvider;
+
+        public CorrelationIdLogEventEnricher(ICorrelationIdProvider correlationIdProvider)
+        {
+            _correlationIdProvider = correlationIdProvider;
+        }
+
+        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+        {
+            logEvent.AddOrUpdateProperty(
+                new LogEventProperty(
+                    "CorrelationId",
+                    new ScalarValue("CorrId:" + _correlationIdProvider.Get())
+                )
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/abp_io/src/Volo.AbpWebSite.Web/Startup.cs b/abp_io/src/Volo.AbpWebSite.Web/Startup.cs
index efbfda982a..92170d0786 100644
--- a/abp_io/src/Volo.AbpWebSite.Web/Startup.cs
+++ b/abp_io/src/Volo.AbpWebSite.Web/Startup.cs
@@ -28,7 +28,8 @@ namespace Volo.AbpWebSite
                 .AddDebug()
                 .AddSerilog(new LoggerConfiguration()
                     .Enrich.FromLogContext()
-                    .WriteTo.File("Logs/logs.txt")
+                    .Enrich.With(app.ApplicationServices.GetRequiredService<CorrelationIdLogEventEnricher>())
+                    .WriteTo.File("Logs/logs.txt",outputTemplate: "{Timestamp:HH:mm:ss} [{Level:u3}] [{CorrelationId}] {Message:lj}{NewLine}{Exception}")
                     .CreateLogger()
                 );