From fe56784f27dc4ae99d1e3eb5333c45d6892e5dea Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 5 May 2023 16:10:08 +0300 Subject: [PATCH] Enable http pipelining tests for jaxrs-2.0-resteasy (#8425) --- .../jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts | 1 + .../src/test/groovy/ResteasyHttpServerTest.groovy | 5 ----- .../jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts | 1 + .../src/test/groovy/ResteasyHttpServerTest.groovy | 5 ----- .../undertow/UndertowInstrumentationModule.java | 8 ++++++++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts index 8ba5066255..83f0f6535d 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts @@ -46,6 +46,7 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) + testInstrumentation(project(":instrumentation:undertow-1.4:javaagent")) testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")) testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy index 2c69c1dd99..e026acb012 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy @@ -33,9 +33,4 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest { boolean shouldTestCompletableStageAsync() { false } - - @Override - boolean testHttpPipelining() { - false - } } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts index e42fdaa5e3..3c9e79e058 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts @@ -44,6 +44,7 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) + testInstrumentation(project(":instrumentation:undertow-1.4:javaagent")) testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")) testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy index 63c7b7556d..7922087750 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy @@ -27,9 +27,4 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest { void stopServer(UndertowJaxrsServer server) { server.stop() } - - @Override - boolean testHttpPipelining() { - false - } } diff --git a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java index bbe18133e2..10871858f4 100644 --- a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java +++ b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java @@ -5,12 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.undertow; +import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static java.util.Arrays.asList; import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import java.util.List; +import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) public class UndertowInstrumentationModule extends InstrumentationModule { @@ -19,6 +21,12 @@ public class UndertowInstrumentationModule extends InstrumentationModule { super("undertow", "undertow-1.4"); } + @Override + public ElementMatcher.Junction classLoaderMatcher() { + // class added in 1.4.0 + return hasClassesNamed("io.undertow.Undertow$ListenerInfo"); + } + @Override public List typeInstrumentations() { return asList(