Merge branch 'main' into log4j-appender

oliver-zhang · web-flow · commit 7145461b9194 · 2025-07-22T09:29:55.000+08:00
diff --git a/.github/workflows/auto-license-report.yml b/.github/workflows/auto-license-report.yml
@@ -43,7 +43,7 @@ jobs:
       - id: create-patch
         name: Create patch file
         run: |
-          git add -N licenses
+          git add -N --ignore-removal licenses
           git diff > patch
           if [ -s patch ]; then
             echo "exists=true" >> "$GITHUB_OUTPUT"
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:2fd4e5e0ba72f725016e757a5688ce14fda6a792da566fca62ef6ff73f50df35 as app-build
+FROM eclipse-temurin:11.0.27_6-jdk@sha256:cbc64d6d1a253561c029fd951575c449d70558063d5f898ab0b6213bc1fb0109 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
@@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
 RUN ./mvnw package -Dmaven.test.skip=true
 RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar
 
-FROM bellsoft/liberica-openjdk-alpine:21.0.7@sha256:143e4c24da2872fad6803fcbde5d335bbbe47dddb8ebf20fd916c02bdc7f463b
+FROM bellsoft/liberica-openjdk-alpine:21.0.8@sha256:c4052811bba52c7a06ebde235c839108bf723dfab3c65066f61145a252480b16
 COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
 WORKDIR /app
 EXPOSE 9966
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.1.0"
+  id("com.diffplug.spotless") version "7.2.1"
 }
 
 spotless {
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-  implementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
+  implementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
 
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("org.testcontainers:postgresql:1.21.3")
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.1.0"
+  id("com.diffplug.spotless") version "7.2.1"
 }
 
 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.1.0")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
   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.3"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
   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
@@ -27,7 +27,7 @@ val DEPENDENCY_BOMS = listOf(
   // for some reason boms show up as runtime dependencies in license and vulnerability scans
   // even if they are only used by test dependencies, so not using junit bom since it is LGPL
 
-  "com.fasterxml.jackson:jackson-bom:2.19.1",
+  "com.fasterxml.jackson:jackson-bom:2.19.2",
   "com.squareup.okio:okio-bom:3.15.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
   "com.google.guava:guava-bom:33.4.8-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
@@ -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.3",
+  "org.junit.jupiter:junit-jupiter-api:5.13.4",
   "org.spockframework:spock-core:2.4-M6-groovy-4.0",
   "org.spockframework:spock-junit4:2.4-M6-groovy-4.0",
 
diff --git a/docs/apidiffs/2.18.1_vs_2.18.0/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/2.18.1_vs_2.18.0/opentelemetry-instrumentation-annotations.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.18.1.jar against opentelemetry-instrumentation-annotations-2.18.0.jar
+No changes.
diff --git a/docs/apidiffs/2.18.1_vs_2.18.0/opentelemetry-instrumentation-api.txt b/docs/apidiffs/2.18.1_vs_2.18.0/opentelemetry-instrumentation-api.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-api-2.18.1.jar against opentelemetry-instrumentation-api-2.18.0.jar
+No changes.
diff --git a/docs/apidiffs/2.18.1_vs_2.18.0/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/2.18.1_vs_2.18.0/opentelemetry-spring-boot-autoconfigure.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.18.1.jar against opentelemetry-spring-boot-autoconfigure-2.18.0.jar
+No changes.
diff --git a/docs/apidiffs/2.18.1_vs_2.18.0/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/2.18.1_vs_2.18.0/opentelemetry-spring-boot-starter.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.18.1.jar against opentelemetry-spring-boot-starter-2.18.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.19.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.18.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.19.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.18.1.jar
 No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.19.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.18.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.19.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.18.1.jar
 No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.19.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.18.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.19.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.18.1.jar
 No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-starter-2.19.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.18.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.19.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.18.1.jar
 No changes.
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.1.0"
+    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.1"
     classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.8"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:2.19.0-alpha-SNAPSHOT"
   }
