Merge branch 'main' into unsafe

Author: laurit

.github/renovate.json5

@@ -116,6 +116,7 @@
       // junit 6+ requires Java 17+
       matchPackageNames: [
         'org.junit:**',
+        'org.junit.jupiter:**',
       ],
       matchUpdateTypes: [
         'major',

.github/workflows/issue-management-stale-action.yml

@@ -13,15 +13,19 @@ jobs:
   stale:
     permissions:
       contents: read
+      actions: write # because actions/stale deletes its old cache before saving new one
       issues: write  # for actions/stale to close stale issues
       pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
+      # Action #1: Handle issues/PRs awaiting author feedback
+      # - After 7 days inactive: Adds "stale" label + warning comment
+      # - After 7 more days inactive: Closes
       - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
         with:
+          only-labels: "needs author feedback"
           days-before-stale: 7
           days-before-close: 7
-          only-labels: "needs author feedback"
           stale-issue-label: stale
           stale-issue-message: >
             This issue has been labeled as stale due to lack of activity and needing author feedback.
@@ -31,21 +35,27 @@ jobs:
             This PR has been labeled as stale due to lack of activity and needing author feedback.
             It will be automatically closed if there is no further activity over the next 7 days.
 
+      # Action #2: Close old enhancement requests
+      # - Targets: Issues with "enhancement" label (but NOT "needs author feedback")
+      # - After 365 days inactive: Adds "stale" label + closes immediately (no warning period)
+      # - Skips: Issues with "needs author feedback" to avoid conflicts with Action #1
       - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
         with:
+          only-labels: "enhancement"
+          # Skip issues that need author feedback (handled by the first action with 7+7 day policy)
+          exempt-issue-labels: "needs author feedback"
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
           days-before-stale: 365
           days-before-close: 0
           close-issue-label: stale
           close-issue-message: >
             Since there has been no activity on this enhancement for the past year we are closing it to help maintain our backlog.
             Anyone who would like to work on it is still welcome to do so, and we can re-open it at that time.
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          only-labels: "enhancement"
-          # "stale" exemption: so that it won't close issues labeled as stale by "needs author feedback"
-          # "needs author feedback" exemption: so that it won't remove the stale label added by the first action
-          exempt-issue-labels: "stale,needs author feedback"
 
+      # Action #3: Handle stale PRs
+      # - After 180 days inactive: Adds "stale" label + warning comment
+      # - After 14 more days inactive: Closes
       - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
         with:
           days-before-issue-stale: -1

conventions/build.gradle.kts

@@ -58,7 +58,7 @@ dependencies {
   implementation("com.google.guava:guava:33.5.0-jre")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:9.2.2")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.1")
   implementation("org.owasp:dependency-check-gradle:12.1.6")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")

docs/instrumentation-list.yaml

@@ -21,6 +21,25 @@ libraries:
     target_versions:
       javaagent:
       - io.activej:activej-http:[6.0,)
+    configurations:
+    - name: otel.instrumentation.http.known-methods
+      description: |
+        Configures the instrumentation to recognize an alternative set of HTTP request methods. All other methods will be treated as `_OTHER`.
+      type: list
+      default: CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE
+    - name: otel.instrumentation.http.server.capture-request-headers
+      description: List of HTTP request headers to capture in HTTP server telemetry.
+      type: list
+      default: ''
+    - name: otel.instrumentation.http.server.capture-response-headers
+      description: List of HTTP response headers to capture in HTTP server telemetry.
+      type: list
+      default: ''
+    - name: otel.instrumentation.http.server.emit-experimental-telemetry
+      description: |
+        Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size` and `http.response.body.size` attributes to spans, and records `http.server.request.size` and `http.server.response.size` metrics.
+      type: boolean
+      default: false
     telemetry:
     - when: default
       metrics:
@@ -107,6 +126,7 @@ libraries:
     library_link: https://doc.akka.io/docs/akka-http/current/index.html
     features:
     - HTTP_ROUTE
+    - CONTEXT_PROPAGATION
     source_path: instrumentation/akka/akka-http-10.0
     scope:
       name: io.opentelemetry.akka-http-10.0
@@ -115,6 +135,47 @@ libraries:
       - com.typesafe.akka:akka-http_2.12:[10,)
       - com.typesafe.akka:akka-http_2.13:[10,)
       - com.typesafe.akka:akka-http_2.11:[10,)
+    configurations:
+    - name: otel.instrumentation.http.known-methods
+      description: |
+        Configures the instrumentation to recognize an alternative set of HTTP request methods. All other methods will be treated as `_OTHER`.
+      type: list
+      default: CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE
+    - name: otel.instrumentation.http.client.capture-request-headers
+      description: List of HTTP request headers to capture in HTTP client telemetry.
+      type: list
+      default: ''
+    - name: otel.instrumentation.http.client.capture-response-headers
+      description: List of HTTP response headers to capture in HTTP client telemetry.
+      type: list
+      default: ''
+    - name: otel.instrumentation.common.peer-service-mapping
+      description: Used to specify a mapping from host names or IP addresses to peer
+        services.
+      type: map
+      default: ''
+    - name: otel.instrumentation.http.client.emit-experimental-telemetry
+      description: |
+        Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size` and `http.response.body.size` attributes to spans, and records `http.client.request.size` and `http.client.response.size` metrics.
+      type: boolean
+      default: false
+    - name: otel.instrumentation.http.client.experimental.redact-query-parameters
+      description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
+      type: boolean
+      default: true
+    - name: otel.instrumentation.http.server.capture-request-headers
+      description: List of HTTP request headers to capture in HTTP server telemetry.
+      type: list
+      default: ''
+    - name: otel.instrumentation.http.server.capture-response-headers
+      description: List of HTTP response headers to capture in HTTP server telemetry.
+      type: list
+      default: ''
+    - name: otel.instrumentation.http.server.emit-experimental-telemetry
+      description: |
+        Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size` and `http.response.body.size` attributes to spans, and records `http.server.request.size` and `http.server.response.size` metrics.
+      type: boolean
+      default: false
     telemetry:
     - when: default
       metrics:
@@ -206,6 +267,12 @@ libraries:
       - com.alibaba:druid:(,)
       library:
       - com.alibaba:druid:1.0.0
+    configurations:
+    - name: otel.semconv-stability.opt-in
+      description: |
+        Opt-in to emit stable semantic conventions instead of the old experimental semantic conventions. Accepts a comma-separated list of semantic convention groups (e.g., `database`, `http`, `messaging`). Use `<group>/dup` to emit both old and new conventions simultaneously. Stable semantic conventions will become the default in version 3.0 of the agent.
+      type: list
+      default: ''
     telemetry:
     - when: default
       metrics:
@@ -305,6 +372,12 @@ libraries:
       - org.apache.commons:commons-dbcp2:[2,)
       library:
       - org.apache.commons:commons-dbcp2:2.0
+    configurations:
+    - name: otel.semconv-stability.opt-in
+      description: |
+        Opt-in to emit stable semantic conventions instead of the old experimental semantic conventions. Accepts a comma-separated list of semantic convention groups (e.g., `database`, `http`, `messaging`). Use `<group>/dup` to emit both old and new conventions simultaneously. Stable semantic conventions will become the default in version 3.0 of the agent.
+      type: list
+      default: ''
     telemetry:
     - when: default
       metrics:
@@ -374,13 +447,13 @@ libraries:
           type: STRING
   - name: apache-dubbo-2.7
     display_name: Apache Dubbo
-    description: The Apache Dubbo instrumentation provides RPC client spans and RPC
-      server spans for Apache Dubbo RPC calls. Each call produces a span named after
-      the Dubbo method, enriched with standard RPC attributes (system, service, method),
-      network attributes, and error details if an exception occurs.
+    description: |
+      The Apache Dubbo instrumentation provides RPC client spans and metrics, and RPC server spans and metrics for Apache Dubbo RPC calls.
     semantic_conventions:
     - RPC_CLIENT_SPANS
+    - RPC_CLIENT_METRICS
     - RPC_SERVER_SPANS
+    - RPC_SERVER_METRICS
     library_link: https://github.com/apache/dubbo/
     source_path: instrumentation/apache-dubbo-2.7
     scope:

instrumentation/activej-http-6.0/metadata.yaml

@@ -4,3 +4,25 @@ library_link: https://activej.io/
 semantic_conventions:
   - HTTP_SERVER_SPANS
   - HTTP_SERVER_METRICS
+configurations:
+  - name: otel.instrumentation.http.known-methods
+    description: >
+      Configures the instrumentation to recognize an alternative set of HTTP request methods. All
+      other methods will be treated as `_OTHER`.
+    type: list
+    default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
+  - name: otel.instrumentation.http.server.capture-request-headers
+    description: List of HTTP request headers to capture in HTTP server telemetry.
+    type: list
+    default: ""
+  - name: otel.instrumentation.http.server.capture-response-headers
+    description: List of HTTP response headers to capture in HTTP server telemetry.
+    type: list
+    default: ""
+  - name: otel.instrumentation.http.server.emit-experimental-telemetry
+    description: >
+      Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size`
+      and `http.response.body.size` attributes to spans, and records `http.server.request.size` and
+      `http.server.response.size` metrics.
+    type: boolean
+    default: false

instrumentation/akka/akka-http-10.0/metadata.yaml

@@ -10,3 +10,49 @@ semantic_conventions:
   - HTTP_SERVER_METRICS
 features:
   - HTTP_ROUTE
+  - CONTEXT_PROPAGATION
+configurations:
+  - name: otel.instrumentation.http.known-methods
+    description: >
+      Configures the instrumentation to recognize an alternative set of HTTP request methods. All
+      other methods will be treated as `_OTHER`.
+    type: list
+    default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
+  - name: otel.instrumentation.http.client.capture-request-headers
+    description: List of HTTP request headers to capture in HTTP client telemetry.
+    type: list
+    default: ""
+  - name: otel.instrumentation.http.client.capture-response-headers
+    description: List of HTTP response headers to capture in HTTP client telemetry.
+    type: list
+    default: ""
+  - name: otel.instrumentation.common.peer-service-mapping
+    description: Used to specify a mapping from host names or IP addresses to peer services.
+    type: map
+    default: ""
+  - name: otel.instrumentation.http.client.emit-experimental-telemetry
+    description: >
+      Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size`
+      and `http.response.body.size` attributes to spans, and records `http.client.request.size` and
+      `http.client.response.size` metrics.
+    type: boolean
+    default: false
+  - name: otel.instrumentation.http.client.experimental.redact-query-parameters
+    description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
+    type: boolean
+    default: true
+  - name: otel.instrumentation.http.server.capture-request-headers
+    description: List of HTTP request headers to capture in HTTP server telemetry.
+    type: list
+    default: ""
+  - name: otel.instrumentation.http.server.capture-response-headers
+    description: List of HTTP response headers to capture in HTTP server telemetry.
+    type: list
+    default: ""
+  - name: otel.instrumentation.http.server.emit-experimental-telemetry
+    description: >
+      Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size`
+      and `http.response.body.size` attributes to spans, and records `http.server.request.size` and
+      `http.server.response.size` metrics.
+    type: boolean
+    default: false

instrumentation/alibaba-druid-1.0/metadata.yaml

@@ -4,3 +4,13 @@ description: >
 library_link: https://github.com/alibaba/druid
 semantic_conventions:
   - DATABASE_POOL_METRICS
+configurations:
+  - name: otel.semconv-stability.opt-in
+    description: >
+      Opt-in to emit stable semantic conventions instead of the old
+      experimental semantic conventions. Accepts a comma-separated list of semantic convention
+      groups (e.g., `database`, `http`, `messaging`). Use `<group>/dup` to emit both old and new
+      conventions simultaneously. Stable semantic conventions will become the default in version
+      3.0 of the agent.
+    type: list
+    default: ""

instrumentation/apache-dbcp-2.0/metadata.yaml

@@ -9,3 +9,13 @@ description: >
 library_link: https://commons.apache.org/proper/commons-dbcp/
 semantic_conventions:
   - DATABASE_POOL_METRICS
+configurations:
+  - name: otel.semconv-stability.opt-in
+    description: >
+      Opt-in to emit stable semantic conventions instead of the old
+      experimental semantic conventions. Accepts a comma-separated list of semantic convention
+      groups (e.g., `database`, `http`, `messaging`). Use `<group>/dup` to emit both old and new
+      conventions simultaneously. Stable semantic conventions will become the default in version
+      3.0 of the agent.
+    type: list
+    default: ""

instrumentation/apache-dubbo-2.7/metadata.yaml

@@ -1,11 +1,12 @@
 display_name: Apache Dubbo
-description: The Apache Dubbo instrumentation provides RPC client spans and RPC server spans for
-  Apache Dubbo RPC calls. Each call produces a span named after the Dubbo method, enriched with
-  standard RPC attributes (system, service, method), network attributes, and error details if an
-  exception occurs.
+description: >
+  The Apache Dubbo instrumentation provides RPC client spans and metrics, and RPC server spans and
+  metrics for Apache Dubbo RPC calls.
 semantic_conventions:
   - RPC_CLIENT_SPANS
+  - RPC_CLIENT_METRICS
   - RPC_SERVER_SPANS
+  - RPC_SERVER_METRICS
 library_link: https://github.com/apache/dubbo/
 configurations:
   - name: otel.instrumentation.common.peer-service-mapping

instrumentation/aws-sdk/aws-sdk-1.11/library/README.md

@@ -0,0 +1,54 @@
+# Library Instrumentation for AWS SDK for Java version 1.11 and higher
+
+Provides OpenTelemetry instrumentation for the [AWS SDK for Java](https://aws.amazon.com/sdk-for-java/).
+
+## Quickstart
+
+### Add these dependencies to your project
+
+Replace `OPENTELEMETRY_VERSION` with the [latest release](https://central.sonatype.com/artifact/io.opentelemetry.instrumentation/opentelemetry-aws-sdk-1.11).
+
+For Maven, add to your `pom.xml` dependencies:
+
+```xml
+<dependencies>
+  <dependency>
+    <groupId>io.opentelemetry.instrumentation</groupId>
+    <artifactId>opentelemetry-aws-sdk-1.11</artifactId>
+    <version>OPENTELEMETRY_VERSION</version>
+  </dependency>
+</dependencies>
+```
+
+For Gradle, add to your dependencies:
+
+```kotlin
+implementation("io.opentelemetry.instrumentation:opentelemetry-aws-sdk-1.11:OPENTELEMETRY_VERSION")
+```
+
+### Usage
+
+The instrumentation library provides a `RequestHandler2` that can be added to any AWS SDK v1
+client builder to provide spans and context propagation.
+
+```java
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
+
+public class AwsSdkConfiguration {
+
+  // Use this to create instrumented AWS SDK clients.
+  public AmazonS3 createS3Client(OpenTelemetry openTelemetry) {
+    return AmazonS3ClientBuilder.standard()
+        .withRequestHandlers(
+            AwsSdkTelemetry.builder(openTelemetry)
+                .build()
+                .newRequestHandler())
+        .build();
+  }
+
+  // This pattern works for all AWS SDK v1 client builders (S3, SQS, DynamoDB, etc.).
+}
+```