Ensure calls to Agent.Tracer use null propagation to access child obj…

…ects (#59)
elastic · Mar 6, 2020 · 5ebd054 · 5ebd054
1 parent 877b05f
commit 5ebd054
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Elastic.Apm.NLog/ApmTraceIdLayoutRenderer.cs b/src/Elastic.Apm.NLog/ApmTraceIdLayoutRenderer.cs
@@ -17,8 +17,8 @@ public class ApmTraceIdLayoutRenderer : LayoutRenderer
 
 		protected override void Append(StringBuilder builder, LogEventInfo logEvent)
 		{
-			if (!Agent.IsConfigured || Agent.Tracer?.CurrentTransaction == null)
-				return;
+			if (!Agent.IsConfigured) return;
+			if (Agent.Tracer?.CurrentTransaction == null) return;
 
 			builder.Append(Agent.Tracer.CurrentTransaction.TraceId);
 		}

diff --git a/src/Elastic.Apm.NLog/ApmTransactionIdLayoutRenderer.cs b/src/Elastic.Apm.NLog/ApmTransactionIdLayoutRenderer.cs
@@ -17,8 +17,8 @@ public class ApmTransactionIdLayoutRenderer : LayoutRenderer
 
 		protected override void Append(StringBuilder builder, LogEventInfo logEvent)
 		{
-			if (!Agent.IsConfigured || Agent.Tracer?.CurrentTransaction == null)
-				return;
+			if (!Agent.IsConfigured) return;
+			if (Agent.Tracer?.CurrentTransaction == null) return;
 
 			builder.Append(Agent.Tracer.CurrentTransaction.Id);
 		}

diff --git a/src/Elastic.Apm.SerilogEnricher/ElasticApmEnricher.cs b/src/Elastic.Apm.SerilogEnricher/ElasticApmEnricher.cs
@@ -15,8 +15,8 @@ public sealed class ElasticApmEnricher : ILogEventEnricher
 	{
 		public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
 		{
-			if (!Agent.IsConfigured || Agent.Tracer.CurrentTransaction == null)
-				return;
+			if (!Agent.IsConfigured) return;
+			if (Agent.Tracer?.CurrentTransaction == null) return;
 
 			logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty(
 				"ElasticApmTransactionId", Agent.Tracer.CurrentTransaction.Id));