Merge branch 'main' into fix-mysql2-migrate-to-v3-in-tests

open-telemetry · Oct 11, 2024 · 91adced · 91adced
2 parents 43da503 + 25ab243
commit 91adced
Show file tree

Hide file tree

Showing 90 changed files with 1,601 additions and 334 deletions.
diff --git a/.github/component-label-map.yml b/.github/component-label-map.yml
@@ -278,6 +278,7 @@ 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,6 +289,9 @@ 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/**

diff --git a/.github/component_owners.yml b/.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:

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/unit-test.yml b/.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
diff --git a/.release-please-manifest.json b/.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.3",
+  "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.50.2",
   "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.45.1",
   "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",

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

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.1",
+  "version": "0.29.3",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -42,7 +42,7 @@
     "@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",
@@ -57,6 +57,7 @@
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.10.0",
+    "@opentelemetry/core": "^1.26.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"

diff --git a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.6.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.6.1...resource-detector-aws-v1.6.2) (2024-10-08)
+
+
+### Bug Fixes
+
+* **detector-aws:** suppress internal tracing for all detectors ([#2433](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2433)) ([aa9710f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/aa9710f73697f684f01140a3bdad495b705618b6))
+
 ## [1.6.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.6.0...resource-detector-aws-v1.6.1) (2024-09-02)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -41,7 +41,7 @@
     "@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",

diff --git a/detectors/node/opentelemetry-resource-detector-azure/package.json b/detectors/node/opentelemetry-resource-detector-azure/package.json
@@ -34,7 +34,7 @@
     "@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",

diff --git a/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.4.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.2...resource-detector-container-v0.4.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.4.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.1...resource-detector-container-v0.4.2) (2024-10-08)
+
+
+### Bug Fixes
+
+* **detector-container:** suppress internal tracing ([#2430](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2430)) ([80c2f1a](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/80c2f1af6139e43522a944ab496fed68ef912fb2))
+
 ## [0.4.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.0...resource-detector-container-v0.4.1) (2024-09-02)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json
@@ -1,13 +1,12 @@
 {
   "name": "@opentelemetry/resource-detector-container",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Opentelemetry resource detector to get container resource attributes",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
   "repository": "open-telemetry/opentelemetry-js-contrib",
   "scripts": {
     "clean": "rimraf build/*",
-    "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
@@ -36,7 +35,7 @@
     "@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",
     "eslint-plugin-header": "^3.1.1",
     "mocha": "7.2.0",
@@ -52,6 +51,7 @@
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.10.0",
+    "@opentelemetry/core": "^1.26.0",
     "@opentelemetry/semantic-conventions": "^1.27.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-container#readme"

diff --git a/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.29.12](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.11...resource-detector-gcp-v0.29.12) (2024-10-08)
+
+
+### Bug Fixes
+
+* **detector-gcp:** suppress internal tracing ([#2424](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2424)) ([3ee6f09](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/3ee6f09aa8fa026dbe137ab2fb33f204064b1018))
+
 ## [0.29.11](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.10...resource-detector-gcp-v0.29.11) (2024-09-02)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-gcp",
-  "version": "0.29.11",
+  "version": "0.29.12",
   "description": "OpenTelemetry SDK resource detector for GCP",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -41,7 +41,7 @@
     "@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/semver": "7.5.8",
     "mocha": "7.2.0",
     "nock": "13.3.3",

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -44,7 +44,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.0.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",
     "nyc": "15.1.0",

diff --git a/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.13.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.12.0...resource-detector-instana-v0.13.0) (2024-10-08)
+
+
+### ⚠ BREAKING CHANGES
+
+* **detector-instana:** change implementation to DetectorSync interface ([#2337](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2337))
+
+### Features
+
+* **detector-instana:** change implementation to DetectorSync interface ([#2337](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2337)) ([ef5efcb](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/ef5efcb7c6bd432159627b5aa1833cc97dce98ca))
+
 ## [0.12.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.11.0...resource-detector-instana-v0.12.0) (2024-09-02)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-instana",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "OpenTelemetry SDK resource detector for Instana",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -41,7 +41,7 @@
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@opentelemetry/sdk-node": "^0.53.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/semver": "7.5.8",
     "mocha": "7.2.0",
     "nock": "13.3.3",

diff --git a/incubator/opentelemetry-sampler-aws-xray/package.json b/incubator/opentelemetry-sampler-aws-xray/package.json
@@ -52,7 +52,7 @@
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.35.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "@typescript-eslint/eslint-plugin": "5.8.1",
     "@typescript-eslint/parser": "5.8.1",

diff --git a/metapackages/auto-configuration-propagators/CHANGELOG.md b/metapackages/auto-configuration-propagators/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-configuration-propagators-v0.3.0...auto-configuration-propagators-v0.3.1) (2024-10-08)
+
+
+### Bug Fixes
+
+* auto-config of baggage propagator ([#2425](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2425)) ([e87ff9d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e87ff9def70dbb282a1acb65d103020a20a1a696))
+
 ## [0.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-configuration-propagators-v0.2.0...auto-configuration-propagators-v0.3.0) (2024-09-02)
 
 

diff --git a/metapackages/auto-configuration-propagators/package.json b/metapackages/auto-configuration-propagators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/auto-configuration-propagators",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Metapackage which bundles known propagators for configuration via an env variable.",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-configuration-propagators#readme",
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.4.1",
     "@types/mocha": "7.0.2",
-    "@types/node": "18.6.5",
+    "@types/node": "18.18.14",
     "@types/sinon": "10.0.20",
     "mocha": "7.2.0",
     "nyc": "15.1.0",