Merge branch 'main' into fix-redis-multi-spans

Author: aryamohanan

.github/workflows/ossf-scorecard.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+      - uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif

.github/workflows/pr-review.yml

@@ -0,0 +1,29 @@
+name: PR review
+# This workflow is triggered when a PR review is submitted. It checks if the review is approved and runs a script to add labels to the PR based on the review.
+on:
+  pull_request_review:
+    types:
+      - submitted
+
+permissions:
+  contents: read
+
+jobs:
+  add-owner-approved-label:
+    if: github.event.review.state == 'approved'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run add-labels-to-reviewed-pr.sh
+        run: |
+          chmod +x ./.github/workflows/scripts/add-labels-to-reviewed-pr.sh
+          ./.github/workflows/scripts/add-labels-to-reviewed-pr.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          PR: ${{ github.event.pull_request.number }}

.github/workflows/release-please.yml

@@ -52,18 +52,6 @@ jobs:
           token: ${{ steps.otelbot-token.outputs.token }}
           fetch-depth: 0
 
-      # If we've created/updated a PR:
-      # Sync the legacy "dependencies" key in package-lock.json.
-      - name: Update package-lock.json in PR
-        if: ${{ steps.release.outputs.pr }}
-        run: |
-          git config user.name otelbot
-          git config user.email [email protected]
-          npm install --ignore-scripts --package-lock-only
-          git add package-lock.json
-          git commit -m "chore: sync package-lock.json 'dependencies' key"
-          git push
-
   # If releases have been created, then publish to npm.
   npm-publish:
     needs: release-please

.github/workflows/scripts/add-labels-to-reviewed-pr.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+#
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Adds a "has:owner-approval" label to a PR if a reviewer who approved it is a component owner.
+
+set -euo pipefail
+
+if [[ -z "${REPO:-}" || -z "${PR:-}" ]]; then
+    echo "One or more of REPO and PR have not been set. Please ensure each is set."
+    exit 0
+fi
+
+main () {
+    CUR_DIRECTORY=$(dirname "$0")
+
+    # The latestReviews key returns the latest review for each reviewer cutting out any other reviews.
+    JSON=$(gh pr view "${PR}" --json "files,author,latestReviews" | tr -dc '[:print:]' | sed -E 's/\\[a-z]//g')
+    FILES=$(echo -n "${JSON}"| jq -r '.files[].path')
+    LATEST_REVIEWS=$(echo -n "${JSON}" | jq -c '.latestReviews')
+
+    # Fetch components
+    COMPONENTS=$(bash "${CUR_DIRECTORY}/get-components.sh" | tac) # Reversed so we visit subdirectories first
+    
+    declare -A PROCESSED_COMPONENTS
+
+    for COMPONENT in ${COMPONENTS}; do
+        COMPONENT_OWNERS=$(COMPONENT="${COMPONENT}" bash "${CUR_DIRECTORY}/get-codeowners.sh")
+
+        for FILE in ${FILES}; do
+            MATCH=$(echo -n "${FILE}" | grep -E "^${COMPONENT}" || true)
+
+            if [[ -z "${MATCH}" ]]; then
+                continue
+            fi
+
+            # If we match a file with a component, skip further processing for this file
+            if [[ -v PROCESSED_COMPONENTS["${COMPONENT}"] ]]; then
+                continue
+            fi
+            PROCESSED_COMPONENTS["${COMPONENT}"]=true
+
+            # Check if updated file is owned by one of the reviewers"
+            echo "${LATEST_REVIEWS}" | jq -c '.[]' | while IFS= read -r REVIEW; do
+                REVIEW_AUTHOR=$(echo -n "${REVIEW}"| jq -r '.author.login')
+                REVIEW_STATE=$(echo -n "${REVIEW}"| jq -r '.state')
+                if [[ "${REVIEW_STATE}" == "APPROVED" ]]; then
+                    # Review is approved. Checking if reviewer is a component owner
+                    for OWNER in ${COMPONENT_OWNERS}; do
+                        if [[ "${REVIEW_AUTHOR}" == "${OWNER}" ]]; then
+                            echo "Reviewer $REVIEW_AUTHOR is a component owner. Adding 'has:owner-approval' label."
+                            gh pr edit "${PR}" --repo "${REPO}" --add-label "has:owner-approval"
+                            exit 0
+                        fi
+                    done
+                fi
+            done
+        done
+    done
+}
+
+# Ensure the script does not block a PR even if it fails
+main || echo "Failed to run $0"

