Merge remote-tracking branch 'upstream/main' into migration-notes

Author: trask

.github/scripts/check-javaagent-suppression-keys.sh

@@ -0,0 +1,54 @@
+#!/bin/bash -e
+
+# shellcheck disable=SC2044
+for file in $(find instrumentation -name "*Module.java"); do
+
+  if ! grep -q "extends InstrumentationModule" "$file"; then
+    continue
+  fi
+
+  if [[ "$file" != *"/javaagent/src/"* ]]; then
+    continue
+  fi
+
+  # shellcheck disable=SC2001
+  module_name=$(echo "$file" | sed 's#.*/\([^/]*\)/javaagent/src/.*#\1#')
+  # shellcheck disable=SC2001
+  simple_module_name=$(echo "$module_name" | sed 's/-[0-9.]*$//')
+
+  if [[ "$simple_module_name" == *jaxrs* ]]; then
+    # TODO these need some work still
+    continue
+  fi
+  if [[ "$simple_module_name" == *jaxws* ]]; then
+    # TODO these need some work still
+    continue
+  fi
+  if [[ "$simple_module_name" == jdbc ]]; then
+    # TODO split jdbc-datasource out into separate instrumentation?
+    continue
+  fi
+  if [[ "$simple_module_name" == kafka-clients ]]; then
+    # TODO split kafka client metrics out into separate instrumentation?
+    continue
+  fi
+  if [[ "$simple_module_name" == quarkus-resteasy-reactive ]]; then
+    # TODO module is missing a base version
+    continue
+  fi
+
+  if [ "$module_name" == "$simple_module_name" ]; then
+    expected="super\(\n? *\"$simple_module_name\""
+  else
+    expected="super\(\n? *\"$simple_module_name\",\n? *\"$module_name\""
+  fi
+
+  echo "$module_name"
+
+  matches=$(perl -0 -ne "print if /$expected/" "$file" | wc -l)
+  if [ "$matches" == 0 ]; then
+    echo "Expected to find $expected in $file"
+    exit 1
+  fi
+
+done

.github/scripts/check-latest-dep-test-overrides.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+# all missing version coverage should be documented in supported-libraries.md
+
+if grep -r --include build.gradle.kts latestDepTestLibrary instrumentation \
+    | grep -v :+\" \
+    | grep -v "// see .* module" \
+    | grep -v "// see test suite below" \
+    | grep -v "// no longer applicable" \
+    | grep -v "// related dependency" \
+    | grep -v "// native on-by-default instrumentation after this version" \
+    | grep -v "// documented limitation" \
+    | grep -v "instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts"; then
+
+  echo
+  echo "Found an undocumented latestDepTestLibrary (see above)."
+  echo
+  echo "See .gith/scripts/check-latest-dep-test-overrides.sh in this repository"
+  echo "and add one of the required comments."
+  exit 1
+fi

.github/scripts/find-instrumentation-with-upper-version-limits.sh

@@ -119,6 +119,20 @@ jobs:
             exit 1
           fi
 
+  check-javaagent-suppression-keys:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - run: .github/scripts/check-javaagent-suppression-keys.sh
+
+  check-latest-dep-test-overrides:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - run: .github/scripts/check-latest-dep-test-overrides.sh
+
   build:
     runs-on: ubuntu-latest
     steps:

.github/workflows/build-common.yml

@@ -18,8 +18,7 @@ jobs:
       - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          # TODO (trask) update back to 7 days after end of year break
-          days-before-stale: 21
+          days-before-stale: 7
           days-before-close: 7
           only-labels: "needs author feedback"
           stale-issue-label: stale

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

@@ -4,14 +4,18 @@
 
 ### Migration notes
 
-In preparation for stabilizing HTTP library instrumentation soon:
-
-- `setCaptured*Headers(List)` methods in `*TelemetryBuilder` classes were changed to
-  `setCaptured*Headers(Collection)`       
-  ([#12901](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12901))
-- `setKnownMethods(Set)` methods in `*TelemetryBuilder` classes were changed to
-  `setKnownMethods(Collection)`
-  ([#12902](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12902))
+- Some Java agent instrumentation suppression keys have been renamed to match their module names:
+  - `elasticsearch-rest-6.0` --> `elasticsearch-rest-6.4`
+  - `internal-application-logging` --> `internal-application-logger`
+  - `javalin-5` -> `javalin-5.0`
+  - `pulsar-2.8.0` -> `pulsar-2.8`
+- In preparation for stabilizing HTTP library instrumentation soon:
+  - `setCaptured*Headers(List)` methods in `*TelemetryBuilder` classes were changed to
+    `setCaptured*Headers(Collection)`       
+    ([#12901](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12901))
+  - `setKnownMethods(Set)` methods in `*TelemetryBuilder` classes were changed to
+    `setKnownMethods(Collection)`
+    ([#12902](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12902))
 
 ## Version 2.11.0 (2024-12-23)
 

CHANGELOG.md

@@ -87,7 +87,8 @@ https://gradle.com/s/ila4qwp5lcf5s
 ```
 
 Opening the build scan link can sometimes take several seconds (it's a large build), but it
-typically makes it a lot clearer what's failing.
+typically makes it a lot clearer what's failing. Sometimes there will be several build scans in a
+log, so look for one that follows the "BUILD FAILED" message.
 
 You can also try the "Explain error" button at the top of the GitHub Actions page,
 which often does a reasonable job of parsing the long build log and displaying the important part.

CONTRIBUTING.md

@@ -161,7 +161,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 Triagers ([@open-telemetry/java-instrumentation-triagers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-triagers)):
 
 - [Jonas Kunz](https://github.com/JonasKunz), Elastic
-- [Steve Rao](https://github.com/steverao), Alibaba
 - [Sylvain Juge](https://github.com/SylvainJuge), Elastic
 
 Approvers ([@open-telemetry/java-instrumentation-approvers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-approvers)):
@@ -172,6 +171,7 @@ Approvers ([@open-telemetry/java-instrumentation-approvers](https://github.com/o
 - [Jay DeLuca](https://github.com/jaydeluca)
 - [Jean Bisutti](https://github.com/jeanbisutti), Microsoft
 - [John Watson](https://github.com/jkwatson), Cloudera
+- [Steve Rao](https://github.com/steverao), Alibaba
 
 Maintainers ([@open-telemetry/java-instrumentation-maintainers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-maintainers)):
 

README.md

@@ -74,5 +74,5 @@ dependencies {
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-  testImplementation("org.assertj:assertj-core:3.27.0")
+  testImplementation("org.assertj:assertj-core:3.27.2")
 }

conventions/build.gradle.kts

@@ -430,7 +430,7 @@ codenarc {
 checkstyle {
   configFile = rootProject.file("buildscripts/checkstyle.xml")
   // this version should match the version of google_checks.xml used as basis for above configuration
-  toolVersion = "10.21.0"
+  toolVersion = "10.21.1"
   maxWarnings = 0
 }