fix: 调整日志方法

jianxuanbing · jianxuanbing · commit d9edbbc96c28 · 2022-10-20T10:15:14.000+08:00
diff --git a/framework/src/Bing.Logging/Bing/Logging/Core/LogEventContext.cs b/framework/src/Bing.Logging/Bing/Logging/Core/LogEventContext.cs
@@ -108,7 +108,7 @@ public LogEventContext SetExtraProperty(string name, object value)
 
         #endregion
 
-        #region CallerInfo
+        #region CallerInfo(调用者信息)
 
         /// <summary>
         /// 调用者信息
@@ -124,9 +124,7 @@ public LogEventContext SetExtraProperty(string name, object value)
         public LogEventContext SetCallerInfo(string memberName = "", string sourceFilePath = "", int sourceLineNumber = 0)
         {
             if (!string.IsNullOrWhiteSpace(memberName) || !string.IsNullOrWhiteSpace(sourceFilePath) || sourceLineNumber > 0)
-            {
                 _callerInfo = new LogCallerInfo(memberName, sourceFilePath, sourceLineNumber);
-            }
             return this;
         }
 
diff --git a/framework/src/Bing.Logging/Bing/Logging/Core/LogEventDescriptor.cs b/framework/src/Bing.Logging/Bing/Logging/Core/LogEventDescriptor.cs
@@ -18,5 +18,20 @@ public LogEventDescriptor()
         /// 日志事件上下文
         /// </summary>
         public LogEventContext Context { get; }
+
+        /// <summary>
+        /// 日志跟踪标识
+        /// </summary>
+        public string TraceId { get; set; }
+
+        /// <summary>
+        /// 日志跟踪名称
+        /// </summary>
+        public string TraceName { get; set; }
+
+        /// <summary>
+        /// 业务跟踪标识
+        /// </summary>
+        public string BusinessTraceId { get; set; }
     }
 }
diff --git a/framework/src/Bing.Logging/Bing/Logging/ILog.cs b/framework/src/Bing.Logging/Bing/Logging/ILog.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Runtime.CompilerServices;
+using Bing.Logging.Core;
 using Microsoft.Extensions.Logging;
 
 namespace Bing.Logging
@@ -37,17 +38,10 @@ public interface ILog
         ILog Property(string propertyName, string propertyValue);
 
         /// <summary>
-        /// 设置扩展属性
+        /// 设置日志事件描述符
         /// </summary>
-        /// <param name="propertyName">属性名</param>
-        /// <param name="propertyValue">属性值</param>
-        ILog ExtraProperty(string propertyName, object propertyValue);
-
-        /// <summary>
-        /// 设置标签
-        /// </summary>
-        /// <param name="tags">标签</param>
-        ILog Tags(params string[] tags);
+        /// <param name="action">操作</param>
+        ILog Set(Action<LogEventDescriptor> action);
 
         /// <summary>
         /// 设置日志状态对象
diff --git a/framework/src/Bing.Logging/Bing/Logging/ILogExtensions.cs b/framework/src/Bing.Logging/Bing/Logging/ILogExtensions.cs
@@ -83,5 +83,28 @@ public static ILog Line(this ILog log)
             log.Message(Environment.NewLine);
             return log;
         }
+
+        /// <summary>
+        /// 设置扩展属性
+        /// </summary>
+        /// <param name="log">日志</param>
+        /// <param name="propertyName">属性名</param>
+        /// <param name="propertyValue">属性值</param>
+        public static ILog ExtraProperty(this ILog log, string propertyName, object propertyValue) =>
+            log.Set(x => x.Context.SetExtraProperty(propertyName, propertyValue));
+
+        /// <summary>
+        /// 设置标签列表
+        /// </summary>
+        /// <param name="log">日志</param>
+        /// <param name="tags">标签列表</param>
+        public static ILog Tags(this ILog log, params string[] tags) => log.Set(x => x.Context.SetTags(tags));
+
+        /// <summary>
+        /// 设置标签
+        /// </summary>
+        /// <param name="log">日志</param>
+        /// <param name="tag">标签</param>
+        public static ILog Tag(this ILog log, string tag) => log.Set(x => x.Context.SetTags(tag));
     }
 }
diff --git a/framework/src/Bing.Logging/Bing/Logging/Log.cs b/framework/src/Bing.Logging/Bing/Logging/Log.cs
@@ -143,27 +143,17 @@ public virtual ILog Property(string propertyName, string propertyValue)
 
         #endregion
 
