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

Author: SylvainJuge

.fossa.yml

@@ -709,6 +709,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:mongo:mongo-async-3.3:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:nats:nats-2.17:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:nats:nats-2.17:library'
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-3.8:javaagent'

.github/renovate.json5

@@ -112,6 +112,17 @@
         'io.opentelemetry:{/,}**',
       ],
     },
+    {
+      // junit 6+ requires Java 17+
+      matchPackageNames: [
+        'org.junit:**',
+        'org.junit.jupiter:**',
+      ],
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
+    },
     {
       // junit-pioneer 2+ requires Java 11+
       matchPackageNames: [
@@ -336,6 +347,18 @@
     },
   ],
   customManagers: [
+    {
+      customType: 'regex',
+      datasourceTemplate: 'java-version',
+      managerFilePatterns: [
+        '.github/workflows/**'
+      ],
+      matchStrings: [
+        '(?<currentValue>\\d+) # renovate: datasource=java-version',
+      ],
+      depNameTemplate: 'java',
+      extractVersionTemplate: '^(?<version>\\d+)',
+    },
     {
       customType: 'regex',
       datasourceTemplate: 'pypi',

.github/scripts/check-package-names.sh

@@ -29,6 +29,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
   if [[ "$dir" == "instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/lettuce/core/protocol" ]]; then
     continue
   fi
+  if [[ "$dir" == "instrumentation/nats/nats-2.17/library/src/main/java/io/nats/client/impl" ]]; then
+    continue
+  fi
 
   # some common modules don't have any base version
   # - lettuce-common

.github/workflows/build-common.yml

@@ -238,9 +238,7 @@ jobs:
           - 11
           - 17
           - 21
-          - 23
-          - 24
-          - 25-ea
+          - 24 # renovate: datasource=java-version
         vm:
           - hotspot
           - openj9
@@ -254,11 +252,7 @@ jobs:
           - true
         exclude:
           - vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
-          - test-java-version: 23
-            vm: hotspot
-          - test-java-version: 24
-            vm: openj9
-          - test-java-version: 25-ea
+          - test-java-version: 24 # renovate: datasource=java-version
             vm: openj9
       fail-fast: false
     steps:

.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.
@@ -30,20 +34,30 @@ jobs:
           stale-pr-message: >
             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.
+          operations-per-run: 1000
 
+      # 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"
-          exempt-issue-labels: "stale" # so that it won't close issues labeled as stale by "needs author feedback"
+          operations-per-run: 1000
 
+      # 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
@@ -55,3 +69,4 @@ jobs:
             This PR has been labeled as stale due to lack of activity.
             It will be automatically closed if there is no further activity over the next 14 days.
           exempt-draft-pr: false
+          operations-per-run: 1000

.gitignore

@@ -45,6 +45,7 @@ out/
 ######################
 .vscode
 **/bin/
+.metals
 
 # Others #
 ##########

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")

custom-checks/build.gradle.kts

@@ -13,8 +13,6 @@ dependencies {
 
 otelJava {
   minJavaVersionSupported.set(JavaVersion.VERSION_17)
-  // OtelInternalJavadocTest fails with 25-ea
-  maxJavaVersionForTests.set(JavaVersion.VERSION_24)
 }
 
 // We cannot use "--release" javac option here because that will forbid exporting com.sun.tools package.

custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadoc.java

@@ -83,6 +83,6 @@ private static String getJavadoc(VisitorState state) {
     if (docCommentTree == null) {
       return null;
     }
-    return docCommentTree.toString().replace("\n", "");
+    return docCommentTree.toString().replace("\n", " ").replace(" * ", " ").replaceAll("\\s+", " ");
   }
 }

docs/contributing/documenting-instrumentation.md

@@ -88,6 +88,9 @@ semantic_conventions:
   - HTTP_CLIENT_SPANS
   - DATABASE_CLIENT_SPANS
   - JVM_RUNTIME_METRICS
+features:
+  - HTTP_ROUTE
+  - CONTEXT_PROPAGATION
 disabled_by_default: true
 classification: library
 library_link: https://github.com/...
@@ -174,6 +177,20 @@ List of possible options:
 * [GENAI_CLIENT_SPANS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/gen-ai/gen-ai-spans.md)
 * [GENAI_CLIENT_METRICS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/gen-ai/gen-ai-metrics.md#generative-ai-client-metrics)
 
+### Features (optional)
+
+As a way to help further categorize instrumentations, you can add a `features` field with a list of
+the relevant functionality descriptions.
+
+List of possible options:
+
+* `HTTP_ROUTE`: Instrumentation that enriches HTTP spans with route information
+* `EXPERIMENTAL_ONLY`: Instrumentation that is experimental and may not be stable
+* `CONTEXT_PROPAGATION`: Instrumentation that provides context propagation capabilities
+* `AUTO_INSTRUMENTATION_SHIM`: Instrumentation that adapts or bridges instrumentation from upstream libraries or frameworks
+* `CONTROLLER_SPANS`: Instrumentation that generates controller-level spans
+* `VIEW_SPANS`: Instrumentation that generates view-level spans
+
 ### Library Link
 
 For library instrumentations, include a `library_link` field with a URL to the library or framework's