open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small changes to servlet3 tests (#12456)

This commit is contained in:
Lauri Tulmin 2024-10-17 16:41:06 +03:00 committed by GitHub
parent 4497fbf968
commit c3d8ed4ee6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 37 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/RequestDispatcherServlet.java → instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/RequestDispatcherServlet.java
View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat;
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
import java.io.IOException;
import javax.servlet.RequestDispatcher;

2
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TestServlet3.java → instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/TestServlet3.java
View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat;
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
import static io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest.controller;
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;

4
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3AsyncTest.java
View File

@ -5,10 +5,10 @@
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
public class JettyServlet3AsyncTest extends JettyServlet3Test {
class JettyServlet3AsyncTest extends JettyServlet3Test {
@Override
public Class<? extends Servlet> servlet() {

4
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3FakeAsyncTest.java
View File

@ -5,10 +5,10 @@
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
public class JettyServlet3FakeAsyncTest extends JettyServlet3Test {
class JettyServlet3FakeAsyncTest extends JettyServlet3Test {
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.FakeAsync.class;

4
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3SyncTest.java
View File

@ -5,10 +5,10 @@
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
public class JettyServlet3SyncTest extends JettyServlet3Test {
class JettyServlet3SyncTest extends JettyServlet3Test {
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Sync.class;

4
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServletHandlerTest.java
View File

@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumenta
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.AbstractServlet3Test;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.semconv.HttpAttributes;
@ -30,7 +30,7 @@ import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.servlet.ServletHandler;
import org.junit.jupiter.api.extension.RegisterExtension;
public class JettyServletHandlerTest extends AbstractServlet3Test<Server, ServletHandler> {
class JettyServletHandlerTest extends AbstractServlet3Test<Server, ServletHandler> {
@RegisterExtension
protected static final InstrumentationExtension testing =

2
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyDispatchTest.java
View File

@ -8,7 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty.dispatch;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty.JettyServlet3Test;
public abstract class JettyDispatchTest extends JettyServlet3Test {
abstract class JettyDispatchTest extends JettyServlet3Test {
@Override
protected void configure(HttpServerTestOptions options) {

4
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3DispatchAsyncTest.java
View File

@ -15,11 +15,11 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
public class JettyServlet3DispatchAsyncTest extends JettyDispatchTest {
class JettyServlet3DispatchAsyncTest extends JettyDispatchTest {
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Async.class;

4
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3DispatchImmediateTest.java
View File

@ -15,11 +15,11 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
public class JettyServlet3DispatchImmediateTest extends JettyDispatchTest {
class JettyServlet3DispatchImmediateTest extends JettyDispatchTest {
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Async.class;

6
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3ForwardTest.java
View File

@ -15,12 +15,12 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.RequestDispatcherServlet;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.RequestDispatcherServlet;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
public class JettyServlet3ForwardTest extends JettyDispatchTest {
class JettyServlet3ForwardTest extends JettyDispatchTest {
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Sync.class; // dispatch to sync servlet

6
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3IncludeTest.java
View File

@ -15,12 +15,12 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.RequestDispatcherServlet;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.RequestDispatcherServlet;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
public class JettyServlet3IncludeTest extends JettyDispatchTest {
class JettyServlet3IncludeTest extends JettyDispatchTest {
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Sync.class; // dispatch to sync servlet

8
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3AsyncTest.java
View File

@ -5,17 +5,11 @@
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.junit.jupiter.api.extension.RegisterExtension;
class TomcatServlet3AsyncTest extends TomcatServlet3Test {
@RegisterExtension
protected static final InstrumentationExtension testing =
HttpServerInstrumentationExtension.forAgent();
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Async.class;

8
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3FakeAsyncTest.java
View File

@ -5,17 +5,11 @@
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.junit.jupiter.api.extension.RegisterExtension;
class TomcatServlet3FakeAsyncTest extends TomcatServlet3Test {
@RegisterExtension
protected static final InstrumentationExtension testing =
HttpServerInstrumentationExtension.forAgent();
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.FakeAsync.class;

8
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3SyncTest.java
View File

@ -5,17 +5,11 @@
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.junit.jupiter.api.extension.RegisterExtension;
class TomcatServlet3SyncTest extends TomcatServlet3Test {
@RegisterExtension
protected static final InstrumentationExtension testing =
HttpServerInstrumentationExtension.forAgent();
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Sync.class;

7
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java
View File

@ -12,6 +12,8 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.AbstractServlet3Test;
@ -38,11 +40,16 @@ import org.apache.catalina.startup.Tomcat;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
public abstract class TomcatServlet3Test extends AbstractServlet3Test<Tomcat, Context> {
@RegisterExtension
protected static final InstrumentationExtension testing =
HttpServerInstrumentationExtension.forAgent();
private static final ServerEndpoint ACCESS_LOG_SUCCESS =
new ServerEndpoint(
"ACCESS_LOG_SUCCESS",

9
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3DispatchAsyncTest.java
View File

@ -15,20 +15,13 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.apache.catalina.Context;
import org.junit.jupiter.api.extension.RegisterExtension;
class TomcatServlet3DispatchAsyncTest extends TomcatDispatchTest {
@RegisterExtension
protected static final InstrumentationExtension testing =
HttpServerInstrumentationExtension.forAgent();
@Override
protected void configure(HttpServerTestOptions options) {
super.configure(options);

9
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3DispatchImmediateTest.java
View File

@ -15,20 +15,13 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.apache.catalina.Context;
import org.junit.jupiter.api.extension.RegisterExtension;
class TomcatServlet3DispatchImmediateTest extends TomcatDispatchTest {
@RegisterExtension
protected static final InstrumentationExtension testing =
HttpServerInstrumentationExtension.forAgent();
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Sync.class;

11
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3ForwardTest.java
View File

@ -15,21 +15,14 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.RequestDispatcherServlet;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.RequestDispatcherServlet;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.apache.catalina.Context;
import org.junit.jupiter.api.extension.RegisterExtension;
class TomcatServlet3ForwardTest extends TomcatDispatchTest {
@RegisterExtension
protected static final InstrumentationExtension testing =
HttpServerInstrumentationExtension.forAgent();
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Sync.class; // dispatch to sync servlet

11
instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3IncludeTest.java
View File

@ -14,21 +14,14 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.RequestDispatcherServlet;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.RequestDispatcherServlet;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
import javax.servlet.Servlet;
import org.apache.catalina.Context;
import org.junit.jupiter.api.extension.RegisterExtension;
class TomcatServlet3IncludeTest extends TomcatDispatchTest {
@RegisterExtension
protected static final InstrumentationExtension testing =
HttpServerInstrumentationExtension.forAgent();
@Override
public Class<? extends Servlet> servlet() {
return TestServlet3.Sync.class; // dispatch to sync servlet