Merge pull request #2154 from newrelic/trace-parent-logging

Correct multiple traceparent header logging
newrelic · Nov 22, 2024 · 4431da3 · 4431da3
2 parents 661ba38 + ef213ce
commit 4431da3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/tracing/W3CTraceParentParser.java b/newrelic-agent/src/main/java/com/newrelic/agent/tracing/W3CTraceParentParser.java
@@ -21,13 +21,13 @@ static W3CTraceParent parseHeaders(List<String> traceParentHeaders) {
             return null;
         }
         if (traceParentHeaders.size() > 1) {
-            ServiceFactory.getStatsService().getMetricAggregator().incrementCounter(MetricNames.SUPPORTABILITY_TRACE_CONTEXT_INVALID_PARENT_HEADER_COUNT);
-            Agent.LOG.log(Level.WARNING, "Multiple traceparent headers found on inbound request.");
             // Multiple values ok if all are equal
             String first = traceParentHeaders.get(0);
             for (String header : traceParentHeaders) {
                 if (!header.equals(first)) {
-                   return null;
+                    ServiceFactory.getStatsService().getMetricAggregator().incrementCounter(MetricNames.SUPPORTABILITY_TRACE_CONTEXT_INVALID_PARENT_HEADER_COUNT);
+                    Agent.LOG.log(Level.WARNING, "Multiple, different, traceparent headers found on inbound request.");
+                    return null;
                 }
             }
         }