-        #region ExtraProperty(设置扩展属性)
+        #region Set(设置日志事件描述符)
 
         /// <summary>
-        /// 设置扩展属性
+        /// 设置日志事件描述符
         /// </summary>
-        /// <param name="propertyName">属性名</param>
-        /// <param name="propertyValue">属性值</param>
-        public ILog ExtraProperty(string propertyName, object propertyValue)
+        /// <param name="action">操作</param>
+        public ILog Set(Action<LogEventDescriptor> action)
         {
-            CurrentDescriptor.Context.SetExtraProperty(propertyName, propertyValue);
-            return this;
-        }
-
-        #endregion
-
-        #region Tags(设置标签)
-
-        /// <inheritdoc />
-        public virtual ILog Tags(params string[] tags)
-        {
-            CurrentDescriptor.Context.SetTags(tags);
+            if (action == null)
+                throw new ArgumentNullException(nameof(action));
+            action(CurrentDescriptor);
             return this;
         }
 
diff --git a/framework/src/Bing.Logging/Bing/Logging/Log`.cs b/framework/src/Bing.Logging/Bing/Logging/Log`.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Runtime.CompilerServices;
+using Bing.Logging.Core;
 using Microsoft.Extensions.Logging;
 
 namespace Bing.Logging
@@ -41,10 +42,7 @@ public Log(ILogFactory factory)
         public virtual ILog Property(string propertyName, string propertyValue) => _log.Property(propertyName, propertyValue);
 
         /// <inheritdoc />
-        public virtual ILog ExtraProperty(string propertyName, object propertyValue) => _log.ExtraProperty(propertyName, propertyValue);
-
-        /// <inheritdoc />
-        public virtual ILog Tags(params string[] tags) => _log.Tags(tags);
+        public virtual ILog Set(Action<LogEventDescriptor> action) => _log.Set(action);
 
         /// <inheritdoc />
         public virtual ILog State(object state) => _log.State(state);
diff --git a/framework/src/Bing.Logging/Bing/Logging/NullLog.cs b/framework/src/Bing.Logging/Bing/Logging/NullLog.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using Bing.Logging.Core;
 using Microsoft.Extensions.Logging;
 
 namespace Bing.Logging
@@ -40,6 +41,12 @@ public class NullLog<TCategoryName> : ILog<TCategoryName>
         /// <param name="propertyValue">属性值</param>
         public ILog ExtraProperty(string propertyName, object propertyValue) => this;
 
+        /// <summary>
+        /// 设置日志事件描述符
+        /// </summary>
+        /// <param name="action">操作</param>
+        public ILog Set(Action<LogEventDescriptor> action) => this;
+
         /// <summary>
         /// 设置标签
         /// </summary>
@@ -140,6 +147,12 @@ public class NullLog : ILog
         /// <param name="propertyValue">属性值</param>
         public ILog ExtraProperty(string propertyName, object propertyValue) => this;
 
+        /// <summary>
+        /// 设置日志事件描述符
+        /// </summary>
+        /// <param name="action">操作</param>
+        public ILog Set(Action<LogEventDescriptor> action) => this;
+
         /// <summary>
         /// 设置标签
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public LogEventContext SetExtraProperty(string name, object value)`
`108`	`108`
`109`	`109`	`#endregion`
`110`	`110`
`111`		`- #region CallerInfo`
	`111`	`+ #region CallerInfo(调用者信息)`
`112`	`112`
`113`	`113`	`/// <summary>`
`114`	`114`	`/// 调用者信息`
`@@ -124,9 +124,7 @@ public LogEventContext SetExtraProperty(string name, object value)`
`124`	`124`	`public LogEventContext SetCallerInfo(string memberName = "", string sourceFilePath = "", int sourceLineNumber = 0)`
`125`	`125`	`{`
`126`	`126`	`if (!string.IsNullOrWhiteSpace(memberName) \|\| !string.IsNullOrWhiteSpace(sourceFilePath) \|\| sourceLineNumber > 0)`
`127`		`- {`
`128`	`127`	`_callerInfo = new LogCallerInfo(memberName, sourceFilePath, sourceLineNumber);`
`129`		`- }`
`130`	`128`	`return this;`
`131`	`129`	`}`
`132`	`130`