customizeContent

open-telemetry · Apr 21, 2021 · a85bb62 · a85bb62
1 parent 023eac4
commit a85bb62
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 37 deletions.
diff --git a/...ation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java b/...ation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java
@@ -81,17 +81,11 @@ public Context startSpan(
     onConnectionAndRequest(spanBuilder, connection, request);
 
     Context context = withServerSpan(parentContext, spanBuilder.startSpan());
-    context = customizeContext(context, request);
     attachServerContext(context, storage);
 
     return context;
   }
 
-  /** Override in subclass to customize context that is returned by {@code startSpan}. */
-  protected Context customizeContext(Context context, REQUEST request) {
-    return context;
-  }
-
   /**
    * Convenience method. Delegates to {@link #end(Context, Object, long)}, passing {@code timestamp}
    * value of {@code -1}.

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HttpServerTracer.java b/.../java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HttpServerTracer.java
@@ -18,12 +18,7 @@ public static Jetty11HttpServerTracer tracer() {
   }
 
   public Context startServerSpan(HttpServletRequest request) {
-    return startSpan(request, "HTTP " + request.getMethod(), false);
-  }
-
-  @Override
-  protected Context customizeContext(Context context, HttpServletRequest request) {
-    context = super.customizeContext(context, request);
+    Context context = startSpan(request, "HTTP " + request.getMethod(), false);
     return AppServerBridge.init(context, false);
   }
 

diff --git a/...in/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HttpServerTracer.java b/...in/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HttpServerTracer.java
@@ -18,12 +18,7 @@ public static Jetty8HttpServerTracer tracer() {
   }
 
   public Context startServerSpan(HttpServletRequest request) {
-    return startSpan(request, "HTTP " + request.getMethod(), false);
-  }
-
-  @Override
-  protected Context customizeContext(Context context, HttpServletRequest request) {
-    context = super.customizeContext(context, request);
+    Context context = startSpan(request, "HTTP " + request.getMethod(), false);
     return AppServerBridge.init(context, false);
   }
 

diff --git a/...brary/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java b/...brary/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java
@@ -48,18 +48,14 @@ public Context startSpan(REQUEST request, String spanName, boolean servlet) {
     accessor.setRequestAttribute(request, "trace_id", spanContext.getTraceId());
     accessor.setRequestAttribute(request, "span_id", spanContext.getSpanId());
 
+    // add context for tracking whether servlet instrumentation has updated the server span name
     if (servlet) {
       // server span name shouldn't be updated when server span was created from a call to Servlet
       // (if created from a call to Filter then name may be updated from updateContext)
-      ServerSpanNaming.setUpdatedServerSpanName(SERVLET);
+      context = ServerSpanNaming.init(context, SERVLET);
+    } else {
+      context = ServerSpanNaming.init(context, CONTAINER);
     }
-    return addServletContextPath(context, request);
-  }
-
-  @Override
-  protected Context customizeContext(Context context, REQUEST request) {
-    // add context for tracking whether servlet instrumentation has updated the server span name
-    context = ServerSpanNaming.init(context, CONTAINER);
     // add context for current request's context path
     return addServletContextPath(context, request);
   }

diff --git a/.../src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatTracer.java b/.../src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatTracer.java
@@ -32,11 +32,7 @@ public abstract class TomcatTracer extends HttpServerTracer<Request, Response, R
   private static final Logger log = LoggerFactory.getLogger(TomcatTracer.class);
 
   public Context startServerSpan(Request request) {
-    return startSpan(request, request, request, "HTTP " + request.method().toString());
-  }
-
-  @Override
-  protected Context customizeContext(Context context, Request request) {
+    Context context = startSpan(request, request, request, "HTTP " + request.method().toString());
     context = ServerSpanNaming.init(context, CONTAINER);
     return AppServerBridge.init(context);
   }

diff --git a/...in/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java b/...in/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java
@@ -35,12 +35,8 @@ protected String getInstrumentationName() {
   }
 
   public Context startServerSpan(HttpServerExchange exchange) {
-    return startSpan(
-        exchange, exchange, exchange, "HTTP " + exchange.getRequestMethod().toString());
-  }
-
-  @Override
-  protected Context customizeContext(Context context, HttpServerExchange exchange) {
+    Context context =
+        startSpan(exchange, exchange, exchange, "HTTP " + exchange.getRequestMethod().toString());
     context = ServerSpanNaming.init(context, CONTAINER);
     // span is ended when counter reaches 0, we start from 2 which accounts for the
     // handler that started the span and exchange completion listener