Merge remote-tracking branch 'upstream/main' into feat/support-express-v5

Author: timfish

.github/component-label-map.yml

@@ -274,10 +274,19 @@ 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/**
@@ -288,7 +297,12 @@ pkg-status:unmaintained:
           - 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/**

.github/component_owners.yml

@@ -42,8 +42,8 @@ components:
     - pichlermarc
     - legendecas
     - blumamir
-  packages/opentelemetry-redis-common:
-    - haddasbronfman
+  packages/opentelemetry-redis-common: []
+    # Unmaintained
   packages/opentelemetry-test-utils:
     - dyladan
     - pichlermarc
@@ -102,12 +102,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 +145,10 @@ components:
     - kirrg001
   propagators/opentelemetry-propagator-ot-trace: []
     # Unmaintained
+  propagators/propagator-aws-xray: [ ]
+  # Unmaintained
+  propagators/propagator-aws-xray-lambda: [ ]
+  # Unmaintained
 
 ignored-authors:
   - renovate-bot

.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:

.github/workflows/lint.yml

@@ -19,5 +19,3 @@ jobs:
       - name: Lint
         run: |
           npm run lint
-          npm run lint:markdown
-          npm run lint:readme

.github/workflows/unit-test.yml

@@ -139,6 +139,8 @@ jobs:
       - name: Report Coverage
         if: ${{ matrix.code-coverage && !cancelled()}}
         uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           verbose: true
 
@@ -170,5 +172,7 @@ jobs:
         run: npm run test:browser
       - name: Report Coverage
         uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           verbose: true

.mocharc.yml

@@ -0,0 +1 @@
+require: 'ts-node/register/transpile-only'

.release-please-manifest.json

@@ -1,16 +1,16 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.1",
-  "detectors/node/opentelemetry-resource-detector-aws": "1.6.1",
+  "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.1",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.11",
+  "detectors/node/opentelemetry-resource-detector-container": "0.4.4",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.12",
   "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.12.0",
-  "metapackages/auto-configuration-propagators": "0.3.0",
-  "metapackages/auto-instrumentations-node": "0.50.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.13.0",
+  "metapackages/auto-configuration-propagators": "0.3.1",
+  "metapackages/auto-instrumentations-node": "0.51.0",
   "metapackages/auto-instrumentations-web": "0.41.0",
   "packages/baggage-span-processor": "0.3.1",
-  "packages/opentelemetry-host-metrics": "0.35.3",
+  "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-redis-common": "0.36.2",
@@ -28,14 +28,14 @@
   "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.44.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.42.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "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",
@@ -48,10 +48,10 @@
   "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.44.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.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",
@@ -60,5 +60,7 @@
   "plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.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"
+  "propagators/opentelemetry-propagator-ot-trace": "0.27.2",
+  "propagators/propagator-aws-xray": "1.26.0",
+  "propagators/propagator-aws-xray-lambda": "0.53.0"
 }

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",

detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
+
+
+### Bug Fixes
+
+* add missing @opentelemetry/core dependency ([#2473](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2473)) ([4d66431](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4d66431a2ad480720bf6c33663a419ec1404cd33))
+
+## [0.29.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.1...resource-detector-alibaba-cloud-v0.29.2) (2024-10-08)
+
+
+### Bug Fixes
+
+* **detector-alibaba:** suppres internal tracing ([#2429](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2429)) ([9a7690e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/9a7690e92e571fcbf541eb76b6a5c4fde546b6e6))
+
 ## [0.29.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.0...resource-detector-alibaba-cloud-v0.29.1) (2024-09-02)
 
 

detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.29.1",
+  "version": "0.29.3",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -13,7 +13,7 @@
     "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"
   },
@@ -42,20 +42,19 @@
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@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/core": "^1.26.0",
     "@opentelemetry/resources": "^1.10.0",
     "@opentelemetry/semantic-conventions": "^1.27.0"
   },