Merge branch 'main' into feature/add-io-redis-cluster-instrumentation

Author: david-luna

.github/component-label-map.yml

@@ -193,6 +193,11 @@ pkg:instrumentation-oracledb:
       - any-glob-to-any-file:
           - packages/instrumentation-oracledb/**
           - packages/contrib-test-utils/**
+pkg:instrumentation-openai:
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/instrumentation-openai/**
+          - packages/contrib-test-utils/**
 pkg:instrumentation-pg:
   - changed-files:
       - any-glob-to-any-file:

.github/component_owners.yml

@@ -11,12 +11,14 @@ components:
     - abhee11
   packages/resource-detector-gcp:
     - aabmass
-    - punya
+    - psx95
+    - DylanRussell
+    - dashpole
   packages/resource-detector-github: []
     # Unmaintained
   packages/resource-detector-instana:
     - kirrg001
-  incubator/opentelemetry-sampler-aws-xray:
+  packages/sampler-aws-xray:
     - jj22ee
     - yiyuan-he
   packages/auto-configuration-propagators:

.github/workflows/label-prs.yml

@@ -14,6 +14,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/labeler@v5
+      - uses: actions/labeler@v6
         with:
           configuration-path: '.github/component-label-map.yml'

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: 18
           cache: 'npm'

.github/workflows/release-please.yml

@@ -8,23 +8,19 @@ permissions:
 
 name: Run Release Please
 jobs:
+  # creates the release PR, and publishes releases
   release-please:
+    outputs:
+      release_created: ${{ steps.release.outputs.release_created }}
     runs-on: ubuntu-latest
-    permissions:
-      contents: write # required for pushing changes
-      id-token: write
     steps:
-      # The logic below handles the npm publication:
       - name: Checkout Repository
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      # If you update this version make sure to keep in sync:
-      # - `build-and-cache` job of unit-test workflow
-      # - `build-and-cache` job of test-all-versions workflow
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: 18
           registry-url: 'https://registry.npmjs.org'
@@ -33,10 +29,16 @@ jobs:
         run: |
           npm ci
 
+      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_JS_CONTRIB_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_JS_CONTRIB_PRIVATE_KEY }}
+
       - uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f # v4.1.3
         id: release
         with:
-          token: ${{secrets.RELEASE_PR_TOKEN}}
+          token: ${{ steps.otelbot-token.outputs.token }}
           target-branch: main
 
       # get release PR as we're currently on main
@@ -47,42 +49,69 @@ jobs:
         with:
           ref: release-please--branches--main
           # use a token so that workflows on the PR run when we push later
-          token: ${{ secrets.RELEASE_PR_TOKEN }}
+          token: ${{ steps.otelbot-token.outputs.token }}
 
-      # release-please does not do this on its own, so we do it here instead
+      # previous commiter does not have CLA signed, and the commit is missing updates to package-lock.json,
+      # so we re-write that commit here with the proper changes
       - name: Update package-lock.json in PR
         # only update if a PR has been created
         if: ${{ steps.release.outputs.pr }}
         run: |
           npm install --ignore-scripts --package-lock-only
           git add package-lock.json
-          git config user.name opentelemetrybot
-          git config user.email 107717825+opentelemetrybot@users.noreply.github.com
-          git commit -m "chore: sync package-lock.json"
-          git push
+          git config user.name otelbot
+          git config user.email 197425009+otelbot@users.noreply.github.com
+          git commit --amend --reset-author --no-edit
+          git push --force
 
-      # get main again
+  install-and-compile:
+    needs: release-please
+    # only if a release has been created
+    if: ${{ needs.release-please.outputs.release_created }}
+    runs-on: ubuntu-latest
+    steps:
       - name: Checkout Repository
-        # only checkout if a release has been created
-        if: ${{ steps.release.outputs.releases_created }}
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-
       - name: Rebuild Packages
-        # only rebuild if a release has been created
-        if: ${{ steps.release.outputs.releases_created }}
         run: |
           npm ci
           npm run compile
+      - name: Upload contents for publish
+        uses: actions/upload-artifact@v4
+        with:
+          name: publish-cache-${{ github.run_number }}
+          path: .
+          include-hidden-files: true
+          if-no-files-found: error
+          retention-days: 10
 
+  npm-publish:
+    needs:
+      - release-please
+      - install-and-compile
+    # only if a release has been created
+    if: ${{ needs.release-please.outputs.release_created }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write # to generate npm provenance statements
+    environment: npm-publish-environment
+    steps:
+      - name: Setup Node
+        uses: actions/setup-node@v5
+        with:
+          node-version: 24
+          registry-url: 'https://registry.npmjs.org'
+      - name: Download contents for publish
+        uses: actions/download-artifact@v5
+        with:
+          name: publish-cache-${{ github.run_number }}
       # Release Please has already incremented versions and published tags, so we just
       # need to publish all unpublished versions to npm here
       # See: https://github.com/lerna/lerna/tree/main/libs/commands/publish#bump-from-package
       - name: Publish to npm
-        # only publish if a release has been created
-        if: ${{ steps.release.outputs.releases_created }}
         env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
           NPM_CONFIG_PROVENANCE: true
         run: npx lerna publish from-package --no-push --no-private --no-git-tag-version --yes

.github/workflows/survey-on-merged-pr.yml

@@ -0,0 +1,48 @@
+name: Survey on Merged PR by Non-Member
+
+on:
+  pull_request_target:
+    types: [closed]
+
+permissions:
+  contents: read
+
+env:
+  PR_NUM: ${{ github.event.pull_request.number }}
+  SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=${{ github.repository }}
+
+jobs:
+  comment-on-pr:
+    name: Add survey to PR if author is not a member
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
+    steps:
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
+
+      - name: Add survey comment if author is not a member or bot
+        run: |
+          USERNAME="${{ github.event.pull_request.user.login }}"
+          USER_TYPE="${{ github.event.pull_request.user.type }}"
+          ORG="${{ github.repository_owner }}"
+          
+          # Skip if user is a bot
+          if [[ "$USER_TYPE" == "Bot" ]]; then
+            echo "Skipping survey for bot user: $USERNAME"
+            exit 0
+          fi
+          
+          # Skip if user is an org member
+          if gh api "orgs/$ORG/members/$USERNAME" --silent; then
+            echo "Skipping survey for org member: $USERNAME"
+            exit 0
+          fi
+          
+          # Add survey comment for external contributor
+          echo "Adding survey comment for external contributor: $USERNAME"
+          gh pr comment ${PR_NUM} --repo ${{ github.repository }} --body "Thank you for your contribution @${USERNAME}! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this [survey](${SURVEY_URL})."
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}

.github/workflows/test-all-versions.pr.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           fetch-depth: 0
       # Use the same Node.js version used for `release-please` workflow.
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: 18
       - name: Install
@@ -152,6 +152,7 @@ jobs:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       RUN_MONGODB_TESTS: 1
+      RUN_MONGOOSE_TESTS: 1
       RUN_MSSQL_TESTS: 1
       RUN_MYSQL_TESTS: 1
       RUN_ORACLEDB_TESTS: 1
@@ -163,7 +164,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node }}
       - name: Install