Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into jvm-jmx-metrics

Author: SylvainJuge

.fossa.yml

@@ -426,10 +426,10 @@ targets:
       target: ':instrumentation:elasticsearch:elasticsearch-rest-7.0:library'
     - type: gradle
       path: ./
-      target: ':instrumentation:elasticsearch:elasticsearch-rest-common:javaagent'
+      target: ':instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:elasticsearch:elasticsearch-rest-common:library'
+      target: ':instrumentation:elasticsearch:elasticsearch-rest-common-5.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:elasticsearch:elasticsearch-transport-5.0:javaagent'
@@ -694,12 +694,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-3.8:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:netty:netty-4-common:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:netty:netty-4-common:library'
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-4.0:javaagent'
@@ -712,6 +706,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-common:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:netty:netty-common-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:netty:netty-common-4.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:okhttp:okhttp-2.2:javaagent'
@@ -1014,7 +1014,7 @@ targets:
       target: ':instrumentation:kafka:kafka-clients:kafka-clients-2.6:library'
     - type: gradle
       path: ./
-      target: ':instrumentation:kafka:kafka-clients:kafka-clients-common:library'
+      target: ':instrumentation:kafka:kafka-clients:kafka-clients-common-0.11:library'
     - type: gradle
       path: ./
       target: ':instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:javaagent'

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

@@ -0,0 +1,61 @@
+#!/bin/bash -e
+
+# shellcheck disable=SC2001
+
+for dir in $(find instrumentation -name "*.java" | grep library/src/main/java | sed 's#/[^/]*$##' | sort -u); do
+
+  module_name=$(echo "$dir" | sed 's#.*/\([^/]*\)/library/src/main/java/.*#\1#')
+
+  if [[ "$module_name" =~ java-* ]]; then
+    continue
+  fi
+  if [[ "$module_name" == "jdbc" ]]; then
+    continue
+  fi
+  if [[ "$module_name" == "jmx-metrics" ]]; then
+    continue
+  fi
+  if [[ "$module_name" == "resources" ]]; then
+    continue
+  fi
+  if [[ "$module_name" == "oshi" ]]; then
+    continue
+  fi
+
+  # these are possibly problematic
+  if [[ "$dir" == "instrumentation/grpc-1.6/library/src/main/java/io/grpc/override" ]]; then
+    continue
+  fi
+  if [[ "$dir" == "instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/lettuce/core/protocol" ]]; then
+    continue
+  fi
+
+  # some common modules don't have any base version
+  # - lettuce-common
+  # - netty-common
+  if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" ]]; then
+    echo "module name doesn't have a base version: $dir"
+    exit 1
+  fi
+
+  simple_module_name=$(echo "$module_name" | sed 's/-[0-9.]*$//' | sed 's/-//g')
+  base_version=$(echo "$module_name" | sed 's/.*-\([0-9.]*\)$/\1/' | sed 's/\./_/')
+
+  if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" ]]; then
+    expected_package_name="io/opentelemetry/instrumentation/$simple_module_name/v$base_version"
+  else
+    expected_package_name="io/opentelemetry/instrumentation/$simple_module_name"
+  fi
+
+  package_name=$(echo "$dir" | sed 's#.*/src/main/java/##')
+
+  # deal with differences like module name elasticsearch-rest and package name elasticsearch.rest
+  expected_package_name_normalized=$(echo "$expected_package_name" | sed 's#/##g')
+  package_name_normalized=$(echo "$package_name" | sed 's#/##g')
+
+  if [[ "$package_name_normalized" != "$expected_package_name_normalized"* ]]; then
+    echo "ERROR: $dir"
+    exit 1
+  fi
+
+done

.github/scripts/find-all-config-properties.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -e
 
-grep -Pohr --include '*.java' --exclude-dir=test \"otel.instrumentation.[^\"]+\" \
+grep -Eohr --include '*.java' --exclude-dir="test*" \"otel.instrumentation.[^\"]+\" \
   | grep -v otel.instrumentation.internal \
   | sort -u

.github/workflows/build-common.yml

@@ -163,6 +163,13 @@ jobs:
 
       - run: .github/scripts/check-latest-dep-test-overrides.sh
 
+  check-package-names:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - run: .github/scripts/check-package-names.sh
+
   build:
     runs-on: ubuntu-latest
     steps:
@@ -272,7 +279,7 @@ jobs:
 
       # vaadin 14 tests fail with node 18
       - name: Set up Node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 16
 

.github/workflows/publish-petclinic-benchmark-image.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Login to GitHub container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/publish-smoke-test-early-jdk8-images.yml

@@ -31,7 +31,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Login to GitHub package registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/publish-smoke-test-fake-backend-images.yml

@@ -31,7 +31,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Login to GitHub package registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/publish-smoke-test-servlet-images.yml

@@ -66,7 +66,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Login to GitHub package registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/release.yml

@@ -188,13 +188,15 @@ jobs:
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "prior-version=$PRIOR_VERSION" >> $GITHUB_OUTPUT
 
-  merge-change-log-to-main:
+  update-apidiff-baseline-to-released-version:
     permissions:
       contents: write # for git push to PR branch
     runs-on: ubuntu-latest
     needs:
       - release
     steps:
+      # add change log sync (if any) into this PR since the apidiff update
+      # is required before any other PR can be merged anyway
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Copy change log section from release branch
@@ -216,53 +218,6 @@ jobs:
           release_date=$(gh release view v$VERSION --json publishedAt --jq .publishedAt | sed 's/T.*//')
           RELEASE_DATE=$release_date .github/scripts/merge-change-log-after-release.sh
 
-      - name: Use CLA approved bot
-        run: .github/scripts/use-cla-approved-bot.sh
-
-      - uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
-        id: otelbot-token
-        with:
-          app-id: ${{ vars.OTELBOT_APP_ID }}
-          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
-
-      - name: Create pull request against main
-        env:
-          VERSION: ${{ needs.release.outputs.version }}
-          # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
-          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
-        run: |
-          if git diff --quiet; then
-            if [[ $VERSION == *.0 ]]; then
-              echo there are no updates to merge, not creating pull request
-              exit 0 # success
-            else
-              echo patch release notes did not get applied for some reason
-              exit 1 # failure
-            fi
-          fi
-
-          message="Merge change log updates from $GITHUB_REF_NAME"
-          body="Merge change log updates from \`$GITHUB_REF_NAME\`."
-          branch="otelbot/merge-change-log-updates-from-${GITHUB_REF_NAME//\//-}"
-
-          git checkout -b $branch
-          git commit -a -m "$message"
-          git push --set-upstream origin $branch
-          gh pr create --title "$message" \
-                       --body "$body" \
-                       --base main
-
-  update-apidiff-baseline-to-released-version:
-    permissions:
-      contents: write # for git push to PR branch
-    runs-on: ubuntu-latest
-    needs:
-      - release
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: main
-
       - name: Wait for release to be available in maven central
         env:
           VERSION: ${{ needs.release.outputs.version }}

.github/workflows/reusable-native-tests.yml

@@ -17,14 +17,19 @@ jobs:
   graalvm-native-tests:
     if: "!inputs.skip-native-tests"
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test-java-version:
+          - 22
+          - 23
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - id: read-java
         run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
       - uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3.1
         with:
           version: "latest"
-          java-version: "${{ steps.read-java.outputs.version }}"
+          java-version: ${{ matrix.test-java-version }}
           components: "native-image"
       - name: Running test
         env: