Merge branch 'main' into db-error

Author: pichlermarc

.github/component-label-map.yml

@@ -274,6 +274,14 @@ 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:
@@ -296,3 +304,5 @@ pkg-status:unmaintained:
           - 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

@@ -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/lint.yml

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

.mocharc.yml

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

.release-please-manifest.json

@@ -2,12 +2,12 @@
   "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.3",
+  "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.13.0",
   "metapackages/auto-configuration-propagators": "0.3.1",
-  "metapackages/auto-instrumentations-node": "0.50.2",
+  "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.4",
@@ -48,7 +48,7 @@
   "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.45.1",
+  "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",
@@ -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/package.json

@@ -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"
   },
@@ -44,20 +44,18 @@
     "@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"

detectors/node/opentelemetry-resource-detector-aws/package.json

@@ -13,7 +13,7 @@
     "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws --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"
   },
@@ -43,12 +43,10 @@
     "@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": {

detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts

@@ -32,9 +32,10 @@ describe('[Integration] Internal tracing', () => {
       'http://169.254.169.254/metadata';
 
     const memoryExporter = new InMemorySpanExporter();
+    const spanProcessor = new SimpleSpanProcessor(memoryExporter);
     const sdk = new NodeSDK({
       instrumentations: [new FsInstrumentation(), new HttpInstrumentation()],
-      spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
+      spanProcessors: [spanProcessor],
     });
     sdk.start();
 
@@ -58,7 +59,7 @@ describe('[Integration] Internal tracing', () => {
 
     // NOTE: the require process makes use of the fs API so spans are being exported.
     // We reset the exporter to have a clean state for assertions
-    await new Promise(r => setTimeout(r, 0));
+    await spanProcessor.forceFlush();
     memoryExporter.reset();
 
     const detectors = [

detectors/node/opentelemetry-resource-detector-azure/package.json

@@ -13,7 +13,7 @@
     "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-azure --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"
   },
@@ -36,11 +36,9 @@
     "@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",
-    "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "peerDependencies": {