Small changes to servlet3 tests (#12456)

open-telemetry · Oct 17, 2024 · c3d8ed4 · c3d8ed4
1 parent 4497fbf
commit c3d8ed4
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 76 deletions.
diff --git a/...v3_0/tomcat/RequestDispatcherServlet.java → ...ervlet/v3_0/RequestDispatcherServlet.java b/...v3_0/tomcat/RequestDispatcherServlet.java → ...ervlet/v3_0/RequestDispatcherServlet.java
@@ -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;

diff --git a/...ion/servlet/v3_0/tomcat/TestServlet3.java → ...umentation/servlet/v3_0/TestServlet3.java b/...ion/servlet/v3_0/tomcat/TestServlet3.java → ...umentation/servlet/v3_0/TestServlet3.java
@@ -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;

diff --git a/...io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3AsyncTest.java b/...io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3AsyncTest.java
@@ -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() {

diff --git a/...pentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3FakeAsyncTest.java b/...pentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3FakeAsyncTest.java
@@ -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;

diff --git a/.../io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3SyncTest.java b/.../io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3SyncTest.java
@@ -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;

diff --git a/...o/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServletHandlerTest.java b/...o/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServletHandlerTest.java
@@ -15,7 +15,7 @@
 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.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 =

diff --git a/...pentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyDispatchTest.java b/...pentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyDispatchTest.java
@@ -8,7 +8,7 @@
 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) {

diff --git a/...javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3DispatchAsyncTest.java b/...javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3DispatchAsyncTest.java
@@ -15,11 +15,11 @@
 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;

diff --git a/...agent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3DispatchImmediateTest.java b/...agent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3DispatchImmediateTest.java
@@ -15,11 +15,11 @@
 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;

diff --git a/...metry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3ForwardTest.java b/...metry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3ForwardTest.java
@@ -15,12 +15,12 @@
 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

diff --git a/...metry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3IncludeTest.java b/...metry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3IncludeTest.java
@@ -15,12 +15,12 @@
 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

diff --git a/.../opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3AsyncTest.java b/.../opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3AsyncTest.java
@@ -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;

diff --git a/...ntelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3FakeAsyncTest.java b/...ntelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3FakeAsyncTest.java
@@ -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;

diff --git a/...o/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3SyncTest.java b/...o/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3SyncTest.java
@@ -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;

diff --git a/...va/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java b/...va/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java
@@ -12,6 +12,8 @@
 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.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",

diff --git a/...vaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3DispatchAsyncTest.java b/...vaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3DispatchAsyncTest.java
@@ -15,20 +15,13 @@
 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);

diff --git a/...ent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3DispatchImmediateTest.java b/...ent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3DispatchImmediateTest.java
@@ -15,20 +15,13 @@
 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;

diff --git a/...try/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3ForwardTest.java b/...try/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3ForwardTest.java
@@ -15,21 +15,14 @@
 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

diff --git a/...try/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3IncludeTest.java b/...try/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3IncludeTest.java
@@ -14,21 +14,14 @@
 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