Moved getTags extension to LogEventPropertyValue and moved to the exi…

…sting iteration through properties
exceptionless · Jul 24, 2024 · c68cc0c · c68cc0c
1 parent b303dd5
commit c68cc0c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/Serilog.Sinks.Exceptionless/Sinks/Exceptionless/ExceptionlessClientExtensions.cs b/src/Serilog.Sinks.Exceptionless/Sinks/Exceptionless/ExceptionlessClientExtensions.cs
@@ -37,22 +37,18 @@ internal static string GetSource(this LogEvent log) {
             return null;
         }
 
-        internal static string[] GetTags(this LogEvent log)
+        internal static string[] GetTags(this LogEventPropertyValue value)
         {
-            if (log.Properties.TryGetValue("Tags", out LogEventPropertyValue value))
-            {
-                var propertyCollection = value.FlattenProperties() as List<object>;
-                if (propertyCollection == null) return Array.Empty<string>();
-
-                List<string> tags = new List<string>();
-                foreach (var item in propertyCollection)
-                {
-                    tags.Add(item.ToString());
-                }
+            var propertyCollection = value.FlattenProperties() as List<object>;
+            if (propertyCollection == null) return Array.Empty<string>();
 
-                return tags.ToArray();
+            List<string> tags = new List<string>();
+            foreach (var item in propertyCollection)
+            {
+                tags.Add(item.ToString());
             }
-            return Array.Empty<string>();
+
+            return tags.ToArray();
         }
 
         internal static LogLevel GetLevel(this LogEventLevel log)

diff --git a/src/Serilog.Sinks.Exceptionless/Sinks/Exceptionless/ExceptionlessSink.cs b/src/Serilog.Sinks.Exceptionless/Sinks/Exceptionless/ExceptionlessSink.cs
@@ -108,7 +108,7 @@ public void Emit(LogEvent logEvent) {
             if (logEvent.Level.GetLevel() < minLogLevel)
                 return;
 
-            var builder = _client.CreateFromLogEvent(logEvent).AddTags(_defaultTags).AddTags(logEvent.GetTags());
+            var builder = _client.CreateFromLogEvent(logEvent).AddTags(_defaultTags);
 
             if (_includeProperties) {
                 foreach (var prop in logEvent.Properties)
@@ -139,6 +139,9 @@ public void Emit(LogEvent logEvent) {
                             if (!String.IsNullOrWhiteSpace(emailAddress) || !String.IsNullOrWhiteSpace(description))
                                 builder.SetUserDescription(emailAddress, description);
                             break;
+                        case "Tags":
+                            builder.AddTags(prop.Value.GetTags());
+                            break;
                         default: 
                             builder.SetProperty(prop.Key, prop.Value.FlattenProperties());
                             break;