Merge branch 'main' into fix/express-route

open-telemetry · Nov 15, 2024 · 3cbb80b · 3cbb80b
2 parents 60157a0 + 5eb61d8
commit 3cbb80b
Show file tree

Hide file tree

Showing 226 changed files with 5,869 additions and 11,534 deletions.
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,8 +35,8 @@ 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
@@ -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
@@ -145,8 +146,8 @@ components:
     - kirrg001
   propagators/opentelemetry-propagator-ot-trace: []
     # Unmaintained
-  propagators/propagator-aws-xray: [ ]
-  # Unmaintained
+  propagators/propagator-aws-xray:
+    - jj22ee
   propagators/propagator-aws-xray-lambda: [ ]
   # Unmaintained
 

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:
@@ -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:
@@ -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)
@@ -145,6 +178,7 @@ jobs:
           verbose: true
 
   browser-test:
+    needs: build-and-cache
     strategy:
       fail-fast: false
       matrix:
@@ -166,6 +200,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

diff --git a/.mocharc.yml b/.mocharc.yml
@@ -0,0 +1 @@
+require: 'ts-node/register/transpile-only'
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,63 +1,63 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.3",
-  "detectors/node/opentelemetry-resource-detector-aws": "1.6.2",
-  "detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
-  "detectors/node/opentelemetry-resource-detector-container": "0.4.4",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.12",
+  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.4",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.7.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.2.12",
+  "detectors/node/opentelemetry-resource-detector-container": "0.5.0",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.13",
   "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.13.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.14.0",
   "metapackages/auto-configuration-propagators": "0.3.1",
-  "metapackages/auto-instrumentations-node": "0.51.0",
-  "metapackages/auto-instrumentations-web": "0.41.0",
+  "metapackages/auto-instrumentations-node": "0.52.1",
+  "metapackages/auto-instrumentations-web": "0.42.0",
   "packages/baggage-span-processor": "0.3.1",
   "packages/opentelemetry-host-metrics": "0.35.4",
   "packages/opentelemetry-id-generator-aws-xray": "1.2.2",
-  "packages/opentelemetry-propagation-utils": "0.30.11",
+  "packages/opentelemetry-propagation-utils": "0.30.12",
   "packages/opentelemetry-redis-common": "0.36.2",
   "packages/opentelemetry-sql-common": "0.40.1",
-  "packages/opentelemetry-test-utils": "0.41.0",
-  "packages/winston-transport": "0.6.0",
-  "plugins/node/instrumentation-amqplib": "0.42.0",
-  "plugins/node/instrumentation-cucumber": "0.9.0",
-  "plugins/node/instrumentation-dataloader": "0.12.0",
-  "plugins/node/instrumentation-fs": "0.15.0",
-  "plugins/node/instrumentation-kafkajs": "0.3.0",
-  "plugins/node/instrumentation-lru-memoizer": "0.40.0",
-  "plugins/node/instrumentation-mongoose": "0.42.0",
-  "plugins/node/instrumentation-runtime-node": "0.7.0",
-  "plugins/node/instrumentation-socket.io": "0.42.0",
-  "plugins/node/instrumentation-tedious": "0.14.0",
-  "plugins/node/instrumentation-undici": "0.6.0",
-  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-bunyan": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-cassandra": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-connect": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-dns": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-express": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-graphql": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-hapi": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-ioredis": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-knex": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-koa": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-memcached": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-mongodb": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-mysql": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-net": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-pg": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
-  "plugins/node/opentelemetry-instrumentation-redis-4": "0.42.1",
-  "plugins/node/opentelemetry-instrumentation-restify": "0.41.0",
-  "plugins/node/opentelemetry-instrumentation-router": "0.40.0",
-  "plugins/node/opentelemetry-instrumentation-winston": "0.40.0",
-  "plugins/web/opentelemetry-instrumentation-document-load": "0.40.0",
-  "plugins/web/opentelemetry-instrumentation-long-task": "0.40.0",
-  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.0",
+  "packages/opentelemetry-test-utils": "0.42.0",
+  "packages/winston-transport": "0.7.0",
+  "plugins/node/instrumentation-amqplib": "0.43.0",
+  "plugins/node/instrumentation-cucumber": "0.10.0",
+  "plugins/node/instrumentation-dataloader": "0.13.0",
+  "plugins/node/instrumentation-fs": "0.16.0",
+  "plugins/node/instrumentation-kafkajs": "0.4.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.41.0",
+  "plugins/node/instrumentation-mongoose": "0.43.0",
+  "plugins/node/instrumentation-runtime-node": "0.9.0",
+  "plugins/node/instrumentation-socket.io": "0.43.0",
+  "plugins/node/instrumentation-tedious": "0.15.0",
+  "plugins/node/instrumentation-undici": "0.7.1",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.42.1",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-net": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.47.1",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-redis-4": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-router": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.41.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.41.0",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.41.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.41.0",
   "plugins/web/opentelemetry-plugin-react-load": "0.31.0",
   "propagators/opentelemetry-propagator-instana": "0.3.2",
   "propagators/opentelemetry-propagator-ot-trace": "0.27.2",

diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json
@@ -12,7 +12,7 @@
     "lint:fix": "eslint . --fix",
     "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection --include-dependencies",
     "prewatch": "npm run precompile",
-    "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
+    "test": "nyc mocha 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "watch": "npx webpack --mode=development --watch",
     "watch:mv2": "npx webpack --mode=development --watch --env MV=2",
@@ -47,15 +47,13 @@
     "html-webpack-plugin": "5.3.2",
     "jimp": "0.16.1",
     "jsdom": "15.2.1",
-    "mocha": "7.2.0",
     "null-loader": "4.0.1",
     "nyc": "15.1.0",
     "responsive-loader": "2.3.0",
     "rimraf": "4.2.0",
     "sinon": "15.0.1",
     "sinon-chrome": "3.0.1",
     "ts-loader": "9.2.5",
-    "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.29.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.3...resource-detector-alibaba-cloud-v0.29.4) (2024-10-25)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.41.0 to ^0.42.0
+
 ## [0.29.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.2...resource-detector-alibaba-cloud-v0.29.3) (2024-10-10)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.29.3",
+  "version": "0.29.4",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -10,10 +10,9 @@
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud --include-dependencies",
     "prewatch": "npm run precompile",
     "prepublishOnly": "npm run compile",
-    "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
+    "test": "nyc mocha 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "watch": "tsc -w"
   },
@@ -40,24 +39,22 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.41.0",
+    "@opentelemetry/contrib-test-utils": "^0.42.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
-    "mocha": "7.2.0",
     "nock": "13.3.3",
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "sinon": "15.2.0",
-    "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/resources": "^1.10.0",
     "@opentelemetry/core": "^1.26.0",
+    "@opentelemetry/resources": "^1.10.0",
     "@opentelemetry/semantic-conventions": "^1.27.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"