.github/workflows/scripts/get-codeowners.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+#
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Gets the owners for a given component from the component_owners.yml file.
+
+# Define the file path
+YML_FILE=".github/component_owners.yml"
+
+if [[ -z "${COMPONENT:-}" ]]; then
+    echo "COMPONENT has not been set, please ensure it is set."
+    exit 1
+fi
+
+FOUND=0
+
+# Parse the YAML file and extract owners for the given component
+while IFS= read -r line; do
+    # Check if the line matches the given component
+    if [[ "$line" =~ ^[[:space:]]*${COMPONENT}:[[:space:]]*$ ]]; then
+        FOUND=1
+        continue
+    fi
+
+    # If the component is found, extract owners
+    if [[ $FOUND -eq 1 ]]; then
+        # Stop if we encounter another component or an empty line
+        if [[ "$line" =~ ^[[:space:]]*[^#]+: || -z "$line" ]]; then
+            break
+        fi
+
+        # Extract the owner (remove leading spaces and '- ')
+        if [[ "$line" =~ ^[[:space:]]*-[[:space:]]*[^#]+ ]]; then
+            OWNER=$(echo "$line" | sed -E 's/^[[:space:]]*-[[:space:]]*([^#]+).*/\1/')
+            echo "$OWNER"
+        fi
+    fi
+done < "$YML_FILE"

.github/workflows/scripts/get-components.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+#
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Gets the components from the component_owners.yml file.
+
+
+# Define the file path
+YML_FILE=".github/component_owners.yml"
+
+# Parse the YAML file and extract components and their owners
+while IFS= read -r line; do
+    # Check if the line contains a component (ends with ':')
+    if [[ "$line" =~ ^[[:space:]]*[^#]+: ]]; then
+        # Extract the component name (remove leading spaces and trailing ':')
+        COMPONENT=$(echo "$line" | sed -E 's/^[[:space:]]*([^:]+):.*/\1/')
+        echo "$COMPONENT"
+    fi
+done < "$YML_FILE"

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

@@ -168,7 +168,9 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Install
-        run: npm ci --ignore-scripts
+        # Post install scripts are required for some deps for successful test
+        # runs: sqlite3, better-sqlite3, and possibly esbuild.
+        run: npm ci
       - name: Download Build Artifacts
         uses: actions/download-artifact@v5
         with:

.github/workflows/test.yml

@@ -54,6 +54,7 @@ jobs:
 
   unit-test:
     needs: compile
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -64,8 +65,9 @@ jobs:
           - "20"
           - "22"
           - "24"
-    runs-on: ubuntu-latest
-    services:
+    # `&foo` syntax is a YAML anchor. See:
+    # https://docs.github.com/en/actions/reference/workflows-and-actions/reusing-workflow-configurations#yaml-anchors-and-aliases
+    services: &test_services
       memcached:
         image: memcached:1.6.39-alpine
         ports:
@@ -147,7 +149,7 @@ jobs:
         env:
           RABBITMQ_DEFAULT_USER: username
           RABBITMQ_DEFAULT_PASS: password
-    env:
+    env: &test_env
       RUN_CASSANDRA_TESTS: 1
       RUN_MEMCACHED_TESTS: 1
       RUN_MONGODB_TESTS: 1
@@ -218,6 +220,45 @@ jobs:
         run: npm run test:browser:ci:affected
       - name: Unit tests (Nodejs - Delta)
         run: npm run test:ci:affected
+
+  test-all-versions:
+    needs: compile
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - "18"
+          - "20"
+          - "22"
+          - "24"
+    services: *test_services
+    env: *test_env
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v5
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm ci
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v5
+        with:
+          name: compile-cache-${{ github.run_number }}
+          path: .nx
+      # Note: see comment in the compile job
+      - name: Set base and head commits
+        run: |
+          if [ "${{github.event_name}}" == "push" ]; then
+            echo "NX_BASE=origin/main~1" >> "$GITHUB_ENV"
+            echo "NX_HEAD=origin/main" >> "$GITHUB_ENV"
+          else
+            echo "NX_BASE=origin/main" >> "$GITHUB_ENV"
+            echo "NX_HEAD=HEAD" >> "$GITHUB_ENV"
+          fi
+      - name: Compile (Delta)
+        run: npm run compile:ci:affected
       - name: Test All Versions (Delta)
         run: npm run test-all-versions:ci:affected
       - name: Upload Test Artifacts
@@ -232,9 +273,9 @@ jobs:
             packages/*/.nyc_output/**
             LICENSE
 
-  test-coverage-report:
+  coverage-report:
+    needs: test-all-versions
     runs-on: ubuntu-latest
-    needs: unit-test
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -245,27 +286,17 @@ jobs:
           node-version: 18
       - name: Install
         run: npm ci --ignore-scripts
-      # NOTE: keep this in sync with the node versions from `unit-test` job
+      # Note: Keep this in sync with the node versions from `test-all-versions` job.
       - name: Download Test Artifacts (18)
         uses: actions/download-artifact@v5
         with:
           name: tests-coverage-cache-${{ github.run_number }}-18
           path: .
-      - name: Download Test Artifacts (18.19.0)
-        uses: actions/download-artifact@v5
-        with:
-          name: tests-coverage-cache-${{ github.run_number }}-18.19.0
-          path: .
       - name: Download Test Artifacts (20)
         uses: actions/download-artifact@v5
         with:
           name: tests-coverage-cache-${{ github.run_number }}-20
           path: .
-      - name: Download Test Artifacts (20.6.0)
-        uses: actions/download-artifact@v5
-        with:
-          name: tests-coverage-cache-${{ github.run_number }}-20.6.0
-          path: .
       - name: Download Test Artifacts (22)
         uses: actions/download-artifact@v5
         with:

.gitignore

@@ -83,3 +83,5 @@ docs
 # version.ts file is automatically generated at compile time
 version.ts
 /.vs
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md

.nycrc

@@ -15,7 +15,7 @@
     "src/platform/browser/*.ts",
     "test/*.ts",
     "webpack/*.js",
-    ".eslintrc.js"
+    "eslint.config.mjs"
   ],
   "all": true
 }