Merge branch 'main' into indy-finatra

trask · web-flow · commit 9d08717d06ac · 2025-10-17T12:23:08.000-07:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,6 +21,8 @@ jobs:
   release:
     permissions:
       contents: write # for creating the release
+      id-token: write # for signing artifacts with Sigstore
+      attestations: write # for uploading attestations
     runs-on: ubuntu-latest
     needs:
       - common
@@ -170,13 +172,22 @@ jobs:
           .github/scripts/generate-release-contributors.sh v$PRIOR_VERSION >> /tmp/release-notes.txt
           fi
 
+      - name: Simplify paths for attaching
+        run: |
+          cp javaagent/build/libs/opentelemetry-javaagent-${VERSION}.jar opentelemetry-javaagent.jar
+          cp javaagent/build/libs/opentelemetry-javaagent-${VERSION}.jar.asc opentelemetry-javaagent.jar.asc
+
+      - uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
+        with:
+          subject-path: |
+            opentelemetry-javaagent.jar
+            opentelemetry-java-instrumentation-SBOM.zip
+
       - id: create-github-release
         name: Create GitHub release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cp javaagent/build/libs/opentelemetry-javaagent-${VERSION}.jar opentelemetry-javaagent.jar
-          cp javaagent/build/libs/opentelemetry-javaagent-${VERSION}.jar.asc opentelemetry-javaagent.jar.asc
           gh release create --target $GITHUB_REF_NAME \
                             --title "Version $VERSION" \
                             --notes-file /tmp/release-notes.txt \
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,103 @@
 
 ## Unreleased
 
