Skip to content

Commit 03a5ed7

Browse files
authored
Code review sweep (run 25176007766) (#18447)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent daa9a8e commit 03a5ed7

10 files changed

Lines changed: 15 additions & 16 deletions

File tree

instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/HandlerData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private static Method findMatchingMethod(Method baseMethod, Method[] methods) {
120120
return null;
121121
}
122122

123-
private static String buildSpanName(String classPath, String methodPath) {
123+
private static String buildSpanName(@Nullable String classPath, @Nullable String methodPath) {
124124
StringBuilder spanNameBuilder = new StringBuilder();
125125
boolean skipSlash = false;
126126
if (classPath != null) {

instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/JaxrsPathUtil.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55

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

8+
import javax.annotation.Nullable;
9+
810
public class JaxrsPathUtil {
9-
public static String normalizePath(String path) {
11+
public static String normalizePath(@Nullable String path) {
1012
// ensure that non-empty path starts with /
1113
if (path == null || path.equals("/")) {
1214
path = "";

instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ configurations.configureEach {
5454
}
5555
}
5656

57-
tasks.withType<Test>().configureEach {
57+
tasks.test {
5858
// required on jdk17
5959
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
6060
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")

instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ otelJava {
2121
maxJavaVersionForTests.set(JavaVersion.VERSION_23)
2222
}
2323

24-
tasks.withType<Test>().configureEach {
24+
tasks.test {
2525
// required on jdk17
2626
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
2727
jvmArgs("--add-exports=java.base/sun.misc=ALL-UNNAMED")

instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ tasks {
5454

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

@@ -63,10 +67,3 @@ tasks {
6367
}.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
6468
}
6569
}
66-
67-
tasks.withType<Test>().configureEach {
68-
// required on jdk17
69-
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
70-
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
71-
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
72-
}

instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
implementation(project(":instrumentation:jaxws:jaxws-common:javaagent"))
1717
}
1818

19-
tasks.withType<Test>().configureEach {
19+
tasks.test {
2020
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
2121
systemProperty("collectMetadata", otelProps.collectMetadata)
2222
systemProperty("metadataConfig", "otel.instrumentation.common.experimental.controller-telemetry.enabled=true")

instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ otelJava {
2222
minJavaVersionSupported.set(JavaVersion.VERSION_17)
2323
}
2424

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

instrumentation/jaxws/jaxws-3.0-cxf-4.0-testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ otelJava {
1919
minJavaVersionSupported.set(JavaVersion.VERSION_17)
2020
}
2121

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

instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ otelJava {
1818
minJavaVersionSupported.set(JavaVersion.VERSION_17)
1919
}
2020

21-
tasks.withType<Test>().configureEach {
21+
tasks.test {
2222
// required on jdk17
2323
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
2424
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")

instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
99

10-
final class JaxWsCodeAttributesGetter implements CodeAttributesGetter<JaxWsRequest> {
10+
class JaxWsCodeAttributesGetter implements CodeAttributesGetter<JaxWsRequest> {
1111

1212
@Override
1313
public Class<?> getCodeClass(JaxWsRequest request) {

0 commit comments

Comments
 (0)