Skip to content

Small changes to servlet3 tests #12456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Small changes to servlet3 tests #12456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...v3_0/tomcat/RequestDispatcherServlet.java → ...ervlet/v3_0/RequestDispatcherServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ion/servlet/v3_0/tomcat/TestServlet3.java → ...umentation/servlet/v3_0/TestServlet3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3AsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ...pentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3FakeAsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3SyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...o/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServletHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion ...pentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyDispatchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ...javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3DispatchAsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...agent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3DispatchImmediateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...metry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3ForwardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...metry/javaagent/instrumentation/servlet/v3_0/jetty/dispatch/JettyServlet3IncludeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions .../opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3AsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 1 addition & 7 deletions ...ntelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3FakeAsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 1 addition & 7 deletions ...o/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3SyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions ...va/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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",
Expand Down
9 changes: 1 addition & 8 deletions ...vaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3DispatchAsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 1 addition & 8 deletions ...ent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3DispatchImmediateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 2 additions & 9 deletions ...try/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3ForwardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 2 additions & 9 deletions ...try/javaagent/instrumentation/servlet/v3_0/tomcat/dispatch/TomcatServlet3IncludeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading