Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-spring

SylvainJuge · SylvainJuge · commit 5b7ccc2271ff · 2025-07-08T12:12:41.000+02:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -57,7 +57,7 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: ${{ matrix.language }}
           # using "latest" helps to keep up with the latest Kotlin support
@@ -73,6 +73,6 @@ jobs:
         run: ./gradlew assemble -x javadoc -x :instrumentation:quarkus-resteasy-reactive:quarkus3-testing:quarkusGenerateCodeDev -x :instrumentation:quarkus-resteasy-reactive:quarkus2-testing:quarkusGenerateCodeDev --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           sarif_file: results.sarif
diff --git a/benchmark-overhead/Dockerfile.petclinic b/benchmark-overhead/Dockerfile.petclinic
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.27_6-jdk@sha256:cc77e8b834bfa18f4bf93d1649e27256213490168b35d7c72a2b92545763fab8 as app-build
+FROM eclipse-temurin:11.0.27_6-jdk@sha256:0296b46d1949f49054497db63a7630d4805ef587c2937eb23a582a2ffdde88da as app-build
 
 # This is the base image that will contain a built version of the spring-petclinic-rest
 # application. Installing the dependencies and maven compiling the application is time
diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  id("com.diffplug.spotless") version "7.0.4"
+  id("com.diffplug.spotless") version "7.1.0"
 }
 
 spotless {
@@ -16,13 +16,13 @@ repositories {
 }
 
 dependencies {
-  implementation(enforcedPlatform("org.junit:junit-bom:5.13.2"))
+  implementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
 
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("org.testcontainers:postgresql:1.21.3")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.0.0")
   testImplementation("org.jooq:joox:2.0.1")
   testImplementation("com.jayway.jsonpath:json-path:2.9.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.17")
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=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.0.4"
+  id("com.diffplug.spotless") version "7.1.0"
 }
 
 spotless {
@@ -54,7 +54,7 @@ dependencies {
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.1.0")
   implementation("com.google.guava:guava:33.4.8-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
@@ -71,7 +71,7 @@ dependencies {
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.2"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
   testImplementation("org.assertj:assertj-core:3.27.3")
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -6,7 +6,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 
 // this line is managed by .github/scripts/update-sdk-version.sh
 val otelSdkVersion = "1.51.0"
-val otelContribVersion = "1.46.0-alpha"
+val otelContribVersion = "1.47.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 // Need both BOM and groovy jars
@@ -81,7 +81,7 @@ val CORE_DEPENDENCIES = listOf(
 // There are dependencies included here that appear to have no usages, but are maintained at
 // this top level to help consistently satisfy large numbers of transitive dependencies.
 val DEPENDENCIES = listOf(
-  "org.junit.jupiter:junit-jupiter-api:5.13.2",
+  "org.junit.jupiter:junit-jupiter-api:5.13.3",
   "org.spockframework:spock-core:2.4-M6-groovy-4.0",
   "org.spockframework:spock-junit4:2.4-M6-groovy-4.0",
 
diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.4"
+    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.1.0"
     classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.8"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:2.18.0-alpha-SNAPSHOT"
   }
@@ -69,7 +69,7 @@ subprojects {
 
     testImplementation("org.mockito:mockito-core:5.18.0")
 
-    testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.2"))
+    testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
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=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/distro/instrumentation/servlet-3/build.gradle b/examples/distro/instrumentation/servlet-3/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testImplementation "com.squareup.okhttp3:okhttp:4.12.0"
+  testImplementation "com.squareup.okhttp3:okhttp:5.0.0"
   testImplementation "javax.servlet:javax.servlet-api:3.0.1"
   testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"
   testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"
diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle
@@ -6,7 +6,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.1")
   testImplementation("com.google.protobuf:protobuf-java-util:4.31.1")
-  testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.0.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 
diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -11,7 +11,7 @@ plugins {
   See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
    */
   id "com.gradleup.shadow" version "8.3.8"
-  id "com.diffplug.spotless" version "7.0.4"
+  id "com.diffplug.spotless" version "7.1.0"
 
   id "io.opentelemetry.instrumentation.muzzle-generation" version "2.18.0-alpha-SNAPSHOT"
   id "io.opentelemetry.instrumentation.muzzle-check" version "2.18.0-alpha-SNAPSHOT"
@@ -100,11 +100,11 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.1")
   testImplementation("com.google.protobuf:protobuf-java-util:4.31.1")
-  testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.0.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.2"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
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=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
@@ -44,7 +44,7 @@ dependencies {
 
   testImplementation("org.assertj:assertj-core:3.27.3")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.2"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
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=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
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=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/instrumentation-docs/build.gradle.kts b/instrumentation-docs/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
   implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.1")
   implementation("io.opentelemetry:opentelemetry-sdk-common")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.2"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
   testImplementation("org.assertj:assertj-core:3.27.3")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
diff --git a/instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/UnitConverter.java b/instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/UnitConverter.java
@@ -33,17 +33,12 @@ class UnitConverter {
    * @param sourceUnit a source unit supported by requested converter
    * @param targetUnit a target unit supported by requested converter
    * @return an instance of converter, or {@literal null} if {@code sourceUnit} is {@literal null}
-   *     or empty, which means that there is no conversion needed.
-   * @throws IllegalArgumentException if {@code targetUnit} is empty, or matching converter was not
-   *     found for provided units.
+   *     or empty or if {@code targetUnit} is empty, which means that there is no conversion needed.
+   * @throws IllegalArgumentException if matching converter was not found for provided units.
    */
   @Nullable
   public static UnitConverter getInstance(@Nullable String sourceUnit, String targetUnit) {
-    if (targetUnit.isEmpty()) {
-      throw new IllegalArgumentException("Non empty targetUnit must be provided");
-    }
-
-    if (sourceUnit == null || sourceUnit.isEmpty()) {
+    if (sourceUnit == null || sourceUnit.isEmpty() || targetUnit.isEmpty()) {
       // No conversion is needed
       return null;
     }
diff --git a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/engine/UnitConverterTest.java b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/engine/UnitConverterTest.java
@@ -5,9 +5,9 @@
 
 package io.opentelemetry.instrumentation.jmx.engine;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -58,10 +58,11 @@ void shouldHandleUnsupportedConversion(String sourceUnit, String targetUnit) {
   @CsvSource({
     ", s", // null -> "s"
     "'', s", // "" -> "s"
+    "1, ''", // empty target unit
   })
   void shouldSkipConversionWhenSourceUnitNotSpecified(String sourceUnit, String targetUnit) {
     UnitConverter converter = UnitConverter.getInstance(sourceUnit, targetUnit);
-    assertNull(converter);
+    assertThat(converter).isNull();
   }
 
   @Test
diff --git a/licenses/licenses.md b/licenses/licenses.md
diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts
@@ -15,7 +15,7 @@ otelJava {
   maxJavaVersionForTests.set(JavaVersion.VERSION_11)
 }
 
-val dockerJavaVersion = "3.5.2"
+val dockerJavaVersion = "3.5.3"
 dependencies {
   testCompileOnly("com.google.auto.value:auto-value-annotations")
   testAnnotationProcessor("com.google.auto.value:auto-value")
diff --git a/smoke-tests/images/early-jdk8/Dockerfile b/smoke-tests/images/early-jdk8/Dockerfile
@@ -1,5 +1,5 @@
 # https://github.com/zulu-openjdk/zulu-openjdk/blob/master/ubuntu/8u412-8.78/Dockerfile
-FROM ubuntu:noble-20250529@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f
+FROM ubuntu:noble-20250619@sha256:440dcf6a5640b2ae5c77724e68787a906afb8ddee98bf86db94eea8528c2c076
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM eclipse-temurin:11.0.27_6-jdk@sha256:cc77e8b834bfa18f4bf93d1649e27256213490168b35d7c72a2b92545763fab8 as app-build`
	`1`	`+FROM eclipse-temurin:11.0.27_6-jdk@sha256:0296b46d1949f49054497db63a7630d4805ef587c2937eb23a582a2ffdde88da as app-build`
`2`	`2`
`3`	`3`	`# This is the base image that will contain a built version of the spring-petclinic-rest`
`4`	`4`	`# application. Installing the dependencies and maven compiling the application is time`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ buildscript {`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`dependencies {`
`15`		`- classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.4"`
	`15`	`+ classpath "com.diffplug.spotless:spotless-plugin-gradle:7.1.0"`
`16`	`16`	`classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.8"`
`17`	`17`	`classpath "io.opentelemetry.instrumentation:gradle-plugins:2.18.0-alpha-SNAPSHOT"`
`18`	`18`	`}`
`@@ -69,7 +69,7 @@ subprojects {`
`69`	`69`
`70`	`70`	`testImplementation("org.mockito:mockito-core:5.18.0")`
`71`	`71`
`72`		`- testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.2"))`
	`72`	`+ testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))`
`73`	`73`	`testImplementation("org.junit.jupiter:junit-jupiter-api")`
`74`	`74`	`testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")`
`75`	`75`	`testRuntimeOnly("org.junit.platform:junit-platform-launcher")`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies {`
`27`	`27`	`exclude group: 'org.eclipse.jetty', module: 'jetty-server'`
`28`	`28`	`}`
`29`	`29`
`30`		`- testImplementation "com.squareup.okhttp3:okhttp:4.12.0"`
	`30`	`+ testImplementation "com.squareup.okhttp3:okhttp:5.0.0"`
`31`	`31`	`testImplementation "javax.servlet:javax.servlet-api:3.0.1"`
`32`	`32`	`testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"`
`33`	`33`	`testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"`