Skip to content

Commit b3b3c65

Browse files
committed
Changed to Lazy
1 parent 0e99ec9 commit b3b3c65

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/Elastic.CommonSchema.NLog/EcsLayout.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public EcsLayout()
6868
_defaultAgent = EcsDocument.CreateAgent(typeof(EcsLayout));
6969

7070
// These values are set by the Elastic.Apm.NLog package
71-
if (NLogApmLoaded())
71+
if (NLogApmLoaded.Value)
7272
{
7373
ApmTraceId = "${ElasticApmTraceId}";
7474
ApmTransactionId = "${ElasticApmTransactionId}";
@@ -88,7 +88,7 @@ protected override void InitializeLayout()
8888
{
8989
if (CanIncludeAspNetProperties())
9090
{
91-
if (NLogWeb5Registered())
91+
if (NLogWeb5Registered.Value)
9292
EventDurationMs = "${aspnet-request-duration}";
9393

9494
HttpRequestId = "${aspnet-TraceIdentifier}";
@@ -104,25 +104,25 @@ protected override void InitializeLayout()
104104
UrlQuery = "${aspnet-request-url:IncludeScheme=false:IncludeHost=false:IncludePath=false:IncludeQueryString=true}";
105105
UrlUserName = "${aspnet-user-identity}";
106106

107-
if (!NLogApmLoaded())
107+
if (!NLogApmLoaded.Value)
108108
ApmTraceId = "${scopeproperty:item=RequestId:whenEmpty=${aspnet-TraceIdentifier}}";
109109
}
110110

111111
base.InitializeLayout();
112112
}
113113

114-
private static bool NLogApmLoaded() => Type.GetType("Elastic.Apm.NLog.ApmTraceIdLayoutRenderer, Elastic.Apm.NLog") != null;
114+
private static Lazy<bool> NLogApmLoaded { get; } = new Lazy<bool>(() => Type.GetType("Elastic.Apm.NLog.ApmTraceIdLayoutRenderer, Elastic.Apm.NLog") != null);
115115

116116
#if NETFRAMEWORK
117-
private static bool NLogWeb4Registered() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestCookieLayoutRenderer, NLog.Web") != null;
117+
private static Lazy<bool> NLogWeb4Registered { get; } = new Lazy<bool>(() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestCookieLayoutRenderer, NLog.Web") != null);
118118
#else
119-
private static bool NLogWeb4Registered() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestCookieLayoutRenderer, NLog.Web.AspNetCore") != null;
119+
private static Lazy<bool> NLogWeb4Registered { get; } = new Lazy<bool>(() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestCookieLayoutRenderer, NLog.Web.AspNetCore") != null);
120120
#endif
121121

122122
#if NETFRAMEWORK
123-
private static bool NLogWeb5Registered() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestDurationLayoutRenderer, NLog.Web") != null;
123+
private static Lazy<bool> NLogWeb5Registered { get; } = new Lazy<bool>(() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestDurationLayoutRenderer, NLog.Web") != null);
124124
#else
125-
private static bool NLogWeb5Registered() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestDurationLayoutRenderer, NLog.Web.AspNetCore") != null;
125+
private static Lazy<bool> NLogWeb5Registered { get; } = new Lazy<bool>(() => Type.GetType("NLog.Web.LayoutRenderers.AspNetRequestDurationLayoutRenderer, NLog.Web.AspNetCore") != null);
126126
#endif
127127

128128
/// <summary></summary>
@@ -216,7 +216,7 @@ protected override void InitializeLayout()
216216
/// <summary>
217217
/// Tests if aspnet properties would be rendered
218218
/// </summary>
219-
public bool CanIncludeAspNetProperties() => IncludeAspNetProperties && NLogWeb4Registered();
219+
public bool CanIncludeAspNetProperties() => IncludeAspNetProperties && NLogWeb4Registered.Value;
220220

221221
/// <summary></summary>
222222
[ArrayParameter(typeof(TargetPropertyWithContext), "label")]

0 commit comments

Comments
 (0)