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

Author: SylvainJuge

CHANGELOG.md

@@ -2,10 +2,63 @@
 
 ## Unreleased
 
+## Version 2.20.0 (2025-09-13)
+
 ### Migration notes
 
 - The configuration option used to enable traces generated by the `dropwizard-views` instrumentation has changed from `otel.instrumentation.common.experimental.controller-telemetry.enabled` to `otel.instrumentation.common.experimental.view-telemetry.enabled`
   ([#14475](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14475))
+- Deprecated (and `-alpha`) SpanNames class was removed
+  ([#14582](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14582))
+
+### 🌟 New javaagent instrumentation
+
+- Add ClickHouse client v2 instrumentation
+  ([#14501](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14501))
+
+### 📈 Enhancements
+
+- Add code attributes for log4j1
+  ([#13947](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13947))
+- Add headers capture feature to Kafka 2.6 interceptors
+  ([#14290](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14290))
+- Support custom exception handling from logger instrumentation
+  ([#14493](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14493))
+- Add call depth check to executor instrumentation
+  ([#14546](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14546))
+- Add Spring starter thread details support
+  ([#14449](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14449))
+- Let AWS Lambda SQS handlers report partial batch failures
+  ([#14468](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14468))
+- Instrument instrumentation suppression API
+  ([#14565](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14565))
+- Declarative config: update file version support
+  ([#14593](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14593))
+- Add `url.template` support to Spring 6 RestTemplate
+  ([#14612](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14612))
+- Declarative config: add missing resource providers
+  ([#14222](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14222))
+- Declarative config: map common-enabled property
+  ([#14589](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14589))
+
+### 🛠️ Bug fixes
+
+- Fix non-lowercase messaging headers capture
+  ([#14479](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14479))
+- Fix JUL logger methods parameter mismatch
+  ([#14531](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14531))
+- Fix a test failure with latest Mongo release
+  ([#14642](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14642))
+
+### 🧰 Tooling
+
+- Add constructor to AgentClassLoader for custom parent ClassLoader
+  ([#14480](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14480))
+- Declarative config: make bridge usable by Spring starter and contrib
+  ([#14497](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14497),
+   [#14548](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14548))
+- Reduce log level for main jar detection
+  ([#14528](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14528))
 
 ## Version 2.19.0 (2025-08-17)
 

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.20.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.19.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.19.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.20.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.19.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.19.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.20.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.19.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.21.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.19.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-starter-2.20.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.19.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.21.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.19.0.jar
 No changes.

docs/instrumentation-list.yaml

@@ -5,6 +5,7 @@
 libraries:
   activej:
   - name: activej-http-6.0
+    display_name: ActiveJ
     description: This instrumentation enables HTTP server spans and HTTP server metrics
       for the ActiveJ HTTP server.
     library_link: https://activej.io/
@@ -60,6 +61,7 @@ libraries:
           type: STRING
   akka:
   - name: akka-actor-2.3
+    display_name: Akka Actors
     description: This instrumentation provides context propagation for Akka actors,
       it does not emit any telemetry on its own.
     library_link: https://doc.akka.io/libraries/akka-core/current/typed/index.html
@@ -72,6 +74,7 @@ libraries:
       - com.typesafe.akka:akka-actor_2.12:[2.3,)
       - com.typesafe.akka:akka-actor_2.13:[2.3,)
   - name: akka-actor-fork-join-2.5
+    display_name: Akka Actors
     description: This instrumentation provides context propagation for the Akka Fork-Join
       Pool, it does not emit any telemetry on its own.
     library_link: https://doc.akka.io/libraries/akka-core/current/typed/index.html
@@ -84,6 +87,7 @@ libraries:
       - com.typesafe.akka:akka-actor_2.13:[2.5.23,2.6)
       - com.typesafe.akka:akka-actor_2.11:[2.5,)
   - name: akka-http-10.0
+    display_name: Akka HTTP
     description: |
       This instrumentation enables HTTP client spans and metrics for the Akka HTTP client, and HTTP server spans and metrics for the Akka HTTP server.
     library_link: https://doc.akka.io/docs/akka-http/current/index.html

examples/distro/build.gradle

@@ -14,7 +14,7 @@ buildscript {
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.1"
     classpath "com.gradleup.shadow:shadow-gradle-plugin:9.1.0"
-    classpath "io.opentelemetry.instrumentation:gradle-plugins:2.20.0-alpha-SNAPSHOT"
+    classpath "io.opentelemetry.instrumentation:gradle-plugins:2.21.0-alpha-SNAPSHOT"
   }
 }
 
@@ -30,8 +30,8 @@ subprojects {
       opentelemetrySdk           : "1.54.0",
 
       // these lines are managed by .github/scripts/update-version.sh
-      opentelemetryJavaagent     : "2.20.0-SNAPSHOT",
-      opentelemetryJavaagentAlpha: "2.20.0-alpha-SNAPSHOT",
+      opentelemetryJavaagent     : "2.21.0-SNAPSHOT",
+      opentelemetryJavaagentAlpha: "2.21.0-alpha-SNAPSHOT",
 
       autoservice                : "1.1.1"
     ]

examples/extension/build.gradle

@@ -13,8 +13,8 @@ plugins {
   id "com.gradleup.shadow" version "9.1.0"
   id "com.diffplug.spotless" version "7.2.1"
 
-  id "io.opentelemetry.instrumentation.muzzle-generation" version "2.20.0-alpha-SNAPSHOT"
-  id "io.opentelemetry.instrumentation.muzzle-check" version "2.20.0-alpha-SNAPSHOT"
+  id "io.opentelemetry.instrumentation.muzzle-generation" version "2.21.0-alpha-SNAPSHOT"
+  id "io.opentelemetry.instrumentation.muzzle-check" version "2.21.0-alpha-SNAPSHOT"
 }
 
 group 'io.opentelemetry.example'
@@ -26,8 +26,8 @@ ext {
     opentelemetrySdk           : "1.54.0",
 
     // these lines are managed by .github/scripts/update-version.sh
-    opentelemetryJavaagent     : "2.20.0-SNAPSHOT",
-    opentelemetryJavaagentAlpha: "2.20.0-alpha-SNAPSHOT"
+    opentelemetryJavaagent     : "2.21.0-SNAPSHOT",
+    opentelemetryJavaagentAlpha: "2.21.0-alpha-SNAPSHOT"
   ]
 
   deps = [

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/InstrumentationAnalyzer.java

@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
-import io.opentelemetry.instrumentation.docs.internal.InstrumentationMetaData;
+import io.opentelemetry.instrumentation.docs.internal.InstrumentationMetadata;
 import io.opentelemetry.instrumentation.docs.internal.InstrumentationModule;
 import io.opentelemetry.instrumentation.docs.internal.InstrumentationType;
 import io.opentelemetry.instrumentation.docs.parsers.GradleParser;
@@ -58,7 +58,7 @@ public List<InstrumentationModule> analyze() throws IOException {
   }
 
   private void enrichModule(InstrumentationModule module) throws IOException {
-    InstrumentationMetaData metaData = getMetadata(module);
+    InstrumentationMetadata metaData = getMetadata(module);
     if (metaData != null) {
       module.setMetadata(metaData);
     }
@@ -69,7 +69,7 @@ private void enrichModule(InstrumentationModule module) throws IOException {
   }
 
   @Nullable
-  private InstrumentationMetaData getMetadata(InstrumentationModule module)
+  private InstrumentationMetadata getMetadata(InstrumentationModule module)
       throws JsonProcessingException {
     String metadataFile = fileManager.getMetaDataFile(module.getSrcPath());
     if (metadataFile == null) {