Merge branch 'main' into main

open-telemetry · Nov 14, 2024 · 1b3d38f · 1b3d38f
2 parents 5b788a2 + 5eb61d8
commit 1b3d38f
Show file tree

Hide file tree

Showing 319 changed files with 11,902 additions and 11,586 deletions.
diff --git a/.github/component-label-map.yml b/.github/component-label-map.yml
@@ -274,20 +274,35 @@ pkg:sql-common:
   - changed-files:
       - any-glob-to-any-file:
           - packages/opentelemetry-sql-common/**
+pkg:propagator-aws-xray:
+  - changed-files:
+      - any-glob-to-any-file:
+          - propagators/propagator-aws-xray/**
+pkg:propagator-aws-xray-lambda:
+  - changed-files:
+      - any-glob-to-any-file:
+          - propagators/propagator-aws-xray-lambda/**
 pkg-status:unmaintained:
   - changed-files:
       - any-glob-to-any-file:
           - detectors/node/opentelemetry-resource-detector-github/**
+          - packages/opentelemetry-redis-common/**
           - plugins/node/instrumentation-fs/**
           - plugins/node/instrumentation-tedious/**
           - plugins/node/opentelemetry-instrumentation-connect/**
           - plugins/node/opentelemetry-instrumentation-dns/**
+          - plugins/node/opentelemetry-instrumentation-fastify/**
           - plugins/node/opentelemetry-instrumentation-generic-pool/**
           - plugins/node/opentelemetry-instrumentation-hapi/**
           - plugins/node/opentelemetry-instrumentation-knex/**
           - plugins/node/opentelemetry-instrumentation-koa/**
           - plugins/node/opentelemetry-instrumentation-memcached/**
+          - plugins/node/opentelemetry-instrumentation-mongodb/**
+          - plugins/node/opentelemetry-instrumentation-mysql/**
+          - plugins/node/opentelemetry-instrumentation-mysql2/**
           - plugins/node/opentelemetry-instrumentation-nestjs-core/**
           - plugins/node/opentelemetry-instrumentation-restify/**
           - plugins/node/opentelemetry-instrumentation-router/**
           - propagators/opentelemetry-propagator-ot-trace/**
+          - propagators/propagator-aws-xray/**
+          - propagators/propagator-aws-xray-lambda/**
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -2,8 +2,8 @@
 components:
   detectors/node/opentelemetry-resource-detector-alibaba-cloud:
     - legendecas
-  detectors/node/opentelemetry-resource-detector-aws: []
-    # Unmaintained
+  detectors/node/opentelemetry-resource-detector-aws:
+    - jj22ee
   detectors/node/opentelemetry-resource-detector-azure:
     - jacksonweber
     - hectorhdzg
@@ -16,8 +16,8 @@ components:
     # Unmaintained
   detectors/node/opentelemetry-resource-detector-instana:
     - kirrg001
-  incubator/opentelemetry-sampler-aws-xray: []
-    # Unmaintained
+  incubator/opentelemetry-sampler-aws-xray:
+    - jj22ee
   metapackages/auto-configuration-propagators:
     - pichlermarc
   metapackages/auto-instrumentations-node:
@@ -35,15 +35,15 @@ components:
     - jamiedanielson
   packages/opentelemetry-host-metrics:
     - legendecas
-  packages/opentelemetry-id-generator-aws-xray: []
-    # Unmaintained
+  packages/opentelemetry-id-generator-aws-xray:
+    - jj22ee
   packages/opentelemetry-propagation-utils:
     - dyladan
     - pichlermarc
     - legendecas
     - blumamir
-  packages/opentelemetry-redis-common:
-    - haddasbronfman
+  packages/opentelemetry-redis-common: []
+    # Unmaintained
   packages/opentelemetry-test-utils:
     - dyladan
     - pichlermarc
@@ -69,10 +69,11 @@ components:
     - mottibec
   plugins/node/instrumentation-tedious: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-aws-lambda: []
-    # Unmaintained
+  plugins/node/opentelemetry-instrumentation-aws-lambda:
+    - jj22ee
   plugins/node/opentelemetry-instrumentation-aws-sdk:
     - blumamir
+    - jj22ee
   plugins/node/opentelemetry-instrumentation-bunyan:
     - seemk
     - trentm
@@ -85,8 +86,8 @@ components:
   plugins/node/opentelemetry-instrumentation-express:
     - JamieDanielson
     - pkanal
-  plugins/node/opentelemetry-instrumentation-fastify:
-    - pichlermarc
+  plugins/node/opentelemetry-instrumentation-fastify: []
+    # Unmaintained
   plugins/node/opentelemetry-instrumentation-generic-pool: []
     # Unmaintained
   plugins/node/opentelemetry-instrumentation-graphql:
@@ -102,12 +103,12 @@ components:
     # Unmaintained
   plugins/node/opentelemetry-instrumentation-memcached: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-mongodb:
-    - osherv
-  plugins/node/opentelemetry-instrumentation-mysql:
-    - haddasbronfman
-  plugins/node/opentelemetry-instrumentation-mysql2:
-    - haddasbronfman
+  plugins/node/opentelemetry-instrumentation-mongodb: []
+    # Unmaintained
+  plugins/node/opentelemetry-instrumentation-mysql: []
+    # Unmaintained
+  plugins/node/opentelemetry-instrumentation-mysql2: []
+    # Unmaintained
   plugins/node/opentelemetry-instrumentation-nestjs-core: []
     # Unmaintained
   plugins/node/opentelemetry-instrumentation-net:
@@ -145,6 +146,10 @@ components:
     - kirrg001
   propagators/opentelemetry-propagator-ot-trace: []
     # Unmaintained
+  propagators/propagator-aws-xray:
+    - jj22ee
+  propagators/propagator-aws-xray-lambda: [ ]
+  # Unmaintained
 
 ignored-authors:
   - renovate-bot
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,17 +2,9 @@ name: "CodeQL Analysis"
 
 on:
   workflow_dispatch:
-  schedule:
-    #        ┌───────────── minute (0 - 59)
-    #        │  ┌───────────── hour (0 - 23)
-    #        │  │ ┌───────────── day of the month (1 - 31)
-    #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        *  * * * *
-    - cron: '30 1 * * *'
+  push:
+    branches: [ main ]
+  pull_request:
 
 jobs:
   CodeQL-Build:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,5 +19,3 @@ jobs:
       - name: Lint
         run: |
           npm run lint
-          npm run lint:markdown
-          npm run lint:readme
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -16,6 +16,9 @@ jobs:
         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
         with:

diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
@@ -13,8 +13,36 @@ on:
         type: string
 
 jobs:
+  build-and-cache:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    env:
+      NPM_CONFIG_UNSAFE_PERM: true
+      NODE_OPTIONS: --max-old-space-size=4096
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      # Use the same Node.js version used for `release-please` workflow.
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - name: Install
+        run: npm ci
+      - name: Build
+        run: npm run compile
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: tav-build-cache-${{ github.run_number }}
+          path: node_modules/.cache/nx
+          retention-days: 1
+
   tav:
     name: Run test-all-versions
+    needs: build-and-cache
     strategy:
       fail-fast: false
       matrix:
@@ -26,14 +54,14 @@ jobs:
         ports:
         - 27017:27017
       mssql:
-        image: mcr.microsoft.com/mssql/server:2017-latest
+        image: mcr.microsoft.com/mssql/server:2022-latest
         env:
-          SA_PASSWORD: mssql_passw0rd
+          MSSQL_SA_PASSWORD: mssql_passw0rd
           ACCEPT_EULA: Y
         ports:
         - 1433:1433
         options: >-
-          --health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
+          --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
           --health-interval 1s
           --health-timeout 30s
           --health-start-period 10s
@@ -120,6 +148,11 @@ jobs:
         run: npm install -g npm@9 # npm@9 supports node >=14.17.0
       - name: Install
         run: npm ci
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: tav-build-cache-${{ github.run_number }}
+          path: node_modules/.cache/nx
       - name: Build
         run: npm run compile
       - name: Run test-all-versions

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -5,7 +5,35 @@ on:
   pull_request:
 
 jobs:
+  build-and-cache:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    env:
+      NPM_CONFIG_UNSAFE_PERM: true
+      NODE_OPTIONS: --max-old-space-size=4096
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      # Use the same Node.js version used for `release-please` workflow.
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - name: Install
+        run: npm ci
+      - name: Build
+        run: npm run compile
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: tests-build-cache-${{ github.run_number }}
+          path: node_modules/.cache/nx
+          retention-days: 1
+
   unit-test:
+    needs: build-and-cache
     strategy:
       fail-fast: false
       matrix:
@@ -24,14 +52,14 @@ jobs:
         ports:
         - 27017:27017
       mssql:
-        image: mcr.microsoft.com/mssql/server:2017-latest
+        image: mcr.microsoft.com/mssql/server:2022-latest
         env:
-          SA_PASSWORD: mssql_passw0rd
+          MSSQL_SA_PASSWORD: mssql_passw0rd
           ACCEPT_EULA: Y
         ports:
         - 1433:1433
         options: >-
-          --health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
+          --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
           --health-interval 1s
           --health-timeout 30s
           --health-start-period 10s
@@ -128,6 +156,11 @@ jobs:
         run: npm install -g npm@9 # npm@9 supports node >=14.17.0
       - name: Install
         run: npm ci
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: tests-build-cache-${{ github.run_number }}
+          path: node_modules/.cache/nx
       - name: Build
         run: npm run compile
       - name: Unit tests (Full)
@@ -139,10 +172,13 @@ jobs:
       - name: Report Coverage
         if: ${{ matrix.code-coverage && !cancelled()}}
         uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           verbose: true
 
   browser-test:
+    needs: build-and-cache
     strategy:
       fail-fast: false
       matrix:
@@ -164,11 +200,18 @@ jobs:
         run: npm install -g npm@9 # npm@9 supports node >=14.17.0
       - name: Install
         run: npm ci
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: tests-build-cache-${{ github.run_number }}
+          path: node_modules/.cache/nx
       - name: Build
         run: npm run compile
       - name: Unit tests
         run: npm run test:browser
       - name: Report Coverage
         uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           verbose: true
diff --git a/.mocharc.yml b/.mocharc.yml
@@ -0,0 +1 @@
+require: 'ts-node/register/transpile-only'