fix: 实现 扩展属性内置Scope处理

Author: jianxuanbing

framework/src/Bing.Logging.Sinks.Exceptionless/Serilog/Sinks/Exceptionless/ExceptionlessSink.cs

@@ -4,6 +4,7 @@
 using Bing;
 using Bing.Logging.ExtraSupports;
 using Bing.Logging.Sinks.Exceptionless.Internals;
+using Bing.Text;
 using Exceptionless;
 using Exceptionless.Dependency;
 using Exceptionless.Logging;
@@ -148,7 +149,15 @@ public void Emit(LogEvent logEvent)
                             }
                             break;
                         default:
-                            builder.SetProperty(property.Key, property.Value.FlattenProperties());
+                            {
+                                // 特殊处理扩展属性
+                                if (property.Key.StartsWith(ContextDataTypes.ExtraProperty))
+                                {
+                                    builder.SetProperty(property.Key.TrimPhraseStart(ContextDataTypes.ExtraProperty), property.Value.FlattenProperties());
+                                    break;
+                                }
+                                builder.SetProperty(property.Key, property.Value.FlattenProperties());
+                            }
                             break;
                     }
                 }

framework/src/Bing.Logging/Bing/Logging/Core/LogEventContext.cs

@@ -95,7 +95,7 @@ public LogEventContext SetExtraProperty(string name, object value)
         {
             if (string.IsNullOrWhiteSpace(name))
                 return this;
-            _extraProperties.AddOrUpdateItem($"{ContextDataTypes.ExtraProperty}_{name}", value, false);
+            _extraProperties.AddOrUpdateItem($"{ContextDataTypes.ExtraProperty}{name}", value, false);
             return this;
         }
 

framework/src/Bing.Logging/Bing/Logging/ExtraSupports/ContextDataTypes.cs

@@ -8,7 +8,7 @@ public class ContextDataTypes
         /// <summary>
         /// 扩展属性
         /// </summary>
-        public const string ExtraProperty = "__BING_EXTRA_PROPERTY";
+        public const string ExtraProperty = "__BING_EXTRA_PROPERTY_";
 
         /// <summary>
         /// 扩展属性

samples/Bing.Samples.Hangfire/Jobs/DebugLogJob.cs

@@ -6,6 +6,7 @@
 using Bing.Logging;
 using Bing.Logs;
 using Bing.Logs.Abstractions;
+using Bing.Utils.Json;
 using Exceptionless;
 using Microsoft.Extensions.Logging;
 using el = global::Exceptionless;
@@ -82,6 +83,8 @@ public void WriteLog()
             }))
             {
                 CurrentLog.ExtraProperty("testA7777", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.sss"))
+                    .ExtraProperty("Req", new { A = 1, B = "2", C = new { C1 = 1, C2 = id } })
+                    .ExtraProperty("ReqJson", JsonHelper.ToJson(new { A = 1, B = "2", C = new { C1 = 1, C2 = id } }))
                     .Message($"测试日志信息--双重设置--BeginScope {id}")
                     .Tags(id)
                     .LogInformation();

samples/Bing.Samples.Hangfire/Modules/LogModule.cs

@@ -41,8 +41,8 @@ public override IServiceCollection AddServices(IServiceCollection services)
             // 同时输出2种方式的日志，可能存在重复 需要陆续兼容
             Logs.Exceptionless.Extensions.AddExceptionless(services, o =>
             {
-                o.ApiKey = "N8HOaOLndl0hF7ZhOfiwJ9HmOi6kPwjKEKWLCMzE";
-                o.ServerUrl = "http://10.186.132.40:5100";
+                o.ApiKey = "2R8FksPOpJikquJ2SLUfZMNES6d6dIsBsFYWTJR7";
+                o.ServerUrl = "http://10.186.135.27:5100";
             });
             services.AddBingLogging(x => { });
             services.AddSingleton<ILogContextAccessor, LogContextAccessor>();