Merge branch 'main' into fix-connect-nested-route

open-telemetry · Aug 12, 2023 · 67d0dca · 67d0dca
2 parents 1f3dbf2 + 8802eae
commit 67d0dca
Show file tree

Hide file tree

Showing 77 changed files with 620 additions and 317 deletions.
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -10,10 +10,13 @@ jobs:
       fail-fast: false
       matrix:
         node: ["14", "16", "18"]
+        include:
+            - node: 14
+              code-coverage: true
     runs-on: ubuntu-latest
     services:
       memcached:
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.21-alpine
         ports:
         - 11211:11211
       mongo:
@@ -146,12 +149,16 @@ jobs:
         run: npm install --ignore-scripts
       - name: Bootstrap Dependencies
         run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
-      - name: Unit tests
+      - name: Unit tests (Full)
+        if: matrix.code-coverage
+        run: npm run test -- ${{ matrix.lerna-extra-args }}
+      - name: Unit tests (Delta)
+        if: ${{ !matrix.code-coverage }}
         run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }}
       - name: Build examples
         run: npm run compile:examples
       - name: Report Coverage
-        if: matrix.node == '14'
+        if: ${{ matrix.code-coverage && !cancelled()}}
         uses: codecov/codecov-action@v3
         with:
           verbose: true

diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json
@@ -80,8 +80,7 @@
     "change-case": "4.1.2",
     "json5": "2.2.0",
     "react": "17.0.2",
-    "react-dom": "17.0.2",
-    "tslib": "^2.3.1"
+    "react-dom": "17.0.2"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-browser-extension-autoinjection#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -46,11 +46,11 @@
     "@opentelemetry/contrib-test-utils": "^0.34.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.16.19",
-    "@types/sinon": "10.0.2",
+    "@types/sinon": "10.0.16",
     "mocha": "7.2.0",
-    "nock": "13.3.1",
+    "nock": "13.3.2",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
@@ -60,8 +60,7 @@
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/semantic-conventions": "^1.0.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/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -45,11 +45,11 @@
     "@opentelemetry/contrib-test-utils": "^0.34.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.16.19",
-    "@types/sinon": "10.0.2",
+    "@types/sinon": "10.0.16",
     "mocha": "7.2.0",
     "nock": "13.3.2",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
@@ -60,8 +60,7 @@
   "dependencies": {
     "@opentelemetry/core": "^1.0.0",
     "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/semantic-conventions": "^1.0.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json
@@ -39,12 +39,12 @@
     "@opentelemetry/contrib-test-utils": "^0.34.0",
     "@types/mocha": "8.2.3",
     "@types/node": "^18.0.0",
-    "@types/sinon": "10.0.2",
+    "@types/sinon": "10.0.16",
     "eslint-plugin-header": "^3.1.1",
     "mocha": "7.2.0",
     "nock": "13.3.2",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
@@ -54,8 +54,7 @@
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/semantic-conventions": "^1.0.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/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -49,7 +49,7 @@
     "mocha": "7.2.0",
     "nock": "13.3.2",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
@@ -60,8 +60,7 @@
     "@opentelemetry/core": "^1.0.0",
     "@opentelemetry/resources": "^1.0.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
-    "gcp-metadata": "^5.0.0",
-    "tslib": "^2.3.1"
+    "gcp-metadata": "^5.0.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-gcp#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -48,17 +48,16 @@
     "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.16.19",
-    "@types/sinon": "10.0.2",
+    "@types/sinon": "10.0.16",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "dependencies": {
-    "@opentelemetry/resources": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/resources": "^1.0.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-github#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -41,21 +41,20 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.34.0",
-    "@opentelemetry/sdk-node": "^0.41.0",
+    "@opentelemetry/sdk-node": "^0.41.2",
     "@types/mocha": "8.2.3",
     "@types/node": "18.16.19",
     "@types/semver": "7.5.0",
     "mocha": "7.2.0",
     "nock": "13.3.2",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/semantic-conventions": "^1.0.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.3.0"

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -40,16 +40,16 @@
     "@opentelemetry/api": "^1.4.1",
     "@types/mocha": "7.0.2",
     "@types/node": "18.16.19",
-    "@types/sinon": "10.0.2",
+    "@types/sinon": "10.0.16",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.41.0",
+    "@opentelemetry/instrumentation": "^0.41.2",
     "@opentelemetry/instrumentation-amqplib": "^0.33.0",
     "@opentelemetry/instrumentation-aws-lambda": "^0.36.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.35.0",
@@ -64,9 +64,9 @@
     "@opentelemetry/instrumentation-fastify": "^0.32.0",
     "@opentelemetry/instrumentation-generic-pool": "^0.32.0",
     "@opentelemetry/instrumentation-graphql": "^0.35.0",
-    "@opentelemetry/instrumentation-grpc": "^0.41.0",
+    "@opentelemetry/instrumentation-grpc": "^0.41.2",
     "@opentelemetry/instrumentation-hapi": "^0.32.0",
-    "@opentelemetry/instrumentation-http": "^0.41.0",
+    "@opentelemetry/instrumentation-http": "^0.41.2",
     "@opentelemetry/instrumentation-ioredis": "^0.35.0",
     "@opentelemetry/instrumentation-knex": "^0.32.0",
     "@opentelemetry/instrumentation-koa": "^0.35.0",
@@ -92,7 +92,6 @@
     "@opentelemetry/resource-detector-container": "^0.3.0",
     "@opentelemetry/resource-detector-gcp": "^0.29.0",
     "@opentelemetry/resources": "^1.12.0",
-    "@opentelemetry/sdk-node": "^0.41.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/sdk-node": "^0.41.2"
   }
 }
diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -33,23 +33,23 @@
     "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@babel/core": "7.15.0",
+    "@babel/core": "7.22.10",
     "@opentelemetry/api": "^1.3.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.16.19",
-    "@types/sinon": "10.0.2",
+    "@types/sinon": "10.0.16",
     "@types/webpack-env": "1.16.2",
     "babel-loader": "8.2.2",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "karma": "6.3.16",
     "karma-chrome-launcher": "^3.1.1",
     "karma-coverage-istanbul-reporter": "3.0.3",
     "karma-mocha": "2.0.1",
-    "karma-spec-reporter": "0.0.32",
+    "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-loader": "8.3.0",
     "ts-mocha": "10.0.0",
@@ -59,11 +59,10 @@
     "webpack-merge": "5.8.0"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.41.0",
+    "@opentelemetry/instrumentation": "^0.41.2",
     "@opentelemetry/instrumentation-document-load": "^0.33.0",
-    "@opentelemetry/instrumentation-fetch": "^0.41.0",
+    "@opentelemetry/instrumentation-fetch": "^0.41.2",
     "@opentelemetry/instrumentation-user-interaction": "^0.33.0",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.41.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/instrumentation-xml-http-request": "^0.41.2"
   }
 }
diff --git a/package.json b/package.json
@@ -58,9 +58,8 @@
     "husky": "7.0.4",
     "lerna": "5.5.2",
     "lerna-changelog": "2.2.0",
-    "prettier": "2.8.7",
-    "typescript": "4.4.4",
-    "tslib": "^2.3.1"
+    "prettier": "2.8.8",
+    "typescript": "4.4.4"
   },
   "changelog": {
     "labels": {

diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -49,18 +49,17 @@
     "@opentelemetry/api": "^1.3.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.16.19",
-    "@types/sinon": "10.0.2",
+    "@types/sinon": "10.0.16",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "dependencies": {
     "@opentelemetry/sdk-metrics": "^1.8.0",
-    "systeminformation": "^5.0.0",
-    "tslib": "^2.3.1"
+    "systeminformation": "^5.0.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme"
 }
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -57,27 +57,26 @@
     "@opentelemetry/api": "^1.0.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.16.19",
-    "@types/sinon": "10.0.2",
+    "@types/sinon": "10.0.16",
     "@types/webpack-env": "1.16.2",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "karma": "6.3.16",
     "karma-chrome-launcher": "^3.1.1",
     "karma-coverage-istanbul-reporter": "3.0.3",
     "karma-mocha": "2.0.1",
-    "karma-spec-reporter": "0.0.32",
+    "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-loader": "8.3.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
     "webpack": "4.46.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/core": "^1.0.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-id-generator-aws-xray#readme"
 }
diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json
@@ -55,8 +55,5 @@
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
-  },
-  "dependencies": {
-    "tslib": "^2.3.1"
   }
 }
diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json
@@ -45,8 +45,5 @@
     "nyc": "15.1.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
-  },
-  "dependencies": {
-    "tslib": "^2.3.1"
   }
 }
diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json
@@ -47,15 +47,14 @@
     "@opentelemetry/core": "^1.8.0",
     "@opentelemetry/sdk-trace-base": "^1.8.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
-    "axios": "^1.3.5",
-    "tslib": "^2.3.1"
+    "axios": "^1.3.5"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.34.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.16.19",
-    "@types/sinon": "10.0.6",
+    "@types/sinon": "10.0.16",
     "eslint": "8.7.0",
     "expect": "29.2.0",
     "mocha": "7.2.0",
@@ -64,7 +63,7 @@
     "ts-mocha": "10.0.0",
     "nyc": "15.1.0",
     "typescript": "4.4.4",
-    "gts": "3.1.0",
+    "gts": "3.1.1",
     "@typescript-eslint/eslint-plugin": "5.8.1",
     "@typescript-eslint/parser": "5.8.1"
   },

diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -48,11 +48,10 @@
   "dependencies": {
     "@opentelemetry/core": "^1.0.0",
     "@opentelemetry/exporter-jaeger": "^1.3.1",
-    "@opentelemetry/instrumentation": "^0.41.0",
+    "@opentelemetry/instrumentation": "^0.41.2",
     "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@opentelemetry/resources": "^1.8.0",
     "@opentelemetry/sdk-trace-base": "^1.8.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/semantic-conventions": "^1.0.0"
   }
 }