Merge branch 'main' into fix-rocketmq-batch-context-propagation

Author: Arunodoy18

.fossa.yml

@@ -928,6 +928,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:servlet:servlet-3.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:servlet:servlet-3.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:servlet:servlet-5.0:javaagent'
@@ -939,7 +942,10 @@ targets:
       target: ':instrumentation:servlet:servlet-common:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:servlet:servlet-javax-common:javaagent'
+      target: ':instrumentation:servlet:servlet-common:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:servlet:servlet-javax-common:library'
     - type: gradle
       path: ./
       target: ':instrumentation:spring:spring-batch-3.0:javaagent'

.github/repository-settings.md

@@ -29,3 +29,4 @@ private admin repo.
 ### Organization variables
 
 - `OTELBOT_APP_ID`
+- `OTELBOT_JAVA_INSTRUMENTATION_APP_ID` (scoped only to this repo)

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

@@ -19,6 +19,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
   if [[ "$module_name" == "oshi" ]]; then
     continue
   fi
+  if [[ "$module_name" == "servlet-common" ]]; then
+    continue
+  fi
 
   # these are possibly problematic
   if [[ "$dir" == "instrumentation/grpc-1.6/library/src/main/java/io/grpc/override" ]]; then

.github/workflows/auto-license-report.yml

@@ -71,7 +71,7 @@ jobs:
         if: steps.check-patch.outputs.exists == 'true'
         id: otelbot-token
         with:
-          app-id: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_APP_ID }}
+          app-id: ${{ vars.OTELBOT_JAVA_INSTRUMENTATION_APP_ID }}
           private-key: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY }}
 
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

.github/workflows/auto-update-otel-sdk.yml

@@ -75,7 +75,8 @@ jobs:
         uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
 
       - name: Update license report
-        run: ./gradlew generateLicenseReport
+        # with the build cache enabled occasionally produces outdated results
+        run: ./gradlew generateLicenseReport --no-build-cache
 
       - name: Undo license report clean
         if: failure()

.github/workflows/metadata-update.yml

@@ -21,7 +21,15 @@ jobs:
       pull-requests: write # for adding label and assignee to PR
 
     steps:
+      - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_JAVA_INSTRUMENTATION_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY }}
+
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        with:
+          token: ${{ steps.otelbot-token.outputs.token }}
 
       - name: Free disk space
         run: .github/scripts/gha-free-disk-space.sh
@@ -55,27 +63,16 @@ jobs:
         if: steps.diffcheck.outputs.has_diff == 'true'
         run: .github/scripts/use-cla-approved-bot.sh
 
-      - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
-        if: steps.diffcheck.outputs.has_diff == 'true'
-        id: otelbot-token
-        with:
-          app-id: ${{ vars.OTELBOT_APP_ID }}
-          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
-
       - name: Find or create metadata update branch
         if: steps.diffcheck.outputs.has_diff == 'true'
         id: findbranch
-        env:
-          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           BRANCH_NAME="otelbot/metadata-update-main"
           echo "branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
           git checkout -B "$BRANCH_NAME"
 
       - name: Commit and push changes
         if: steps.diffcheck.outputs.has_diff == 'true'
-        env:
-          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           BRANCH_NAME="${{ steps.findbranch.outputs.branch }}"
           git commit -m "chore: update instrumentation list [automated]" || echo "No changes to commit."
@@ -104,7 +101,7 @@ jobs:
       - name: Add label to PR
         if: steps.createpr.outputs.new_pr == 'true'
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           BRANCH_NAME="${{ steps.findbranch.outputs.branch }}"
           PR_URL=$(gh pr list --state open --head "$BRANCH_NAME" --json url -q '.[0].url')

.mise/tasks/lint/markdown.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #MISE description="Lint markdown files"
-#MISE flag "--fix" help="Automatically fix issues"
+#USAGE flag "--fix" help="Automatically fix issues"
 
 set -e
 
-if [ "${usage_fix}" = "true" ]; then
+if [ "${usage_fix:-false}" = "true" ]; then
   markdownlint-cli2 --fix "**/*.md" "#**/build" "#CHANGELOG.md" "#licenses/licenses.md"
 else
   markdownlint-cli2 "**/*.md" "#**/build" "#CHANGELOG.md" "#licenses/licenses.md"

benchmark-overhead-jmh/build.gradle.kts

@@ -1,4 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import me.champeau.jmh.JMHTask
 import net.ltgt.gradle.errorprone.errorprone
 
@@ -44,7 +43,7 @@ tasks {
   val jmhStartFlightRecording = gradle.startParameter.projectProperties.get("jmh.startFlightRecording")
 
   named<JMHTask>("jmh") {
-    val shadowTask = project(":javaagent").tasks.named<ShadowJar>("shadowJar").get()
+    val shadowTask = project(":javaagent").tasks.named<Jar>("shadowJar").get()
     inputs.files(layout.files(shadowTask))
 
     // note: without an exporter, toSpanData() won't even be called