+## ⚠️ Breaking Changes
+
+- Hadoop JMX metrics have been renamed to align with semantic conventions.
+  If you are using Hadoop JMX metrics, you will need to update your dashboards and alerts.
+  ([#14411](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14411))
+- Lettuce 5.1 instrumentation now aligns with other instrumentations and no longer sets the
+  span status description.
+  ([#14886](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14886))
+
+## 🚫 Deprecations
+
+- The following Logback appender configuration properties have been renamed for clarity.
+  The old property names have been deprecated and will be removed in a future release:
+  - Java agent: `otel.instrumentation.logback-appender.experimental.capture-logstash-attributes` →
+    `otel.instrumentation.logback-appender.experimental.capture-logstash-marker-attributes`
+  - Spring Boot starter`otel.instrumentation.logback-appender.experimental.capture-logstash-markers` →
+    `otel.instrumentation.logback-appender.experimental.capture-logstash-marker-attributes`
+  - Logback appender configuration property: `captureLogstashAttributes` → `captureLogstashMarkerAttributes`
+  - Logback appender API: `setCaptureLogstashAttributes()` → `setCaptureLogstashMarkerAttributes()`
+  ([#14959](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14959))
+
+### 🌟 New javaagent instrumentation
+
+- Add Helidon instrumentation
+  ([#13776](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13776))
+- Add NATS instrumentation
+  ([#13999](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13999))
+- OpenSearch Transport v3.0 Implementation
+  ([#14823](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14823))
+- Add Kafka Connect API instrumentation
+  ([#14478](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14478))
+
+### 🌟 New library instrumentation
+
+- Add Helidon Instrumentation
+  ([#13776](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13776))
+- Add NATS instrumentation
+  ([#13999](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13999))
+- [Failsafe](https://failsafe.dev/) 3.0 instrumentation introduced
+  ([#14057](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14057))
+
+### 📈 Enhancements
+
+- Add experimental sqlcommenter support for JDBC and R2DBC
+  ([#13714](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13714))
+- Align Hadoop JMX metrics with semantic conventions
+  ([#14411](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14411))
+- Introduce experimental API for operation attributes to be passed only to OperationListeners
+  ([#14590](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14590))
+- Add span logging support for declarative configuration
+  ([#14591](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14591))
+- Add span logging support for Spring Boot starter
+  ([#14594](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14594))
+- Support capturing event names in logback, log4j, and jboss-logmanager appenders
+  ([#14649](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14649))
+- Include contrib sampler in java agent, e.g. for filtering health check endpoints
+  ([#14677](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14677))
+- Collect RPC metrics in Apache Dubbo instrumentation
+  ([#14690](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14690))
+- Add experimental option to disable noisy `redis.encode` span events in Lettuce instrumentation
+  ([#14750](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14750))
+- Support ListIterator in Kafka consumer instrumentation for Spark Structured Streaming
+  ([#14757](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14757))
+- Exclude wrapper classes in JDBC instrumentation
+  ([#14760](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14760))
+- Support JDBC URL parsing for OceanBase, PolarDB, and Lindorm databases
+  ([#14790](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14790))
+- Support context propagation in Guava AsyncEventBus
+  ([#14791](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14791))
+- Make `db.statement` attribute available during sampling in Lettuce instrumentation
+  ([#14856](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14856))
+- Add `code.namespace` and `code.function` attributes to Vaadin controller spans
+  ([#14882](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14882))
+- Add `code.namespace` and `code.function` attributes to Grails controller spans
+  ([#14885](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14885))
+- Support Hibernate 7.2.0.CR1
+  ([#14921](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14921))
+- Support capturing Logstash StructuredArguments as log record attributes
+  ([#14959](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14959))
+- Add gRPC request/response size metrics
+  ([#14342](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14342))
+
+### 🛠️ Bug fixes
+
+- Fix datasource instrumentation to support connection pools like Druid
+  ([#14602](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14602))
+- Fix Java HTTP client instrumentation to properly propagate request cancellation
+  ([#14747](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14747))
+- Fix Reactor Netty HTTP client instrumentation to handle IllegalStateException
+  ([#14778](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14778))
+- Fix executor context propagation when a stateless lambda instance is passed multiple times
+  ([#14841](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14841))
+- Remove span status description from Lettuce 5.1 instrumentation
+  ([#14886](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14886))
+- Fix Spring Boot autoconfiguration ordering for micrometer bridge
+  ([#15011](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15011))
+
 ## Version 2.20.1 (2025-09-22)
 
 ### 🛠️ Bug fixes
diff --git a/RELEASING.md b/RELEASING.md
@@ -65,8 +65,10 @@ and deadlocks.
 - Run the [Release workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/release.yml).
   - Press the "Run workflow" button, then select the release branch from the dropdown list,
     e.g. `release/v1.9.x`, and click the "Run workflow" button below that.
-  - This workflow will publish the artifacts to maven central and will publish a GitHub release
-    with release notes based on the change log and with the javaagent jar attached.
+  - This workflow will:
+    - Publish the artifacts to Maven Central
+    - Generate [GitHub Artifact Attestations](https://docs.github.com/en/actions/security-for-github-actions/using-artifact-attestations) for the Java agent jar and SBOM bundle
+    - Publish a GitHub release with release notes, Java agent jar, and SBOM bundle
   - Review and merge the pull request that it creates for updating the apidiff baseline version
     to the newly released version (note that this pull request won't be made until after the release
     is available in maven central).
diff --git a/smoke-tests/images/security-manager/build.gradle.kts b/smoke-tests/images/security-manager/build.gradle.kts
@@ -28,7 +28,7 @@ java {
 val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
 
 jib {
-  from.image = "openjdk:$targetJDK"
+  from.image = "eclipse-temurin:$targetJDK"
   to.image = "ghcr.io/$repo/smoke-test-security-manager:jdk$targetJDK-$tag"
   container.mainClass = "io.opentelemetry.smoketest.securitymanager.Main"
   container.jvmFlags = listOf("-Djava.security.manager", "-Djava.security.policy=/app/resources/security.policy")
diff --git a/smoke-tests/images/spring-boot/build.gradle.kts b/smoke-tests/images/spring-boot/build.gradle.kts
@@ -37,6 +37,12 @@ java {
   if (targetJDK == "8") {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+  } else if (targetJDK == "11") {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  } else if (targetJDK == "17") {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
@@ -51,7 +57,7 @@ springBoot {
 val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
 
 jib {
-  from.image = "openjdk:$targetJDK"
+  from.image = "eclipse-temurin:$targetJDK"
   to.image = "ghcr.io/$repo/smoke-test-spring-boot:jdk$targetJDK-$tag"
   container.ports = listOf("8080")
 }
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java
@@ -27,7 +27,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21, 25})
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21, 25})
+  @ValueSource(ints = {8, 21, 25})
   void shouldExportMetrics(int jdk) {
     start(jdk);
     client().get("/greeting").aggregate().join();
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java
@@ -24,7 +24,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
+  @ValueSource(ints = {8, 21}) // Security Manager removed in Java 25
   void securityManagerSmokeTest(int jdk) {
     start(jdk);
     testing.waitAndAssertTraces(
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java
@@ -30,7 +30,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21, 25})
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21, 25})
+  @ValueSource(ints = {8, 21, 25})
   void springBootSmokeTest(int jdk) {
     SmokeTestOutput output = start(jdk);
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,12 @@ java {`
`37`	`37`	`if (targetJDK == "8") {`
`38`	`38`	`sourceCompatibility = JavaVersion.VERSION_1_8`
`39`	`39`	`targetCompatibility = JavaVersion.VERSION_1_8`
	`40`	`+ } else if (targetJDK == "11") {`
	`41`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`42`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`43`	`+ } else if (targetJDK == "17") {`
	`44`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`45`	`+ targetCompatibility = JavaVersion.VERSION_17`
`40`	`46`	`}`
`41`	`47`	`}`
`42`	`48`
`@@ -51,7 +57,7 @@ springBoot {`
`51`	`57`	`val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"`
`52`	`58`
`53`	`59`	`jib {`
`54`		`- from.image = "openjdk:$targetJDK"`
	`60`	`+ from.image = "eclipse-temurin:$targetJDK"`
`55`	`61`	`to.image = "ghcr.io/$repo/smoke-test-spring-boot:jdk$targetJDK-$tag"`
`56`	`62`	`container.ports = listOf("8080")`
`57`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ protected void configure(SmokeTestOptions<Integer> options) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@ParameterizedTest`
`33`		`- @ValueSource(ints = {8, 11, 17, 21, 25})`
	`33`	`+ // restore after image update`
	`34`	`+ // @ValueSource(ints = {8, 11, 17, 21, 25})`
	`35`	`+ @ValueSource(ints = {8, 21, 25})`
`34`	`36`	`void springBootSmokeTest(int jdk) {`
`35`	`37`	`SmokeTestOutput output = start(jdk);`
`36`	`38`