Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instrumentation into metadata-lambda-3

jaydeluca · jaydeluca · commit 2814cc816009 · 2025-08-28T13:31:36.000-04:00
diff --git a/benchmark-overhead/gradle/wrapper/gradle-wrapper.jar b/benchmark-overhead/gradle/wrapper/gradle-wrapper.jar
diff --git a/benchmark-overhead/gradle/wrapper/gradle-wrapper.properties b/benchmark-overhead/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/benchmark-overhead/gradlew b/benchmark-overhead/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/examples/distro/gradle/wrapper/gradle-wrapper.jar b/examples/distro/gradle/wrapper/gradle-wrapper.jar
diff --git a/examples/distro/gradle/wrapper/gradle-wrapper.properties b/examples/distro/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/distro/gradlew b/examples/distro/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/examples/extension/gradle/wrapper/gradle-wrapper.jar b/examples/extension/gradle/wrapper/gradle-wrapper.jar
diff --git a/examples/extension/gradle/wrapper/gradle-wrapper.properties b/examples/extension/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/extension/gradlew b/examples/extension/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/gradle-plugins/gradle/wrapper/gradle-wrapper.properties b/gradle-plugins/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/instrumentation-annotations/build.gradle.kts b/instrumentation-annotations/build.gradle.kts
@@ -11,3 +11,10 @@ group = "io.opentelemetry.instrumentation"
 dependencies {
   api("io.opentelemetry:opentelemetry-api")
 }
+
+tasks.test {
+  // This module does not have tests, but has example classes in the test directory. Gradle 9 fails
+  // the build when there are source files in the test directory but no tests to run so we disable
+  // the test task.
+  enabled = false
+}
diff --git a/instrumentation/quarkus-resteasy-reactive/quarkus2-testing/build.gradle.kts b/instrumentation/quarkus-resteasy-reactive/quarkus2-testing/build.gradle.kts
@@ -41,6 +41,8 @@ val quarkusTestCompileOnlyConfiguration by configurations.creating {
 val testModelPath = layout.buildDirectory.file("quarkus-app-test-model.dat").get().asFile.toPath()
 
 val buildModel = tasks.register("buildModel") {
+  dependsOn(configurations.named("testRuntimeClasspath"))
+
   if (testModelPath.notExists()) {
     doLast {
       val modelParameter = ModelParameterImpl()
diff --git a/instrumentation/quarkus-resteasy-reactive/quarkus3-testing/build.gradle.kts b/instrumentation/quarkus-resteasy-reactive/quarkus3-testing/build.gradle.kts
@@ -48,6 +48,8 @@ val quarkusTestCompileOnlyConfiguration by configurations.creating {
 val testModelPath = layout.buildDirectory.file("quarkus-app-test-model.dat").get().asFile.toPath()
 
 val buildModel = tasks.register("buildModel") {
+  dependsOn(configurations.named("testRuntimeClasspath"))
+
   if (testModelPath.notExists()) {
     doLast {
       val modelParameter = ModelParameterImpl()
diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/PatchLogger.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/PatchLogger.java
@@ -344,15 +344,15 @@ public static PatchLogger getGlobal() {
     return global;
   }
 
-  public static void setFilter(Filter filter) {}
+  public void setFilter(Filter filter) {}
 
-  public static Filter getFilter() {
+  public Filter getFilter() {
     return null;
   }
 
-  public static void setUseParentHandlers(boolean useParentHandlers) {}
+  public void setUseParentHandlers(boolean useParentHandlers) {}
 
-  public static boolean getUseParentHandlers() {
+  public boolean getUseParentHandlers() {
     return true;
   }
 
diff --git a/javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/PatchLoggerTest.java b/javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/PatchLoggerTest.java
@@ -12,6 +12,7 @@
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -31,6 +32,7 @@ void testImplementsAllMethods() {
     for (Method method : PatchLogger.class.getMethods()) {
       MethodSignature methodSignature = new MethodSignature();
       methodSignature.name = method.getName();
+      methodSignature.modifiers = method.getModifiers();
       for (Class<?> clazz : method.getParameterTypes()) {
         String parameterType = clazz.getName();
         methodSignature.parameterTypes.add(
@@ -50,6 +52,7 @@ void testImplementsAllMethods() {
       String methodName = method.getName();
       MethodSignature builder = new MethodSignature();
       builder.name = methodName;
+      builder.modifiers = method.getModifiers();
       List<String> parameterTypes = new ArrayList<>();
       for (Class<?> clazz : method.getParameterTypes()) {
         parameterTypes.add(clazz.getName());
@@ -792,6 +795,7 @@ static class MethodSignature {
     String name;
     List<String> parameterTypes = new ArrayList<>();
     String returnType;
+    int modifiers;
 
     @Override
     public boolean equals(@Nullable Object obj) {
@@ -804,18 +808,19 @@ public boolean equals(@Nullable Object obj) {
       MethodSignature other = (MethodSignature) obj;
       return Objects.equals(name, other.name)
           && Objects.equals(parameterTypes, other.parameterTypes)
-          && Objects.equals(returnType, other.returnType);
+          && Objects.equals(returnType, other.returnType)
+          && Modifier.isStatic(modifiers) == Modifier.isStatic(other.modifiers);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(name, parameterTypes, returnType);
+      return Objects.hash(name, parameterTypes, returnType, Modifier.isStatic(modifiers));
     }
 
     @Override
     public String toString() {
       String params = parameterTypes.stream().reduce((a, b) -> a + ", " + b).orElse("");
-      return name + "(" + params + ")" + returnType;
+      return Modifier.toString(modifiers) + " " + name + "(" + params + ")" + returnType;
     }
   }
 }
diff --git a/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts
@@ -56,6 +56,9 @@ tasks {
   checkstyleAotTest {
     isEnabled = false
   }
+  bootJar {
+    enabled = false
+  }
 }
 
 // To be able to execute the tests as GraalVM native executables
diff --git a/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts
@@ -59,6 +59,9 @@ tasks {
   checkstyleAotTest {
     isEnabled = false
   }
+  bootJar {
+    enabled = false
+  }
 }
 
 // To be able to execute the tests as GraalVM native executables
diff --git a/smoke-tests-otel-starter/spring-boot-reactive-3/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-reactive-3/build.gradle.kts
@@ -50,6 +50,9 @@ tasks {
   checkstyleAotTest {
     isEnabled = false
   }
+  bootJar {
+    enabled = false
+  }
 }
 
 // To be able to execute the tests as GraalVM native executables

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`	`3`	`#`
`4`		`-# Copyright © 2015-2021 the original authors.`
	`4`	`+# Copyright © 2015 the original authors.`
`5`	`5`	`#`
`6`	`6`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`7`	`7`	`# you may not use this file except in compliance with the License.`