Merge branch 'main' into indy-grails

Author: SylvainJuge

.github/workflows/prepare-release-branch.yml

@@ -31,6 +31,10 @@ jobs:
       - prereqs
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          # history is needed to allow fast-forward push below in case
+          # re-running this workflow after merging additional PRs to main
+          fetch-depth: 0
 
       - name: Create release branch
         run: |

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## Version 2.21.0 (2025-10-17)
+
 ## ⚠️ Breaking Changes
 
 - Hadoop JMX metrics have been renamed to align with semantic conventions.

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

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.20.1.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.22.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.21.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.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.20.1.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.22.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.21.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-javaagent.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.21.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.20.1.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.22.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.21.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-starter-2.21.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.20.1.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.22.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.21.0.jar
 No changes.

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

@@ -2143,7 +2143,14 @@ libraries:
   - name: camel-2.20
     description: |
       This instrumentation enables tracing for Apache Camel 2.x applications by generating spans for each route execution. For Camel versions 3.5 and newer, users should instead use the native 'camel-opentelemetry' component provided directly by the Camel project.
+    semantic_conventions:
+    - HTTP_CLIENT_SPANS
+    - HTTP_SERVER_SPANS
+    - DATABASE_CLIENT_SPANS
+    - MESSAGING_SPANS
     library_link: https://camel.apache.org/
+    features:
+    - HTTP_ROUTE
     source_path: instrumentation/camel-2.20
     scope:
       name: io.opentelemetry.camel-2.20
@@ -2173,6 +2180,12 @@ libraries:
           type: LONG
         - name: url.full
           type: STRING
+      - span_kind: CONSUMER
+        attributes:
+        - name: messaging.destination.name
+          type: STRING
+        - name: messaging.message.id
+          type: STRING
       - span_kind: INTERNAL
         attributes:
         - name: http.request.method
@@ -2183,6 +2196,10 @@ libraries:
           type: STRING
         - name: url.full
           type: STRING
+      - span_kind: PRODUCER
+        attributes:
+        - name: messaging.destination.name
+          type: STRING
       - span_kind: SERVER
         attributes:
         - name: http.request.method
@@ -2209,6 +2226,14 @@ libraries:
           type: LONG
         - name: url.full
           type: STRING
+      - span_kind: CONSUMER
+        attributes:
+        - name: camel.uri
+          type: STRING
+        - name: messaging.destination.name
+          type: STRING
+        - name: messaging.message.id
+          type: STRING
       - span_kind: INTERNAL
         attributes:
         - name: camel.uri
@@ -2221,6 +2246,12 @@ libraries:
           type: STRING
         - name: url.full
           type: STRING
+      - span_kind: PRODUCER
+        attributes:
+        - name: camel.uri
+          type: STRING
+        - name: messaging.destination.name
+          type: STRING
       - span_kind: SERVER
         attributes:
         - name: camel.uri
@@ -2247,6 +2278,12 @@ libraries:
           type: LONG
         - name: url.full
           type: STRING
+      - span_kind: CONSUMER
+        attributes:
+        - name: messaging.destination.name
+          type: STRING
+        - name: messaging.message.id
+          type: STRING
       - span_kind: INTERNAL
         attributes:
         - name: http.request.method
@@ -2257,6 +2294,10 @@ libraries:
           type: STRING
         - name: url.full
           type: STRING
+      - span_kind: PRODUCER
+        attributes:
+        - name: messaging.destination.name
+          type: STRING
       - span_kind: SERVER
         attributes:
         - name: http.request.method

docs/instrumentation-list.yaml

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

examples/distro/build.gradle

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