Skip to content

Code review sweep (run 25156701996) #18442

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
trask merged 7 commits into from
Apr 30, 2026
Merged

Code review sweep (run 25156701996) #18442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8501057
Review fixes for jaxrs-2.0-resteasy-3.1:javaagent
otelbot[bot] Apr 30, 2026
0037f02
Review fixes for jaxrs-2.0-resteasy-common-3.0:javaagent
otelbot[bot] Apr 30, 2026
911f417
Review fixes for jaxrs-2.0:jaxrs-2.0-tomee-testing
otelbot[bot] Apr 30, 2026
5d5c650
Review fixes for jaxrs-2.0:jaxrs-2.0-wildfly-testing
otelbot[bot] Apr 30, 2026
641ace5
Review fixes for jaxrs-3.0-annotations:javaagent
otelbot[bot] Apr 30, 2026
c227a02
Review fixes for jaxrs-3.0-jersey-3.0:javaagent
otelbot[bot] Apr 30, 2026
31c6c4a
Review fixes for jaxrs-3.0-resteasy-6.0:javaagent
otelbot[bot] Apr 30, 2026
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
3 changes: 2 additions & 1 deletion ...y/javaagent/instrumentation/jaxrs/v2_0/resteasy/v3_1/Resteasy31InstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public Resteasy31InstrumentationModule() {
@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return hasClassesNamed(
// added in javax.ws.rs:javax.ws.rs-api 2.0
// added in javax.ws.rs:javax.ws.rs-api 1.0, removed in 3.0
// (renamed to jakarta.ws.rs.Path)
"javax.ws.rs.Path",
// added in 3.1.0.Final (moved from core.interception)
"org.jboss.resteasy.core.interception.jaxrs.PostMatchContainerRequestContext");
Expand Down
5 changes: 4 additions & 1 deletion ...ntelemetry/javaagent/instrumentation/jaxrs/v2_0/resteasy/v3_1/ResteasyHttpServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
import org.junit.jupiter.api.extension.RegisterExtension;

class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
private static final boolean EXPERIMENTAL_ATTRIBUTES =
Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");

@RegisterExtension
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();

Expand Down Expand Up @@ -50,6 +53,6 @@ protected void configure(HttpServerTestOptions options) {

@Override
protected boolean testExperimental() {
return Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");
return EXPERIMENTAL_ATTRIBUTES;
}
}
5 changes: 4 additions & 1 deletion ...metry/javaagent/instrumentation/jaxrs/v2_0/resteasy/v3_1/ResteasyJettyHttpServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
import org.junit.jupiter.api.extension.RegisterExtension;

class ResteasyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
private static final boolean EXPERIMENTAL_ATTRIBUTES =
Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");

@RegisterExtension
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();

Expand All @@ -24,6 +27,6 @@ protected void configure(HttpServerTestOptions options) {

@Override
protected boolean testExperimental() {
return Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");
return EXPERIMENTAL_ATTRIBUTES;
}
}
4 changes: 2 additions & 2 deletions ...telemetry/javaagent/instrumentation/jaxrs/v2_0/resteasy/common/v3_0/ResteasySpanName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public void updateServerSpanName(Context context, @Nullable String name) {

@Override
@Nullable
public String get(Context context, String name) {
if (name.isEmpty()) {
public String get(Context context, @Nullable String name) {
if (name == null || name.isEmpty()) {
return null;
}
return ServletContextPath.prepend(context, JaxrsContextPath.prepend(context, name));
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ otelJava {
maxJavaVersionForTests.set(JavaVersion.VERSION_23)
}

tasks.withType<Test>().configureEach {
tasks.test {
// required on jdk17
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
jvmArgs("--add-exports=java.base/sun.misc=ALL-UNNAMED")
Expand Down
11 changes: 4 additions & 7 deletions instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ tasks {

// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
jvmArgs("--add-modules=java.se")
// required on jdk17
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
// add offset to default port values
jvmArgs("-Djboss.socket.binding.port-offset=400")

Expand All @@ -62,10 +66,3 @@ tasks {
}.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
}
}

tasks.withType<Test>().configureEach {
// required on jdk17
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
}
2 changes: 1 addition & 1 deletion instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
}

tasks {
withType<Test>().configureEach {
test {
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")

systemProperty("collectMetadata", otelProps.collectMetadata)
Expand Down
5 changes: 4 additions & 1 deletion .../opentelemetry/javaagent/instrumentation/jaxrs/v3_0/jersey/v3_0/JerseyHttpServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
import org.junit.jupiter.api.extension.RegisterExtension;

class JerseyHttpServerTest extends JaxRsHttpServerTest<Server> {
private static final boolean EXPERIMENTAL_ATTRIBUTES =
Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");

@RegisterExtension
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();

Expand Down Expand Up @@ -71,6 +74,6 @@ protected void configure(HttpServerTestOptions options) {

@Override
protected boolean testExperimental() {
return Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");
return EXPERIMENTAL_ATTRIBUTES;
}
}
5 changes: 4 additions & 1 deletion ...telemetry/javaagent/instrumentation/jaxrs/v3_0/jersey/v3_0/JerseyJettyHttpServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
import org.junit.jupiter.api.extension.RegisterExtension;

class JerseyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
private static final boolean EXPERIMENTAL_ATTRIBUTES =
Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");

@RegisterExtension
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();

Expand All @@ -35,6 +38,6 @@ protected boolean testInterfaceMethodWithPath() {

@Override
protected boolean testExperimental() {
return Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");
return EXPERIMENTAL_ATTRIBUTES;
}
}
5 changes: 4 additions & 1 deletion ...ntelemetry/javaagent/instrumentation/jaxrs/v3_0/resteasy/v6_0/ResteasyHttpServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
import org.junit.jupiter.api.extension.RegisterExtension;

class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
private static final boolean EXPERIMENTAL_ATTRIBUTES =
Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");

@RegisterExtension
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();

Expand Down Expand Up @@ -50,6 +53,6 @@ protected void configure(HttpServerTestOptions options) {

@Override
protected boolean testExperimental() {
return Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");
return EXPERIMENTAL_ATTRIBUTES;
}
}
5 changes: 4 additions & 1 deletion ...metry/javaagent/instrumentation/jaxrs/v3_0/resteasy/v6_0/ResteasyJettyHttpServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
import org.junit.jupiter.api.extension.RegisterExtension;

class ResteasyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
private static final boolean EXPERIMENTAL_ATTRIBUTES =
Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");

@RegisterExtension
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();

Expand All @@ -24,6 +27,6 @@ protected void configure(HttpServerTestOptions options) {

@Override
protected boolean testExperimental() {
return Boolean.getBoolean("otel.instrumentation.jaxrs.experimental-span-attributes");
return EXPERIMENTAL_ATTRIBUTES;
}
}
Loading