Merge remote-tracking branch 'upstream/main' into javahttpclient

trask · trask · commit 0bf803598994 · 2025-02-16T19:19:32.000-08:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ permissions:
   contents: read
 
 jobs:
-  required-jobs:
+  common:
     uses: ./.github/workflows/build-common.yml
 
   # test-latest-deps is intentionally not included in the release workflows
@@ -23,7 +23,7 @@ jobs:
       contents: write # for creating the release
     runs-on: ubuntu-latest
     needs:
-      - required-jobs
+      - common
     outputs:
       version: ${{ steps.create-github-release.outputs.version }}
       prior-version: ${{ steps.create-github-release.outputs.prior-version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,66 @@
 
 ### Migration notes
 
+- The `java.net.http.HttpClient` instrumentation package
+  `io.opentelemetry.instrumentation.httpclient` was deprecated in favor of the new package name
+  `io.opentelemetry.instrumentation.javahttpclient`
+
+## Version 2.13.0 (2025-02-14)
+
+### Migration notes
+
 - `io.opentelemetry.instrumentation.api.incubator.semconv.util.SpanNames` has been deprecated,
   replaced by the stable `io.opentelemetry.instrumentation.api.semconv.util.SpanNames`
 - In preparation for stabilizing HTTP library instrumentation, the classes and methods
   that were deprecated in the prior two releases have now been removed
-- The `java.net.http.HttpClient` instrumentation package
-  `io.opentelemetry.instrumentation.httpclient` was deprecated in favor of the new package name
-  `io.opentelemetry.instrumentation.javahttpclient`
+  ([#13135](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13135),
+   [#13150](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13150))
+- Deprecated Dubbo instrumentation method was removed
+  ([#13076](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13076))
+
+### 🌟 New javaagent instrumentation
+
+- `jdk.httpserver` instrumentation
+  ([#13243](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13243))
+
+### 🌟 New library instrumentation
+
+- `jdk.httpserver` instrumentation
+  ([#13243](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13243))
+
+### 📈 Enhancements
+
+- Add database client metrics to Lettuce instrumentation
+  ([#13032](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13032))
+- Stabilize io.opentelemetry.instrumentation.api.semconv.util.SpanNames
+  ([#12487](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12487))
+- Implement ExtendedTextMapGetter in http server instrumentations
+  ([#13053](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13053))
+- Implement ExtendedTextMapGetter in kafka-clients instrumentation
+  ([#13068](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13068))
+- Scrub system property secrets from process resource attribute values
+  ([#13225](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13225))
+- Add database client metrics to AWS SDK 2.x DynamoDB instrumentation
+  ([#13283](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13283))
+- Add runtime metrics to Spring boot starter
+  ([#13173](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13173))
+
+### 🛠️ Bug fixes
+
+- Fix akka shutdown hanging
+  ([#13073](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13073))
+- Fix MalformedInputException on z/OS
+  ([#13042](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13042))
+- Fix scope leak in aws sdk instrumentation
+  ([#13129](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13129))
+- Fix MapConverter does not get initialized when `OTEL_SDK_DISABLED` is set to true
+  ([#13224](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13224))
+- Fix logback appender on android
+  ([#13234](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13234))
+- Fix Ktor 3 CallLogging and StatusPages don't have Trace IDs
+  ([#13239](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13239))
+- Fix Micrometer-bridge breaking Spring Actuator metrics
+  ([#13083](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13083))
 
 ## Version 2.12.0 (2025-01-17)
 
diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
@@ -69,7 +69,7 @@ dependencies {
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
-  implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.5")
+  implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
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.13.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.12.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.12.0.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,4 +1,4 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.13.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.12.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.12.0.jar
 +++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.instrumentation.api.semconv.util.SpanNames  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
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.13.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.12.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.12.0.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.13.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.12.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.12.0.jar
 No changes.
diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.2"
     classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.6"
-    classpath "io.opentelemetry.instrumentation:gradle-plugins:2.13.0-alpha-SNAPSHOT"
+    classpath "io.opentelemetry.instrumentation:gradle-plugins:2.14.0-alpha-SNAPSHOT"
   }
 }
 
@@ -30,8 +30,8 @@ subprojects {
       opentelemetrySdk           : "1.47.0",
 
       // these lines are managed by .github/scripts/update-version.sh
-      opentelemetryJavaagent     : "2.13.0-SNAPSHOT",
-      opentelemetryJavaagentAlpha: "2.13.0-alpha-SNAPSHOT",
+      opentelemetryJavaagent     : "2.14.0-SNAPSHOT",
+      opentelemetryJavaagentAlpha: "2.14.0-alpha-SNAPSHOT",
 
       autoservice                : "1.1.1",
       junit                      : "5.11.4"
diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -13,8 +13,8 @@ plugins {
   id "com.gradleup.shadow" version "8.3.6"
   id "com.diffplug.spotless" version "7.0.2"
 
-  id "io.opentelemetry.instrumentation.muzzle-generation" version "2.13.0-alpha-SNAPSHOT"
-  id "io.opentelemetry.instrumentation.muzzle-check" version "2.13.0-alpha-SNAPSHOT"
+  id "io.opentelemetry.instrumentation.muzzle-generation" version "2.14.0-alpha-SNAPSHOT"
+  id "io.opentelemetry.instrumentation.muzzle-check" version "2.14.0-alpha-SNAPSHOT"
 }
 
 group 'io.opentelemetry.example'
@@ -26,8 +26,8 @@ ext {
     opentelemetrySdk           : "1.47.0",
 
     // these lines are managed by .github/scripts/update-version.sh
-    opentelemetryJavaagent     : "2.13.0-SNAPSHOT",
-    opentelemetryJavaagentAlpha: "2.13.0-alpha-SNAPSHOT",
+    opentelemetryJavaagent     : "2.14.0-SNAPSHOT",
+    opentelemetryJavaagentAlpha: "2.14.0-alpha-SNAPSHOT",
 
     junit                      : "5.11.4"
   ]
diff --git a/smoke-tests-otel-starter/spring-boot-3/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-3/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java
@@ -26,8 +26,7 @@ class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {
 
   @Override
   protected void assertAdditionalMetrics() {
-    if (System.getProperty("org.graalvm.nativeimage.imagecode") != null) {
-      // GraalVM native image does not support JFR
+    if (!isFlightRecorderAvailable()) {
       return;
     }
 
@@ -50,4 +49,13 @@ protected void assertAdditionalMetrics() {
           "io.opentelemetry.runtime-telemetry-java17", metric, AbstractIterableAssert::isNotEmpty);
     }
   }
+
+  private static boolean isFlightRecorderAvailable() {
+    try {
+      return (boolean)
+          Class.forName("jdk.jfr.FlightRecorder").getMethod("isAvailable").invoke(null);
+    } catch (ReflectiveOperationException exception) {
+      return false;
+    }
+  }
 }
diff --git a/version.gradle.kts b/version.gradle.kts
@@ -1,5 +1,5 @@
-val stableVersion = "2.13.0-SNAPSHOT"
-val alphaVersion = "2.13.0-alpha-SNAPSHOT"
+val stableVersion = "2.14.0-SNAPSHOT"
+val alphaVersion = "2.14.0-alpha-SNAPSHOT"
 
 allprojects {
   if (findProperty("otel.stable") != "true") {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.13.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.12.0.jar`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.12.0.jar`
`2`	`2`	`No changes.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Comparing source compatibility of opentelemetry-instrumentation-api-2.13.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.12.0.jar`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.12.0.jar`
`2`	`2`	`+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.instrumentation.api.semconv.util.SpanNames (not serializable)`
`3`	`3`	`+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.`
`4`	`4`	`+++ NEW SUPERCLASS: java.lang.Object`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`protected void assertAdditionalMetrics() {`
`29`		`- if (System.getProperty("org.graalvm.nativeimage.imagecode") != null) {`
`30`		`- // GraalVM native image does not support JFR`
	`29`	`+ if (!isFlightRecorderAvailable()) {`
`31`	`30`	`return;`
`32`	`31`	`}`
`33`	`32`
`@@ -50,4 +49,13 @@ protected void assertAdditionalMetrics() {`
`50`	`49`	`"io.opentelemetry.runtime-telemetry-java17", metric, AbstractIterableAssert::isNotEmpty);`
`51`	`50`	`}`
`52`	`51`	`}`
	`52`	`+`
	`53`	`+ private static boolean isFlightRecorderAvailable() {`
	`54`	`+ try {`
	`55`	`+ return (boolean)`
	`56`	`+ Class.forName("jdk.jfr.FlightRecorder").getMethod("isAvailable").invoke(null);`
	`57`	`+ } catch (ReflectiveOperationException exception) {`
	`58`	`+ return false;`
	`59`	`+ }`
	`60`	`+ }`
`53`	`61`	`}`