From 811259376ec6c61517e67b42d60b8f70137dffb1 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 18 Mar 2021 05:03:06 -0700 Subject: [PATCH] Update servlet attr names to match log attr names (#2593) --- .../instrumentation/servlet/ServletHttpServerTracer.java | 4 ++-- .../javaagent/src/test/groovy/TomcatServlet3Test.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java b/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java index 7ff4c75391..227f3ab0e8 100644 --- a/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java +++ b/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java @@ -32,8 +32,8 @@ public abstract class ServletHttpServerTracer SpanContext spanContext = Span.fromContext(context).getSpanContext(); // we do this e.g. so that servlet containers can use these values in their access logs - request.setAttribute("traceId", spanContext.getTraceId()); - request.setAttribute("spanId", spanContext.getSpanId()); + request.setAttribute("trace_id", spanContext.getTraceId()); + request.setAttribute("span_id", spanContext.getSpanId()); return context; } diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3Test.groovy index 488500b0df..6135f8b6a6 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3Test.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3Test.groovy @@ -280,8 +280,8 @@ class TestAccessLogValve extends ValveBase implements AccessLog { void log(Request request, Response response, long time) { synchronized (loggedIds) { - loggedIds.add(new Tuple2(request.getAttribute("traceId"), - request.getAttribute("spanId"))) + loggedIds.add(new Tuple2(request.getAttribute("trace_id"), + request.getAttribute("span_id"))) loggedIds.notifyAll() } }