NLog EcsLayout now converts properties of type Enum as string

Author: snakefoot

src/Elastic.CommonSchema.NLog/EcsLayout.cs

@@ -383,9 +383,7 @@ private MetadataDictionary GetMetadata(LogEventInfo e)
 						continue;
 
 					var propertyValue = prop.Value;
-					if (propertyValue is null or IConvertible || propertyValue.GetType().IsValueType)
-						Populate(metadata, propertyName, propertyValue);
-					else
+					if (!TryPopulateWhenSafe(metadata, propertyName, propertyValue))
 					{
 						templateParameters ??= e.MessageTemplateParameters;
 						var value = AllowSerializePropertyValue(propertyName, templateParameters) ? propertyValue : propertyValue.ToString();
@@ -402,7 +400,10 @@ private MetadataDictionary GetMetadata(LogEventInfo e)
 						continue;
 
 					var propertyValue = MappedDiagnosticsLogicalContext.GetObject(key);
-					Populate(metadata, key, propertyValue);
+					if (!TryPopulateWhenSafe(metadata, key, propertyValue))
+					{
+						Populate(metadata, key, propertyValue.ToString());
+					}
 				}
 			}
 
@@ -722,6 +723,19 @@ private static long GetSysLogSeverity(LogLevel logLevel)
 			return 2; // LogLevel.Fatal
 		}
 
+		private static bool TryPopulateWhenSafe(IDictionary<string, object> propertyBag, string key, object value)
+		{
+			if (value is null or IConvertible || value.GetType().IsValueType)
+			{
+				if (value is Enum)
+					value = value.ToString();
+				Populate(propertyBag, key, value);
+				return true;
+			}
+
+			return false;
+		}
+
 		private static void Populate(IDictionary<string, object> propertyBag, string key, object value)
 		{
 			if (string.IsNullOrEmpty(key))

tests-integration/Elastic.NLog.Targets.IntegrationTests/LoggingToDataStreamTests.cs

@@ -62,8 +62,8 @@ public async Task LogsEndUpInCluster()
 			loggedError.Ecs.Version.Should().Be(EcsDocument.Version);
 			loggedError.Ecs.Version.Should().NotStartWith("v");
 
-			loggedError.Metadata.Should().ContainKey("Status");
-			loggedError.Metadata["Status"].Should().Be((int)MyEnum.Failure);
+			loggedError.Labels.Should().ContainKey("Status");
+			loggedError.Labels["Status"].Should().Be("Failure");
 		}
 	}
 }