Skip to content

Commit 790b080

Browse files
zeitlingerzeitlinger
committed
apply diff
1 parent cafe401 commit 790b080

31 files changed

+99
-243
lines changed

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5AsyncTest.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12;
77

8-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
8+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

1111
public class Jetty12Servlet5AsyncTest extends Jetty12Servlet5Test {
@@ -19,9 +19,4 @@ public Class<? extends Servlet> servlet() {
1919
public boolean errorEndpointUsesSendError() {
2020
return false;
2121
}
22-
23-
@Override
24-
public boolean isAsyncTest() {
25-
return true;
26-
}
2722
}

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5FakeAsyncTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12;
77

8-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
8+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

1111
public class Jetty12Servlet5FakeAsyncTest extends Jetty12Servlet5Test {

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5SyncTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12;
77

8-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
8+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

1111
public class Jetty12Servlet5SyncTest extends Jetty12Servlet5Test {

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5Test.java‎

Lines changed: 11 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,16 @@
66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12;
77

88
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
9-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
109

11-
import io.opentelemetry.api.trace.SpanKind;
1210
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1311
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
1412
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
15-
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
1613
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.AbstractServlet5Test;
17-
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
18-
import io.opentelemetry.sdk.trace.data.SpanData;
19-
import java.io.IOException;
20-
import java.io.Writer;
14+
import jakarta.servlet.Servlet;
2115
import java.net.InetSocketAddress;
2216
import java.nio.charset.StandardCharsets;
23-
import jakarta.servlet.Servlet;
24-
import jakarta.servlet.http.HttpServletRequest;
25-
import org.eclipse.jetty.server.Server;
26-
import org.eclipse.jetty.server.handler.ErrorHandler;
2717
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
18+
import org.eclipse.jetty.server.Server;
2819
import org.eclipse.jetty.util.Callback;
2920
import org.junit.jupiter.api.extension.RegisterExtension;
3021

@@ -35,63 +26,28 @@ public abstract class Jetty12Servlet5Test
3526
protected static final InstrumentationExtension testing =
3627
HttpServerInstrumentationExtension.forAgent();
3728

38-
static final boolean IS_BEFORE_94 = isBefore94();
39-
40-
public static boolean isBefore94() {
41-
String[] version = Server.getVersion().split("\\.");
42-
int major = Integer.parseInt(version[0]);
43-
int minor = Integer.parseInt(version[1]);
44-
return major < 9 || (major == 9 && minor < 4);
45-
}
46-
4729
@Override
4830
protected void configure(HttpServerTestOptions options) {
4931
super.configure(options);
5032
options.setTestNotFound(false);
5133
options.setExpectedException(new IllegalStateException(EXCEPTION.getBody()));
5234
options.setContextPath("/jetty-context");
53-
options.setVerifyServerSpanEndTime(!isAsyncTest());
54-
}
55-
56-
@Override
57-
protected boolean hasResponseSpan(ServerEndpoint endpoint) {
58-
return (IS_BEFORE_94 && endpoint == EXCEPTION && !isAsyncTest())
59-
|| super.hasResponseSpan(endpoint);
60-
}
61-
62-
public boolean isAsyncTest() {
63-
return false;
64-
}
65-
66-
@Override
67-
protected SpanDataAssert assertResponseSpan(
68-
SpanDataAssert span,
69-
SpanData controllerSpan,
70-
SpanData handlerSpan,
71-
String method,
72-
ServerEndpoint endpoint) {
73-
if (IS_BEFORE_94 && endpoint.equals(EXCEPTION)) {
74-
span.satisfies(it -> assertThat(it.getName()).matches(".*\\.sendError"))
75-
.hasKind(SpanKind.INTERNAL)
76-
.hasParent(handlerSpan);
77-
}
78-
79-
return super.assertResponseSpan(span, controllerSpan, handlerSpan, method, endpoint);
8035
}
8136

8237
@Override
8338
protected Server setupServer() throws Exception {
8439
Server jettyServer = new Server(new InetSocketAddress("localhost", port));
8540

8641
ServletContextHandler servletContext = new ServletContextHandler(getContextPath());
87-
servletContext.setErrorHandler((request,response,callback) -> {
88-
String message = (String) request.getAttribute("org.eclipse.jetty.server.error_message");
89-
if (message != null) {
90-
response.write(true, StandardCharsets.UTF_8.encode(message), Callback.NOOP);
91-
}
92-
callback.succeeded();
93-
return true;
94-
});
42+
servletContext.setErrorHandler(
43+
(request, response, callback) -> {
44+
String message = (String) request.getAttribute("org.eclipse.jetty.server.error_message");
45+
if (message != null) {
46+
response.write(true, StandardCharsets.UTF_8.encode(message), Callback.NOOP);
47+
}
48+
callback.succeeded();
49+
return true;
50+
});
9551
setupServlets(servletContext);
9652
jettyServer.setHandler(servletContext);
9753

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12ServletHandlerTest.java‎

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,24 @@
66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12;
77

88
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
9-
import static org.assertj.core.api.Assertions.assertThat;
109

1110
import io.opentelemetry.api.common.AttributeKey;
12-
import io.opentelemetry.api.trace.SpanKind;
1311
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1412
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
1513
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
16-
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
1714
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.AbstractServlet5Test;
1815
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
19-
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
20-
import io.opentelemetry.sdk.trace.data.SpanData;
2116
import io.opentelemetry.semconv.HttpAttributes;
22-
import java.io.IOException;
23-
import java.io.Writer;
17+
import jakarta.servlet.Servlet;
18+
import java.nio.charset.StandardCharsets;
2419
import java.util.HashSet;
2520
import java.util.Set;
26-
import jakarta.servlet.Servlet;
27-
import jakarta.servlet.http.HttpServletRequest;
21+
import org.eclipse.jetty.ee10.servlet.ServletHandler;
22+
import org.eclipse.jetty.server.Request;
23+
import org.eclipse.jetty.server.Response;
2824
import org.eclipse.jetty.server.Server;
2925
import org.eclipse.jetty.server.handler.ErrorHandler;
30-
import org.eclipse.jetty.ee10.servlet.ServletHandler;
26+
import org.eclipse.jetty.util.Callback;
3127
import org.junit.jupiter.api.extension.RegisterExtension;
3228

3329
public class Jetty12ServletHandlerTest extends AbstractServlet5Test<Server, ServletHandler> {
@@ -51,29 +47,6 @@ protected void configure(HttpServerTestOptions options) {
5147
});
5248
}
5349

54-
@Override
55-
public boolean hasResponseSpan(ServerEndpoint endpoint) {
56-
return (Jetty12Servlet5Test.IS_BEFORE_94 && endpoint.equals(EXCEPTION))
57-
|| super.hasResponseSpan(endpoint);
58-
}
59-
60-
@Override
61-
protected SpanDataAssert assertResponseSpan(
62-
SpanDataAssert span,
63-
SpanData controllerSpan,
64-
SpanData handlerSpan,
65-
String method,
66-
ServerEndpoint endpoint) {
67-
68-
if (Jetty12Servlet5Test.IS_BEFORE_94 && endpoint.equals(EXCEPTION)) {
69-
span.satisfies(it -> assertThat(it.getName()).matches(".*\\.sendError"))
70-
.hasKind(SpanKind.INTERNAL)
71-
.hasParent(handlerSpan);
72-
}
73-
74-
return super.assertResponseSpan(span, controllerSpan, handlerSpan, method, endpoint);
75-
}
76-
7750
@Override
7851
protected Server setupServer() throws Exception {
7952
Server server = new Server(port);
@@ -83,11 +56,14 @@ protected Server setupServer() throws Exception {
8356
server.addBean(
8457
new ErrorHandler() {
8558
@Override
86-
protected void handleErrorPage(
87-
HttpServletRequest request, Writer writer, int code, String message)
88-
throws IOException {
89-
Throwable th = (Throwable) request.getAttribute("jakarta.servlet.error.exception");
90-
writer.write(th != null ? th.getMessage() : message);
59+
public boolean handle(Request request, Response response, Callback callback) {
60+
String message =
61+
(String) request.getAttribute("org.eclipse.jetty.server.error_message");
62+
if (message != null) {
63+
response.write(true, StandardCharsets.UTF_8.encode(message), Callback.NOOP);
64+
}
65+
callback.succeeded();
66+
return true;
9167
}
9268
});
9369
server.start();

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12DispatchTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12.dispatch;
77

88
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
9-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.JettyServlet5Test;
9+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12.Jetty12Servlet5Test;
1010

11-
public abstract class Jetty12DispatchTest extends JettyServlet5Test {
11+
public abstract class Jetty12DispatchTest extends Jetty12Servlet5Test {
1212

1313
@Override
1414
protected void configure(HttpServerTestOptions options) {

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12Servlet5DispatchAsyncTest.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,16 @@
1515
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1616
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1717

18-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.dispatch.JettyDispatchTest;
19-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
2019
import jakarta.servlet.Servlet;
2120
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2221

23-
public class Jetty12Servlet5DispatchAsyncTest extends JettyDispatchTest {
22+
public class Jetty12Servlet5DispatchAsyncTest extends Jetty12DispatchTest {
2423
@Override
2524
public Class<? extends Servlet> servlet() {
2625
return TestServlet5.Async.class;
2726
}
2827

29-
@Override
30-
public boolean isAsyncTest() {
31-
return true;
32-
}
33-
3428
@Override
3529
protected void setupServlets(ServletContextHandler context) throws Exception {
3630
super.setupServlets(context);

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12Servlet5DispatchImmediateTest.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,16 @@
1515
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1616
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1717

18-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.dispatch.JettyDispatchTest;
19-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
2019
import jakarta.servlet.Servlet;
2120
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2221

23-
public class Jetty12Servlet5DispatchImmediateTest extends JettyDispatchTest {
22+
public class Jetty12Servlet5DispatchImmediateTest extends Jetty12DispatchTest {
2423
@Override
2524
public Class<? extends Servlet> servlet() {
2625
return TestServlet5.Async.class;
2726
}
2827

29-
@Override
30-
public boolean isAsyncTest() {
31-
return true;
32-
}
33-
3428
@Override
3529
public boolean errorEndpointUsesSendError() {
3630
return false;

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12Servlet5ForwardTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1616
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1717

18-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.RequestDispatcherServlet;
19-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.RequestDispatcherServlet;
19+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
2020
import jakarta.servlet.Servlet;
2121
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2222

‎instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/dispatch/Jetty12Servlet5IncludeTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12.dispatch;
77

88
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.AUTH_REQUIRED;
9+
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;
910
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_PARAMETERS;
1011
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ERROR;
1112
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
@@ -15,8 +16,8 @@
1516
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1617

1718
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
18-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.RequestDispatcherServlet;
19-
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
19+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.RequestDispatcherServlet;
20+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
2021
import jakarta.servlet.Servlet;
2122
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
2223

@@ -52,6 +53,8 @@ protected void setupServlets(ServletContextHandler context) throws Exception {
5253
addServlet(context, "/dispatch" + EXCEPTION.getPath(), RequestDispatcherServlet.Include.class);
5354
addServlet(
5455
context, "/dispatch" + AUTH_REQUIRED.getPath(), RequestDispatcherServlet.Include.class);
56+
addServlet(
57+
context, "/dispatch" + CAPTURE_HEADERS.getPath(), RequestDispatcherServlet.Include.class);
5558
addServlet(
5659
context,
5760
"/dispatch" + CAPTURE_PARAMETERS.getPath(),

0 commit comments

Comments
 (0)