@@ -69,7 +69,7 @@ subprojects {
 
     testImplementation("org.mockito:mockito-core:5.18.0")
 
-    testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
+    testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
     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/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   testImplementation("org.testcontainers:testcontainers:1.21.3")
-  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.1")
+  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.2")
   testImplementation("com.google.protobuf:protobuf-java-util:4.31.1")
   testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
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.1.0"
+  id "com.diffplug.spotless" version "7.2.1"
 
   id "io.opentelemetry.instrumentation.muzzle-generation" version "2.19.0-alpha-SNAPSHOT"
   id "io.opentelemetry.instrumentation.muzzle-check" version "2.19.0-alpha-SNAPSHOT"
@@ -98,13 +98,13 @@ dependencies {
 
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:1.21.3")
-  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.1")
+  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.2")
   testImplementation("com.google.protobuf:protobuf-java-util:4.31.1")
   testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
   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/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.3"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
diff --git a/instrumentation-docs/build.gradle.kts b/instrumentation-docs/build.gradle.kts
@@ -9,10 +9,10 @@ otelJava {
 
 dependencies {
   implementation("org.yaml:snakeyaml:2.4")
-  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.1")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2")
   implementation("io.opentelemetry:opentelemetry-sdk-common")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
   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/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts
@@ -62,8 +62,6 @@ dependencies {
 }
 
 tasks.withType<Test>().configureEach {
-  // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.spring-webflux.experimental-span-attributes=true")
   // required on jdk17
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
   jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/SpringWebfluxConfig.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/SpringWebfluxConfig.java
diff --git a/licenses/jackson-annotations-2.19.2.jar/META-INF/LICENSE b/licenses/jackson-annotations-2.19.2.jar/META-INF/LICENSE
diff --git a/licenses/jackson-annotations-2.19.2.jar/META-INF/NOTICE b/licenses/jackson-annotations-2.19.2.jar/META-INF/NOTICE
diff --git a/licenses/jackson-core-2.19.2.jar/META-INF/LICENSE b/licenses/jackson-core-2.19.2.jar/META-INF/LICENSE
diff --git a/licenses/jackson-core-2.19.2.jar/META-INF/NOTICE b/licenses/jackson-core-2.19.2.jar/META-INF/NOTICE
diff --git a/licenses/jackson-databind-2.19.2.jar/META-INF/LICENSE b/licenses/jackson-databind-2.19.2.jar/META-INF/LICENSE
diff --git a/licenses/jackson-databind-2.19.2.jar/META-INF/NOTICE b/licenses/jackson-databind-2.19.2.jar/META-INF/NOTICE
diff --git a/licenses/jackson-dataformat-yaml-2.19.2.jar/META-INF/LICENSE b/licenses/jackson-dataformat-yaml-2.19.2.jar/META-INF/LICENSE
diff --git a/licenses/jackson-dataformat-yaml-2.19.2.jar/META-INF/NOTICE b/licenses/jackson-dataformat-yaml-2.19.2.jar/META-INF/NOTICE
diff --git a/licenses/licenses.md b/licenses/licenses.md
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-20250619@sha256:440dcf6a5640b2ae5c77724e68787a906afb8ddee98bf86db94eea8528c2c076
+FROM ubuntu:noble-20250714@sha256:a08e551cb33850e4740772b38217fc1796a66da2506d312abe51acda354ff061
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/testing/wiremock-shaded-for-testing/build.gradle.kts b/testing/wiremock-shaded-for-testing/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   // class conflict reported in the failure.
   implementation("com.github.tomakehurst:wiremock-jre8:2.35.2")
   implementation("com.google.errorprone:error_prone_annotations")
-  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.1")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2")
 }
 
 tasks {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("java")`
`3`		`- id("com.diffplug.spotless") version "7.1.0"`
	`3`	`+ id("com.diffplug.spotless") version "7.2.1"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`spotless {`
`@@ -16,7 +16,7 @@ repositories {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`dependencies {`
`19`		`- implementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))`
	`19`	`+ implementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))`
`20`	`20`
`21`	`21`	`testImplementation("org.testcontainers:testcontainers:1.21.3")`
`22`	`22`	`testImplementation("org.testcontainers:postgresql:1.21.3")`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.18.1.jar against opentelemetry-instrumentation-annotations-2.18.0.jar`
	`2`	`+No changes.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.19.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.18.0.jar`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.19.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.18.1.jar`
`2`	`2`	`No changes.`