diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 9ffee4b82f..654d7a95fa 100644 --- 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 index e6037e840a..1efd629ff2 100644 --- 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 index c1de5ba6f5..e6bd34924f 100644 --- 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 index 585bd9d51c..c1e52afb93 100644 --- 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 index 64f8d2291d..19c95d285d 100644 --- 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 index 86c3929f05..7d53bacca0 100644 --- 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 index 88721d1d9b..36af2ffce2 100644 --- 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 index f2dd1daa44..35fb4e0cdc 100644 --- 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 index 3902c6ee3e..4b82be75b6 100644 --- 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 index c6a2363374..79836489d3 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -33,11 +33,11 @@ "@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", @@ -45,11 +45,11 @@ "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 index 4cb48e1ea4..ad0e87338c 100644 --- 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 index 6227213cba..cbfaaf787d 100644 --- 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 index fc15bd07a9..71cd335ae1 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -57,18 +57,18 @@ "@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", @@ -76,8 +76,7 @@ "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 index 954e0f4c86..435f11f846 100644 --- 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 index 13dc0ef7a0..a90cc8aa6a 100644 --- 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 index 18d1eb0aa3..afb90e1707 100644 --- 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 index 4d5fb5de3a..3995735c51 100644 --- 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" } } diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 0a29b68f00..3505cbb613 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -47,17 +47,16 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/amqplib": "^0.5.17", - "@types/lodash": "4.14.178", + "@types/lodash": "4.14.197", "@types/mocha": "8.2.3", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.16", "@types/node": "18.16.19", "amqplib": "0.8.0", "expect": "29.2.0", diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 01015203cd..34378b3ba1 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -46,27 +46,27 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@cucumber/cucumber": "^8.8.0", + "@cucumber/cucumber": "^9.0.0", "@opentelemetry/api": "^1.0.0", "@opentelemetry/core": "^1.3.1", "@opentelemetry/sdk-trace-base": "^1.3.1", "@opentelemetry/sdk-trace-node": "^1.3.1", "@types/mocha": "7.0.2", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.2", - "gts": "3.1.0", + "@types/sinon": "10.0.16", + "gts": "3.1.1", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "3.0.2", + "rimraf": "5.0.1", "semver": "^7.3.2", - "sinon": "14.0.0", + "sinon": "14.0.2", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", - "typescript": "4.3.5" + "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.36.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme" diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 0f5e49a48f..590b3886fa 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -52,17 +52,16 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "dataloader": "2.2.1", + "dataloader": "2.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme" } diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 4e34834a95..4361e87fec 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -52,16 +52,15 @@ "@types/sinon": "^10.0.11", "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/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme" } diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index a42fba711f..ceccfb35ea 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -51,14 +51,13 @@ "lru-memoizer": "2.1.4", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme" } diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index a682c94425..5f320f246f 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -52,18 +52,17 @@ "@types/node": "18.16.19", "expect": "29.2.0", "mocha": "7.2.0", - "mongoose": "6.5.2", + "mongoose": "6.11.5", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme" } diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 0a4c0ec55e..1e64ffb84a 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -50,7 +50,7 @@ "expect": "27.4.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "socket.io": "^4.1.3", "socket.io-client": "^4.1.3", "test-all-versions": "5.0.1", @@ -58,9 +58,8 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme" } diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 57ce08963b..b9c4219a8c 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -55,17 +55,16 @@ "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "tedious": "14.1.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/tedious": "^4.0.6", - "tslib": "^2.3.1" + "@types/tedious": "^4.0.6" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-tedious#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 10cdbd9753..415d231a3f 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -54,17 +54,16 @@ "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/propagator-aws-xray": "^1.3.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/aws-lambda": "8.10.81", - "tslib": "^2.3.1" + "@types/aws-lambda": "8.10.119" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index b3ed817329..7a382575e5 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -47,10 +47,9 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/propagation-utils": "^0.30.0", - "tslib": "^2.3.1" + "@opentelemetry/propagation-utils": "^0.30.0" }, "devDependencies": { "@aws-sdk/client-dynamodb": "3.85.0", @@ -64,18 +63,18 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.6", + "@types/sinon": "10.0.16", "aws-sdk": "2.1008.0", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", - "typescript": "4.3.4" + "typescript": "4.4.4" }, "engines": { "node": ">=14" diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts index c74f0433c9..b82192ce82 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts @@ -112,6 +112,21 @@ export class AwsInstrumentation extends InstrumentationBase { v3MiddlewareStackFileNewVersions, ]); + // patch for @smithy/middleware-stack for aws-sdk packages v3.363.0+ + const v3SmithyMiddlewareStackFile = new InstrumentationNodeModuleFile( + '@smithy/middleware-stack/dist-cjs/MiddlewareStack.js', + ['>=1.0.1'], + this.patchV3ConstructStack.bind(this), + this.unpatchV3ConstructStack.bind(this) + ); + const v3SmithyMiddlewareStack = new InstrumentationNodeModuleDefinition( + '@smithy/middleware-stack', + ['>=2.0.0'], + undefined, + undefined, + [v3SmithyMiddlewareStackFile] + ); + const v3SmithyClient = new InstrumentationNodeModuleDefinition( '@aws-sdk/smithy-client', ['^3.1.0'], @@ -119,6 +134,14 @@ export class AwsInstrumentation extends InstrumentationBase { this.unpatchV3SmithyClient.bind(this) ); + // patch for new @smithy/smithy-client for aws-sdk packages v3.363.0+ + const v3NewSmithyClient = new InstrumentationNodeModuleDefinition( + '@smithy/smithy-client', + ['>=1.0.3'], + this.patchV3SmithyClient.bind(this), + this.unpatchV3SmithyClient.bind(this) + ); + const v2Request = new InstrumentationNodeModuleFile( 'aws-sdk/lib/core.js', ['^2.308.0'], @@ -134,7 +157,13 @@ export class AwsInstrumentation extends InstrumentationBase { [v2Request] ); - return [v2Module, v3MiddlewareStack, v3SmithyClient]; + return [ + v2Module, + v3MiddlewareStack, + v3SmithyMiddlewareStack, + v3SmithyClient, + v3NewSmithyClient, + ]; } protected patchV3ConstructStack(moduleExports: any, moduleVersion?: string) { diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 658dd76941..70f8d8e6a0 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -53,20 +53,19 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.16", "bunyan": "1.8.15", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "@types/bunyan": "1.8.7", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@types/bunyan": "1.8.8" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index a253da11af..82b5e743b1 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -54,19 +54,18 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/semver": "7.5.0", - "@types/sinon": "10.0.2", - "cassandra-driver": "4.6.3", + "@types/sinon": "10.0.16", + "cassandra-driver": "4.6.4", "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/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index b08c529450..81adf97d4d 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -53,16 +53,15 @@ "connect": "3.7.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/connect": "3.4.35", - "tslib": "^2.3.1" + "@types/connect": "3.4.35" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 0e8228626e..0f6f627514 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -53,19 +53,18 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", - "@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/semantic-conventions": "^1.0.0", - "semver": "^7.3.2", - "tslib": "^2.3.1" + "semver": "^7.3.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json index 303c76d72c..c829a5ac71 100644 --- a/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -32,17 +32,16 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/instrumentation-express": "0.28.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/semantic-conventions": "^1.0.0", "axios": "^0.21.1", "cross-env": "^7.0.3", - "express": "^4.17.1", - "tslib": "^2.3.1" + "express": "^4.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index ff0cd4e8e1..77de1e3131 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -54,11 +54,11 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.16", "express": "4.17.3", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", @@ -66,10 +66,9 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/express": "4.17.13", - "tslib": "^2.3.1" + "@types/express": "4.17.17" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-fastify/README.md b/plugins/node/opentelemetry-instrumentation-fastify/README.md index 3e74f96b8b..a4a30e62cd 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/README.md +++ b/plugins/node/opentelemetry-instrumentation-fastify/README.md @@ -47,8 +47,9 @@ See [examples/fastify](https://github.com/open-telemetry/opentelemetry-js-contri ## Fastify Instrumentation Options -| Options | Type | Example | Description | -| `requestHook` | `FastifyCustomAttributeFunction` | `(span, requestInfo) => {}` | Function for adding custom attributes to Fastify requests. Receives params: `Span, FastifyRequestInfo`. | +| Options | Type | Example | Description | +| -------------- | ---------------------------- | -------------------------------- | ------------------------------------------------------------------------------ | +| `requestHook` | `FastifyCustomAttributeFunction` | `(span, requestInfo) => {}` | Function for adding custom attributes to Fastify requests. Receives parameters: `Span, FastifyRequestInfo`. | ### Using `requestHook` diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 3cbd335d95..65c8c2cc8c 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -48,24 +48,23 @@ "@fastify/express": "^2.0.2", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/instrumentation-http": "0.41.0", + "@opentelemetry/instrumentation-http": "0.41.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", - "@types/express": "4.17.13", + "@types/express": "4.17.17", "@types/mocha": "7.0.2", "@types/node": "18.16.19", "fastify": "4.18.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index f40e353527..f892564893 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -55,16 +55,15 @@ "generic-pool": "3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "semver": "7.5.4", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/generic-pool": "^3.1.9", - "tslib": "^2.3.1" + "@types/generic-pool": "^3.1.9" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 0543a22c73..7f76139977 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -55,14 +55,13 @@ "graphql": "^16.5.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 0dd7e3c5a1..464fca8502 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -54,16 +54,15 @@ "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/hapi__hapi": "20.0.9", - "tslib": "^2.3.1" + "@types/hapi__hapi": "20.0.13" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-hapi#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts index e671041b54..af3fa98a14 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts @@ -276,6 +276,7 @@ export class HapiInstrumentation extends InstrumentationBase { const oldHandler = plugin.register; const self = this; const newRegisterHandler = function (server: Hapi.Server, options: T) { + server.route; self._wrap(server, 'route', original => { return instrumentation._getServerRoutePatch.bind(instrumentation)( original, @@ -332,7 +333,7 @@ export class HapiInstrumentation extends InstrumentationBase { ...params: Parameters ) { if (api.trace.getSpan(api.context.active()) === undefined) { - return await method(...params); + return await method.apply(this, params); } const metadata = getExtMetadata(extPoint, pluginName); const span = instrumentation.tracer.startSpan(metadata.name, { diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts b/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts index 4e4b864836..8586d272d9 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts +++ b/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts @@ -33,7 +33,7 @@ export type HapiServerRouteInput = | PatchableServerRoute | PatchableServerRoute[]; -export type PatchableServerRoute = Hapi.ServerRoute & { +export type PatchableServerRoute = Hapi.ServerRoute & { [handlerPatched]?: boolean; options?: { handler?: Hapi.Lifecycle.Method; diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 1eb171e079..d5232bd687 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -56,24 +56,23 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.16", "@types/node": "18.16.19", "cross-env": "7.0.3", "ioredis": "5.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/redis-common": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/ioredis4": "npm:@types/ioredis@^4.28.10", - "tslib": "^2.3.1" + "@types/ioredis4": "npm:@types/ioredis@^4.28.10" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-ioredis#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 8a52ab28ed..687e6f4ef4 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -54,15 +54,14 @@ "knex": "0.95.9", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", - "sqlite3": "5.1.5", + "rimraf": "5.0.1", + "sqlite3": "5.1.6", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts index 91de6e7677..257232f278 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts @@ -132,7 +132,7 @@ export class KnexInstrumentation extends InstrumentationBase { return function wrapped_logging_method(this: any, query: any) { const config = this.client.config; - const table = this.builder?._single?.table; + const table = utils.extractTableName(this.builder); // `method` actually refers to the knex API method - Not exactly "operation" // in the spec sense, but matches most of the time. const operation = query?.method; diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts b/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts index 6a54e7c878..6c7e6fbdba 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts @@ -80,3 +80,11 @@ export const limitLength = (str: string, maxLength: number) => { } return str; }; + +export const extractTableName = (builder: any): string => { + const table = builder?._single?.table; + if (typeof table === 'object') { + return extractTableName(table); + } + return table; +}; diff --git a/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts b/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts index f939160b0f..1f660cf273 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts +++ b/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts @@ -190,6 +190,247 @@ describe('Knex instrumentation', () => { } ); }); + + describe('nested queries', () => { + it('should correctly identify the table in nested queries', async () => { + const parentSpan = tracer.startSpan('parentSpan'); + await context.with( + trace.setSpan(context.active(), parentSpan), + async () => { + await client.schema.createTable('testTable1', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test1' }).into('testTable1'); + + const builder = client('testTable1').select('*'); + const clone = builder.clone().clear('order'); + + const nestedQueryBuilder = builder.client + .queryBuilder() + .count('* AS count') + .from(clone.as('inner')) + .first(); + + const total = await nestedQueryBuilder; + assert.deepEqual(total, { count: 1 }); + + parentSpan.end(); + + const instrumentationSpans = memoryExporter.getFinishedSpans(); + assertSpans(instrumentationSpans, [ + { + statement: 'create table `testTable1` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable1', + statement: 'insert into `testTable1` (`title`) values (?)', + parentSpan, + }, + { + op: 'first', + table: 'testTable1', + statement: + 'select count(*) as `count` from (select * from `te..', + parentSpan, + }, + null, + ]); + } + ); + }); + + it('should correctly identify the table in double nested queries', async () => { + const parentSpan = tracer.startSpan('parentSpan'); + await context.with( + trace.setSpan(context.active(), parentSpan), + async () => { + await client.schema.createTable('testTable1', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test1' }).into('testTable1'); + + const builder = client('testTable1').select('*'); + const clone = builder.clone().clear('order'); + + const nestedQueryBuilder = builder.client + .queryBuilder() + .count('* AS count') + .from(clone.as('inner')) + .first(); + + const nestedClone = nestedQueryBuilder.clone().clear('order'); + const totalDoubleNested = await nestedQueryBuilder.client + .queryBuilder() + .count('* AS count2') + .from(nestedClone.as('inner2')) + .first(); + assert.deepEqual(totalDoubleNested, { count2: 1 }); + + parentSpan.end(); + + const instrumentationSpans = memoryExporter.getFinishedSpans(); + assertSpans(instrumentationSpans, [ + { + statement: 'create table `testTable1` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable1', + statement: 'insert into `testTable1` (`title`) values (?)', + parentSpan, + }, + { + op: 'first', + table: 'testTable1', + statement: + 'select count(*) as `count2` from (select count(*) ..', + parentSpan, + }, + null, + ]); + } + ); + }); + + it('should correctly identify the table in join with nested table', async () => { + const parentSpan = tracer.startSpan('parentSpan'); + await context.with( + trace.setSpan(context.active(), parentSpan), + async () => { + await client.schema.createTable('testTable1', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test1' }).into('testTable1'); + + await client.schema.createTable('testTable2', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test2' }).into('testTable2'); + + const builder = client('testTable1').select('*'); + const clone = builder.clone().clear('order'); + + const nestedQueryBuilder = builder.client + .queryBuilder() + .count('* AS count') + .from(clone.as('inner')) + .first(); + + const totalDoubleNested = await nestedQueryBuilder.client + .queryBuilder() + .from('testTable2') + .leftJoin(nestedQueryBuilder.as('nested_query')) + .first(); + assert.deepEqual(totalDoubleNested, { title: 'test2', count: 1 }); + + parentSpan.end(); + + const instrumentationSpans = memoryExporter.getFinishedSpans(); + assertSpans(instrumentationSpans, [ + { + statement: 'create table `testTable1` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable1', + statement: 'insert into `testTable1` (`title`) values (?)', + parentSpan, + }, + { + statement: 'create table `testTable2` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable2', + statement: 'insert into `testTable2` (`title`) values (?)', + parentSpan, + }, + { + op: 'first', + table: 'testTable2', + statement: + 'select * from `testTable2` left join (select count..', + parentSpan, + }, + null, + ]); + } + ); + }); + + it('should correctly identify the table in join nested table with table', async () => { + const parentSpan = tracer.startSpan('parentSpan'); + await context.with( + trace.setSpan(context.active(), parentSpan), + async () => { + await client.schema.createTable('testTable1', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test1' }).into('testTable1'); + + await client.schema.createTable('testTable2', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test2' }).into('testTable2'); + + const builder = client('testTable1').select('*'); + const clone = builder.clone().clear('order'); + + const nestedQueryBuilder = builder.client + .queryBuilder() + .count('* AS count') + .from(clone.as('inner')) + .first(); + + const totalDoubleNested = await nestedQueryBuilder.client + .queryBuilder() + .from(nestedQueryBuilder.as('nested_query')) + .leftJoin('testTable2') + .first(); + assert.deepEqual(totalDoubleNested, { title: 'test2', count: 1 }); + + parentSpan.end(); + + const instrumentationSpans = memoryExporter.getFinishedSpans(); + assertSpans(instrumentationSpans, [ + { + statement: 'create table `testTable1` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable1', + statement: 'insert into `testTable1` (`title`) values (?)', + parentSpan, + }, + { + statement: 'create table `testTable2` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable2', + statement: 'insert into `testTable2` (`title`) values (?)', + parentSpan, + }, + { + op: 'first', + table: 'testTable1', + statement: + 'select * from (select count(*) as `count` from (se..', + parentSpan, + }, + null, + ]); + } + ); + }); + }); }); describe('Disabling instrumentation', () => { diff --git a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json index 6a23e6fe76..4c21e26897 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json @@ -34,14 +34,13 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-koa": "^0.31.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "axios": "^0.21.1", - "koa": "^2.13.0", - "tslib": "^2.3.1" + "koa": "^2.13.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 5b22e19f5f..7332fa4c26 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -56,11 +56,11 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.16", "koa": "2.13.1", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", @@ -68,11 +68,10 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/koa": "2.13.6", - "@types/koa__router": "8.0.7", - "tslib": "^2.3.1" + "@types/koa": "2.13.8", + "@types/koa__router": "8.0.11" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-koa#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index a0a6ba3b99..2454c18ce2 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -58,15 +58,14 @@ "memcached": "2.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/memcached": "^2.2.6", - "tslib": "^2.3.1" + "@types/memcached": "^2.2.6" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-memcached#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json index e641368986..3b4f670047 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json @@ -33,13 +33,12 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-mongodb": "^0.32.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", - "mongodb": "^3.7.3", - "tslib": "^2.3.1" + "mongodb": "^3.7.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index d7d96439eb..241426f8fa 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -64,16 +64,15 @@ "mocha": "7.2.0", "mongodb": "3.6.11", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/sdk-metrics": "^1.9.1", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json index 2adaa420ae..698bd86aa5 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json @@ -34,14 +34,13 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-mysql": "^0.31.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.33.0", - "mysql": "^2.18.1", - "tslib": "^2.3.1" + "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.2", + "mysql": "^2.18.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 8e7603fe43..d9a09e3f27 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -53,20 +53,19 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.13", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "mysql": "2.18.1", "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/semantic-conventions": "^1.0.0", - "@types/mysql": "2.15.19", - "tslib": "^2.3.1" + "@types/mysql": "2.15.21" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 86154e1199..423274ead7 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -56,19 +56,18 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "mocha": "7.2.0", - "mysql2": "2.3.0", + "mysql2": "2.3.3", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "semver": "7.5.4", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/sql-common": "^0.40.0", - "tslib": "^2.3.1" + "@opentelemetry/sql-common": "^0.40.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index a7ba86589e..7777b1b293 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -64,7 +64,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "reflect-metadata": "0.1.13", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "rxjs": "7.3.0", "rxjs-compat": "6.6.7", "semver": "7.5.4", @@ -73,9 +73,8 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 95f5029bba..82584add10 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -52,18 +52,17 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@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/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-net#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 6a429213f4..03caf54269 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -60,13 +60,13 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.16", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", "pg": "8.7.1", "pg-pool": "3.4.1", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "safe-stable-stringify": "^2.4.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", @@ -75,12 +75,11 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.40.0", "@types/pg": "8.6.1", - "@types/pg-pool": "2.0.3", - "tslib": "^2.3.1" + "@types/pg-pool": "2.0.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pg#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 7922eba5ee..fbca6c4d77 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -54,11 +54,11 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/semver": "7.5.0", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "pino": "8.3.1", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "semver": "7.5.4", "sinon": "15.0.1", "test-all-versions": "5.0.1", @@ -66,8 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index b30692e4e3..84e65f16da 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -63,16 +63,15 @@ "mocha": "7.2.0", "nyc": "15.1.0", "redis": "4.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/redis-common": "^0.36.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/plugins/node/opentelemetry-instrumentation-redis-4#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts index 4bf503e6c4..07628f2055 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts @@ -354,7 +354,7 @@ export class RedisInstrumentation extends InstrumentationBase { return function patchedConnect(this: any): Promise { const options = this.options; - const attributes = getClientAttributes(options); + const attributes = getClientAttributes(this._diag, options); const span = plugin.tracer.startSpan( `${RedisInstrumentation.COMPONENT}-connect`, @@ -405,7 +405,7 @@ export class RedisInstrumentation extends InstrumentationBase { const dbStatementSerializer = this._config?.dbStatementSerializer || defaultDbStatementSerializer; - const attributes = getClientAttributes(clientOptions); + const attributes = getClientAttributes(this._diag, clientOptions); try { const dbStatement = dbStatementSerializer(commandName, commandArgs); diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/src/utils.ts b/plugins/node/opentelemetry-instrumentation-redis-4/src/utils.ts index f102606474..336bf7f2b2 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-redis-4/src/utils.ts @@ -13,16 +13,45 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { DiagLogger } from '@opentelemetry/api'; import { DbSystemValues, SemanticAttributes, } from '@opentelemetry/semantic-conventions'; -export function getClientAttributes(options: any) { +export function getClientAttributes(diag: DiagLogger, options: any) { return { [SemanticAttributes.DB_SYSTEM]: DbSystemValues.REDIS, [SemanticAttributes.NET_PEER_NAME]: options?.socket?.host, [SemanticAttributes.NET_PEER_PORT]: options?.socket?.port, - [SemanticAttributes.DB_CONNECTION_STRING]: options?.url, + [SemanticAttributes.DB_CONNECTION_STRING]: + removeCredentialsFromDBConnectionStringAttribute(diag, options?.url), }; } + +/** + * removeCredentialsFromDBConnectionStringAttribute removes basic auth from url and user_pwd from query string + * + * Examples: + * redis://user:pass@localhost:6379/mydb => redis://localhost:6379/mydb + * redis://localhost:6379?db=mydb&user_pwd=pass => redis://localhost:6379?db=mydb + */ +function removeCredentialsFromDBConnectionStringAttribute( + diag: DiagLogger, + url?: unknown +): string | undefined { + if (typeof url !== 'string') { + return; + } + + try { + const u = new URL(url); + u.searchParams.delete('user_pwd'); + u.username = ''; + u.password = ''; + return u.href; + } catch (err) { + diag.error('failed to sanitize redis connection url', err); + } + return; +} diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts b/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts index 615572cf5a..ac5abf5bce 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts +++ b/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts @@ -220,8 +220,11 @@ describe('redis@^4.0.0', () => { }); it('sets error status on connection failure', async () => { + const redisURL = `redis://${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }`; const newClient = createClient({ - url: `redis://${redisTestConfig.host}:${redisTestConfig.port + 1}`, + url: redisURL, }); await assert.rejects(newClient.connect()); @@ -230,6 +233,64 @@ describe('redis@^4.0.0', () => { assert.strictEqual(span.name, 'redis-connect'); assert.strictEqual(span.status.code, SpanStatusCode.ERROR); + assert.strictEqual( + span.attributes[SemanticAttributes.DB_CONNECTION_STRING], + redisURL + ); + }); + + it('omits basic auth from DB_CONNECTION_STRING span attribute', async () => { + const redisURL = `redis://myuser:mypassword@${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }`; + const expectAttributeConnString = `redis://${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }`; + const newClient = createClient({ + url: redisURL, + }); + + await assert.rejects(newClient.connect()); + + const [span] = getTestSpans(); + + assert.strictEqual(span.name, 'redis-connect'); + assert.strictEqual(span.status.code, SpanStatusCode.ERROR); + assert.strictEqual( + span.attributes[SemanticAttributes.NET_PEER_NAME], + redisTestConfig.host + ); + assert.strictEqual( + span.attributes[SemanticAttributes.DB_CONNECTION_STRING], + expectAttributeConnString + ); + }); + + it('omits user_pwd query parameter from DB_CONNECTION_STRING span attribute', async () => { + const redisURL = `redis://${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }?db=mydb&user_pwd=mypassword`; + const expectAttributeConnString = `redis://${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }?db=mydb`; + const newClient = createClient({ + url: redisURL, + }); + + await assert.rejects(newClient.connect()); + + const [span] = getTestSpans(); + + assert.strictEqual(span.name, 'redis-connect'); + assert.strictEqual(span.status.code, SpanStatusCode.ERROR); + assert.strictEqual( + span.attributes[SemanticAttributes.NET_PEER_NAME], + redisTestConfig.host + ); + assert.strictEqual( + span.attributes[SemanticAttributes.DB_CONNECTION_STRING], + expectAttributeConnString + ); }); }); diff --git a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json index 8d76b3b85a..3d6c759807 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json @@ -34,15 +34,14 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-redis": "^0.32.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "axios": "^0.21.1", "express": "^4.17.1", - "redis": "^3.1.1", - "tslib": "^2.3.1" + "redis": "^3.1.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index a2317c4263..114097676d 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -63,17 +63,16 @@ "mocha": "7.2.0", "nyc": "15.1.0", "redis": "3.1.2", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "@types/redis": "2.8.31" + "@types/redis": "2.8.32" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/redis-common": "^0.36.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/plugins/node/opentelemetry-instrumentation-redis#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 0dec9903b1..10f36902ab 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -52,12 +52,12 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/restify": "4.3.8", - "@types/semver": "^7.3.12", + "@types/restify": "4.3.9", + "@types/semver": "7.5.0", "mocha": "7.2.0", "nyc": "15.1.0", "restify": "11.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "semver": "^7.3.7", "test-all-versions": "^5.0.1", "ts-mocha": "10.0.0", @@ -65,9 +65,8 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index c3c675865c..8b0a049242 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -53,15 +53,14 @@ "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", - "router": "1.3.5", + "rimraf": "5.0.1", + "router": "1.3.8", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-router#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 918675935f..713fd7c897 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -53,21 +53,20 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.16", "@types/triple-beam": "^1.3.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4", "winston": "3.3.3", - "winston2": "npm:winston@2.4.5" + "winston2": "npm:winston@2.4.7" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index b3a968ef77..3abf89be2a 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -50,11 +50,11 @@ "@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", @@ -62,11 +62,11 @@ "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", @@ -77,11 +77,10 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.15.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/plugins/web/opentelemetry-instrumentation-document-load#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 52ea080765..b78a6af9c6 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -47,13 +47,13 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@types/jquery": "3.5.6", + "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", "@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", @@ -62,11 +62,11 @@ "karma-coverage-istanbul-reporter": "3.0.3", "karma-jquery": "0.2.4", "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", @@ -78,9 +78,8 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/sdk-trace-web": "^1.8.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/sdk-trace-web": "^1.8.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 4cbf6a79a2..bae6996228 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -47,15 +47,15 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-zone-peer-dep": "^1.8.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.41.2", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@types/jquery": "3.5.6", + "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", "@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", @@ -64,11 +64,11 @@ "karma-coverage-istanbul-reporter": "3.0.3", "karma-jquery": "0.2.4", "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", @@ -80,9 +80,8 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/sdk-trace-web": "^1.8.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/sdk-trace-web": "^1.8.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 98c0ed07f4..da73ea9a22 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -47,16 +47,16 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.0.0", "@opentelemetry/propagator-b3": "^1.3.1", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/react": "17.0.16", + "@types/react": "17.0.64", "@types/react-addons-test-utils": "0.14.26", "@types/react-dom": "18.0.2", "@types/shimmer": "1.0.2", - "@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", @@ -64,13 +64,13 @@ "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", "react": "17.0.2", "react-dom": "17.0.2", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", @@ -89,8 +89,7 @@ "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.0.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "shimmer": "^1.2.1", - "tslib": "^2.3.1" + "shimmer": "^1.2.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-plugin-react-load#readme" } diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index f2fc438a14..7d4fe027cb 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -57,19 +57,18 @@ "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", "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/propagators/opentelemetry-propagator-aws-xray#readme" } diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 0a57f4232d..44e32383c0 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -51,13 +51,10 @@ "grpc": "1.24.11", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, - "dependencies": { - "tslib": "^2.3.1" - }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-grpc-census-binary#readme" } diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index c230506a5a..c4290cc404 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -59,7 +59,7 @@ "karma-chrome-launcher": "3.1.1", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.33", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", @@ -70,8 +70,5 @@ "webpack": "4.46.0", "webpack-cli": "4.9.2" }, - "dependencies": { - "tslib": "^2.3.1" - }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-instana#readme" } diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 9daf999359..a36c753cd0 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -58,7 +58,7 @@ "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", @@ -67,8 +67,5 @@ "typescript": "4.4.4", "webpack": "4.46.0" }, - "dependencies": { - "tslib": "^2.3.1" - }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace#readme" } diff --git a/renovate.json b/renovate.json index 6f9621a661..8d4c9f6f0d 100644 --- a/renovate.json +++ b/renovate.json @@ -8,7 +8,7 @@ "groupSlug": "all-patch", "matchUpdateTypes": ["patch"], "excludePackageNames": ["prettier"], - "schedule": ["before 3am every weekday"] + "schedule": ["before 3am on Monday"] }, { "matchUpdateTypes": ["minor"], diff --git a/tsconfig.base.json b/tsconfig.base.json index 1ee8ca34be..83c35af078 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -18,8 +18,7 @@ "strictNullChecks": true, "target": "es2017", "incremental": true, - "newLine": "LF", - "importHelpers": true + "newLine": "LF" }, "exclude": [ "node_modules"