Skip to content

Commit fe56784

Browse files
authored
Enable http pipelining tests for jaxrs-2.0-resteasy (#8425)
1 parent 32426c8 commit fe56784

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ dependencies {
4646

4747
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
4848
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
49+
testInstrumentation(project(":instrumentation:undertow-1.4:javaagent"))
4950

5051
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
5152
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,4 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
3333
boolean shouldTestCompletableStageAsync() {
3434
false
3535
}
36-
37-
@Override
38-
boolean testHttpPipelining() {
39-
false
40-
}
4136
}

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ dependencies {
4444

4545
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
4646
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
47+
testInstrumentation(project(":instrumentation:undertow-1.4:javaagent"))
4748

4849
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
4950
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,4 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
2727
void stopServer(UndertowJaxrsServer server) {
2828
server.stop()
2929
}
30-
31-
@Override
32-
boolean testHttpPipelining() {
33-
false
34-
}
3530
}

instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55

66
package io.opentelemetry.javaagent.instrumentation.undertow;
77

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
89
import static java.util.Arrays.asList;
910

1011
import com.google.auto.service.AutoService;
1112
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1213
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1314
import java.util.List;
15+
import net.bytebuddy.matcher.ElementMatcher;
1416

1517
@AutoService(InstrumentationModule.class)
1618
public class UndertowInstrumentationModule extends InstrumentationModule {
@@ -19,6 +21,12 @@ public UndertowInstrumentationModule() {
1921
super("undertow", "undertow-1.4");
2022
}
2123

24+
@Override
25+
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
26+
// class added in 1.4.0
27+
return hasClassesNamed("io.undertow.Undertow$ListenerInfo");
28+
}
29+
2230
@Override
2331
public List<TypeInstrumentation> typeInstrumentations() {
2432
return asList(

0 commit comments

Comments
 (0)