From e4c2b7689942a0c3447bdf7d2e6ddd64ec4e133d Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 16 Jul 2025 10:35:09 -0700 Subject: [PATCH 1/2] Fix javadoc --- .../v2_2/Servlet2HttpServletResponseInstrumentation.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java index 2585b4c59566..7af6c370016f 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java @@ -11,12 +11,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.namedOneOf; -import io.opentelemetry.context.Context; -import io.opentelemetry.context.Scope; -import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.servlet.ServletRequestContext; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; @@ -32,7 +28,7 @@ * *

This instrumentation intercepts status setting methods from Servlet 2.0 specification and * stores that status into context store. Then {@link Servlet2Advice#stopSpan(ServletRequest, - * ServletResponse, Throwable, CallDepth, ServletRequestContext, Context, Scope)} can get it from + * ServletResponse, Throwable, Servlet2Advice.AdviceScope)} can get it from * context and set required span attribute. */ public class Servlet2HttpServletResponseInstrumentation implements TypeInstrumentation { From 2e3519e51f24c720f597670d48df15c6d4ab7e61 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Wed, 16 Jul 2025 17:41:29 +0000 Subject: [PATCH 2/2] ./gradlew spotlessApply --- .../v2_2/Servlet2HttpServletResponseInstrumentation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java index 7af6c370016f..c1e554ca0ef7 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java @@ -28,8 +28,8 @@ * *

This instrumentation intercepts status setting methods from Servlet 2.0 specification and * stores that status into context store. Then {@link Servlet2Advice#stopSpan(ServletRequest, - * ServletResponse, Throwable, Servlet2Advice.AdviceScope)} can get it from - * context and set required span attribute. + * ServletResponse, Throwable, Servlet2Advice.AdviceScope)} can get it from context and set required + * span attribute. */ public class Servlet2HttpServletResponseInstrumentation implements TypeInstrumentation { @Override