NLog EcsLayout stop using obsolete ConfigurationItemFactory members

elastic · Feb 2, 2025 · 0e99ec9 · 0e99ec9
1 parent 2fd66e7
commit 0e99ec9
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/Elastic.CommonSchema.NLog/EcsLayout.cs b/src/Elastic.CommonSchema.NLog/EcsLayout.cs
@@ -33,21 +33,13 @@ public class EcsLayout : Layout
 	{
 		/// <summary> An NLOG layout implementation that renders logs as ECS json</summary>
 		public const string Name = nameof(EcsLayout);
-		private static bool? _nlogApmLoaded;
 		private static Agent _defaultAgent;
 		private Agent _previousAgent;
 		private Service _previousService;
 		private Host _previousHost;
 		private Server _previousServer;
 		private Process _previousProcess;
 
-		private static bool NLogApmLoaded()
-		{
-			if (_nlogApmLoaded.HasValue) return _nlogApmLoaded.Value;
-			_nlogApmLoaded = Type.GetType("Elastic.Apm.NLog.ApmTraceIdLayoutRenderer, Elastic.Apm.NLog") != null;
-			return _nlogApmLoaded.Value;
-		}
-
 		private readonly Layout _disableThreadAgnostic = "${threadid:cached=true}";
 
 		/// <summary> An NLOG layout implementation that renders logs as ECS json</summary>
@@ -119,11 +111,19 @@ protected override void InitializeLayout()
 			base.InitializeLayout();
 		}
 
-		private static bool NLogWeb5Registered() =>
-			ConfigurationItemFactory.Default.LayoutRenderers.TryGetDefinition("aspnet-request-duration", out _);
+		private static bool NLogApmLoaded() => Type.GetType("Elastic.Apm.NLog.ApmTraceIdLayoutRenderer, Elastic.Apm.NLog") != null;
+
+#if NETFRAMEWORK
+		private static bool NLogWeb4Registered() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestCookieLayoutRenderer, NLog.Web") != null;
+#else
+		private static bool NLogWeb4Registered() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestCookieLayoutRenderer, NLog.Web.AspNetCore") != null;
+#endif
 
-		private static bool NLogWeb4Registered() =>
-			ConfigurationItemFactory.Default.LayoutRenderers.TryGetDefinition("aspnet-request-url", out _);
+#if NETFRAMEWORK
+		private static bool NLogWeb5Registered() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestDurationLayoutRenderer, NLog.Web") != null;
+#else
+		private static bool NLogWeb5Registered() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestDurationLayoutRenderer, NLog.Web.AspNetCore") != null;
+#endif
 
 		/// <summary></summary>
 		// ReSharper disable UnusedMember.Global