Skip to content

Commit aae9aa8

Browse files
committed
fix compile error
1 parent 5acfa1a commit aae9aa8

File tree

2 files changed

+3
-3
lines changed
  • instrumentation
    • jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0
    • servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet

2 files changed

+3
-3
lines changed

instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12Helper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1010
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
11-
import io.opentelemetry.javaagent.instrumentation.servlet.ServletHelper;
11+
import io.opentelemetry.javaagent.instrumentation.servlet.BaseServletHelper.ServletAsyncContext;
1212
import javax.annotation.Nullable;
1313
import org.eclipse.jetty.server.HttpStream;
1414
import org.eclipse.jetty.server.Request;
@@ -54,7 +54,7 @@ public void end(Context context, Request request, Response response, @Nullable T
5454
error = AppServerBridge.getException(context);
5555
}
5656
if (error == null) {
57-
error = (Throwable) request.getAttribute(ServletHelper.ASYNC_EXCEPTION_ATTRIBUTE);
57+
error = ServletAsyncContext.getAsyncException(context);
5858
}
5959

6060
instrumenter.end(context, request, response, error);

instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ private static boolean sameTrace(Span oneSpan, Span otherSpan) {
181181
return oneSpan.getSpanContext().getTraceId().equals(otherSpan.getSpanContext().getTraceId());
182182
}
183183

184-
protected static class ServletAsyncContext implements ImplicitContextKeyed {
184+
public static class ServletAsyncContext implements ImplicitContextKeyed {
185185
private static final ContextKey<ServletAsyncContext> CONTEXT_KEY =
186186
named("opentelemetry-servlet-async-context");
187187

0 commit comments

Comments
 (0)