From db50d0058f2444617192706f8b50c839c8b02be5 Mon Sep 17 00:00:00 2001 From: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Date: Wed, 2 Aug 2023 09:29:58 +0300 Subject: [PATCH 01/16] chore: update patch dependencies (#1595) * fix(deps): update all patch versions * fix(hapi): fix hapi test with new @types * fix(hapi): lint --------- Co-authored-by: Mend Renovate --- .github/workflows/unit-test.yml | 2 +- .../package.json | 6 +++--- .../node/opentelemetry-resource-detector-aws/package.json | 4 ++-- .../package.json | 4 ++-- .../node/opentelemetry-resource-detector-gcp/package.json | 2 +- .../opentelemetry-resource-detector-github/package.json | 4 ++-- .../opentelemetry-resource-detector-instana/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 4 ++-- metapackages/auto-instrumentations-web/package.json | 6 +++--- packages/opentelemetry-host-metrics/package.json | 4 ++-- packages/opentelemetry-id-generator-aws-xray/package.json | 6 +++--- packages/opentelemetry-sampler-aws-xray/package.json | 4 ++-- plugins/node/instrumentation-amqplib/package.json | 4 ++-- plugins/node/instrumentation-dataloader/package.json | 4 ++-- plugins/node/instrumentation-fs/package.json | 2 +- plugins/node/instrumentation-lru-memoizer/package.json | 2 +- plugins/node/instrumentation-mongoose/package.json | 2 +- plugins/node/instrumentation-socket.io/package.json | 2 +- plugins/node/instrumentation-tedious/package.json | 2 +- .../opentelemetry-instrumentation-aws-lambda/package.json | 4 ++-- .../opentelemetry-instrumentation-aws-sdk/package.json | 4 ++-- .../opentelemetry-instrumentation-bunyan/package.json | 6 +++--- .../opentelemetry-instrumentation-cassandra/package.json | 6 +++--- .../opentelemetry-instrumentation-connect/package.json | 2 +- .../node/opentelemetry-instrumentation-dns/package.json | 4 ++-- .../opentelemetry-instrumentation-express/package.json | 6 +++--- .../opentelemetry-instrumentation-fastify/package.json | 4 ++-- .../package.json | 2 +- .../opentelemetry-instrumentation-graphql/package.json | 2 +- .../node/opentelemetry-instrumentation-hapi/package.json | 4 ++-- .../src/instrumentation.ts | 3 ++- .../src/internal-types.ts | 2 +- .../opentelemetry-instrumentation-ioredis/package.json | 4 ++-- .../node/opentelemetry-instrumentation-knex/package.json | 4 ++-- .../node/opentelemetry-instrumentation-koa/package.json | 6 +++--- .../opentelemetry-instrumentation-memcached/package.json | 2 +- .../opentelemetry-instrumentation-mongodb/package.json | 2 +- .../node/opentelemetry-instrumentation-mysql/package.json | 6 +++--- .../opentelemetry-instrumentation-mysql2/package.json | 4 ++-- .../package.json | 2 +- .../node/opentelemetry-instrumentation-net/package.json | 4 ++-- .../node/opentelemetry-instrumentation-pg/package.json | 4 ++-- .../node/opentelemetry-instrumentation-pino/package.json | 4 ++-- .../opentelemetry-instrumentation-redis-4/package.json | 2 +- .../node/opentelemetry-instrumentation-redis/package.json | 4 ++-- .../opentelemetry-instrumentation-restify/package.json | 4 ++-- .../opentelemetry-instrumentation-router/package.json | 4 ++-- .../opentelemetry-instrumentation-winston/package.json | 6 +++--- .../package.json | 6 +++--- .../opentelemetry-instrumentation-long-task/package.json | 8 ++++---- .../package.json | 8 ++++---- plugins/web/opentelemetry-plugin-react-load/package.json | 8 ++++---- .../opentelemetry-propagator-aws-xray/package.json | 4 ++-- .../package.json | 2 +- propagators/opentelemetry-propagator-instana/package.json | 2 +- .../opentelemetry-propagator-ot-trace/package.json | 2 +- 56 files changed, 109 insertions(+), 108 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 9ffee4b82f..89bc0eb04e 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest services: memcached: - image: memcached:1.6.9-alpine + image: memcached:1.6.21-alpine ports: - 11211:11211 mongo: diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index c1de5ba6f5..38ec49da90 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.15", "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" diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 585bd9d51c..a1021951a7 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.15", "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" diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index 64f8d2291d..af04fbce2d 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.15", "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" diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index 86c3929f05..a24d9d20b2 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" }, diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 88721d1d9b..c8d4aca6ee 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -48,10 +48,10 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "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" diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index f2dd1daa44..640eaf264f 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -48,7 +48,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" }, diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 3902c6ee3e..2eca48794c 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -40,10 +40,10 @@ "@opentelemetry/api": "^1.4.1", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "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" diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index c6a2363374..96ad3d5ee3 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -37,7 +37,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@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", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index 6227213cba..d8ba6ba93d 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -49,10 +49,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.15", "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" diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index fc15bd07a9..68d6ab680a 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.15", "@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", diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 18d1eb0aa3..5717cc5776 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -55,7 +55,7 @@ "@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.15", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", @@ -64,7 +64,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/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 0a29b68f00..591dafdf37 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -55,9 +55,9 @@ "@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.195", "@types/mocha": "8.2.3", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/node": "18.16.19", "amqplib": "0.8.0", "expect": "29.2.0", diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 0f5e49a48f..450b9e1c7a 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -52,10 +52,10 @@ "@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" diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 4e34834a95..dadd93de32 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -52,7 +52,7 @@ "@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" diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index a42fba711f..58d275ecb4 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -51,7 +51,7 @@ "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" diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index a682c94425..f8a6da4e92 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -54,7 +54,7 @@ "mocha": "7.2.0", "mongoose": "6.5.2", "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" diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 0a4c0ec55e..257251b810 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", diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 57ce08963b..c283f6e165 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -55,7 +55,7 @@ "@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", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 10cdbd9753..8a0f54c753 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -54,7 +54,7 @@ "@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" }, @@ -63,7 +63,7 @@ "@opentelemetry/propagator-aws-xray": "^1.3.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/aws-lambda": "8.10.81", + "@types/aws-lambda": "8.10.119", "tslib": "^2.3.1" }, "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..0652d6e99c 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -64,14 +64,14 @@ "@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.15", "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", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 658dd76941..2b3ea4fd99 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -53,11 +53,11 @@ "@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.15", "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", @@ -65,7 +65,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@types/bunyan": "1.8.7", + "@types/bunyan": "1.8.8", "tslib": "^2.3.1" }, "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..9754f9beee 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/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", - "cassandra-driver": "4.6.3", + "@types/sinon": "10.0.15", + "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" diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index b08c529450..c73aad27e0 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -53,7 +53,7 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 0e8228626e..3dcf28fb24 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -53,10 +53,10 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "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" diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index ff0cd4e8e1..62e0a3ee34 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.15", "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", @@ -68,7 +68,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/express": "4.17.13", + "@types/express": "4.17.17", "tslib": "^2.3.1" }, "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/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 3cbd335d95..bbbcafa0d9 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -51,13 +51,13 @@ "@opentelemetry/instrumentation-http": "0.41.0", "@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" }, diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index f40e353527..7d59906169 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -55,7 +55,7 @@ "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" diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 0543a22c73..9ec53dd373 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -55,7 +55,7 @@ "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" diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 0dd7e3c5a1..1f6de1882f 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -54,7 +54,7 @@ "@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" }, @@ -62,7 +62,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/hapi__hapi": "20.0.9", + "@types/hapi__hapi": "20.0.13", "tslib": "^2.3.1" }, "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..0cea9985f8 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -56,13 +56,13 @@ "@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.15", "@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", diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 8a52ab28ed..4950347cec 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -54,8 +54,8 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 5b22e19f5f..bc7f3de3ae 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.15", "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", @@ -71,7 +71,7 @@ "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/koa": "2.13.6", - "@types/koa__router": "8.0.7", + "@types/koa__router": "8.0.11", "tslib": "^2.3.1" }, "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..76310c0511 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -58,7 +58,7 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index d7d96439eb..6a01a728d2 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -64,7 +64,7 @@ "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" diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 8e7603fe43..a451bc175b 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -53,11 +53,11 @@ "@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.15", "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" @@ -65,7 +65,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/mysql": "2.15.19", + "@types/mysql": "2.15.21", "tslib": "^2.3.1" }, "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..f4664e43f9 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -56,9 +56,9 @@ "@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", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index a7ba86589e..50a0681a4b 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", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 95f5029bba..8b291bb03b 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -52,10 +52,10 @@ "@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.15", "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" diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 6a429213f4..efc34eb037 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.15", "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", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 7922eba5ee..10f3802215 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.15", "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", diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index b30692e4e3..0eb238062c 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -63,7 +63,7 @@ "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" diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index a2317c4263..41c8c14c53 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -63,11 +63,11 @@ "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", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 0dec9903b1..ee28b9ea2c 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/restify": "4.3.9", "@types/semver": "^7.3.12", "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", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index c3c675865c..7eba205673 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -53,8 +53,8 @@ "@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" }, diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 918675935f..5b7dfd4284 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -53,17 +53,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.15", "@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", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index b3a968ef77..76bdda8872 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -54,7 +54,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@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", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 52ea080765..a5e6f8d8ff 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -50,10 +50,10 @@ "@babel/core": "7.15.0", "@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.15", "@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", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 4cbf6a79a2..a4cd971a1f 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -52,10 +52,10 @@ "@opentelemetry/context-zone-peer-dep": "^1.8.0", "@opentelemetry/instrumentation-xml-http-request": "^0.41.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.15", "@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", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 98c0ed07f4..cedd4252d2 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -52,11 +52,11 @@ "@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.62", "@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.15", "@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", diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index f2fc438a14..d6945e6d3c 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -57,11 +57,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", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 0a57f4232d..88f07eeff6 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -51,7 +51,7 @@ "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" diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index c230506a5a..b620fac54a 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", diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 9daf999359..91d77e37ab 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", From a53f6438d616a6e07b35ff98d063e520adfda5d0 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Wed, 2 Aug 2023 15:38:11 +0700 Subject: [PATCH 02/16] chore: bump typescripts to 4.4.4 to fix compile issue with @types/koa (#1616) Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 01015203cd..da30bb803d 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -63,7 +63,7 @@ "sinon": "14.0.0", "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", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 0652d6e99c..14c2769c8a 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -75,7 +75,7 @@ "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" From 3d6c7beffd7c1cc0ef99c7560bc21e01db28b431 Mon Sep 17 00:00:00 2001 From: Honsemiro Date: Wed, 2 Aug 2023 18:28:19 +0900 Subject: [PATCH 03/16] fix(fastify): readme option table format (#1619) Co-authored-by: Mend Renovate Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Co-authored-by: Amir Blum --- plugins/node/opentelemetry-instrumentation-fastify/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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` From 2a0d54365a9d86c14986713a28a0b02a64434da5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 2 Aug 2023 13:04:10 +0200 Subject: [PATCH 04/16] chore(deps): update dependency rimraf to v5 (#1608) Co-authored-by: Amir Blum --- plugins/node/instrumentation-cucumber/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index da30bb803d..1539e0fcf8 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -58,7 +58,7 @@ "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "3.0.2", + "rimraf": "5.0.1", "semver": "^7.3.2", "sinon": "14.0.0", "test-all-versions": "5.0.1", From 4dc98d374505da523cd4aa77833c043311fb742d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 2 Aug 2023 14:33:40 +0200 Subject: [PATCH 05/16] chore(deps): update dependency mongoose to v6.11.3 [security] (#1601) Co-authored-by: Amir Blum --- plugins/node/instrumentation-mongoose/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index f8a6da4e92..b649440c37 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -52,7 +52,7 @@ "@types/node": "18.16.19", "expect": "29.2.0", "mocha": "7.2.0", - "mongoose": "6.5.2", + "mongoose": "6.11.3", "nyc": "15.1.0", "rimraf": "5.0.1", "test-all-versions": "5.0.1", From e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Wed, 2 Aug 2023 10:18:20 -0400 Subject: [PATCH 06/16] fix: Revert "feat(minification): Add importHelpers and tslib as a dependency (#1545)" (#1611) Co-authored-by: Marc Pichler --- .../opentelemetry-browser-extension-autoinjection/package.json | 3 +-- .../opentelemetry-resource-detector-alibaba-cloud/package.json | 3 +-- .../node/opentelemetry-resource-detector-aws/package.json | 3 +-- .../opentelemetry-resource-detector-container/package.json | 3 +-- .../node/opentelemetry-resource-detector-gcp/package.json | 3 +-- .../node/opentelemetry-resource-detector-github/package.json | 3 +-- .../node/opentelemetry-resource-detector-instana/package.json | 3 +-- metapackages/auto-instrumentations-node/package.json | 3 +-- metapackages/auto-instrumentations-web/package.json | 3 +-- package.json | 3 +-- packages/opentelemetry-host-metrics/package.json | 3 +-- packages/opentelemetry-id-generator-aws-xray/package.json | 3 +-- packages/opentelemetry-propagation-utils/package.json | 3 --- packages/opentelemetry-redis-common/package.json | 3 --- packages/opentelemetry-sampler-aws-xray/package.json | 3 +-- packages/opentelemetry-test-utils/package.json | 3 +-- plugins/node/instrumentation-amqplib/package.json | 3 +-- plugins/node/instrumentation-dataloader/package.json | 3 +-- plugins/node/instrumentation-fs/package.json | 3 +-- plugins/node/instrumentation-lru-memoizer/package.json | 3 +-- plugins/node/instrumentation-mongoose/package.json | 3 +-- plugins/node/instrumentation-socket.io/package.json | 3 +-- plugins/node/instrumentation-tedious/package.json | 3 +-- .../node/opentelemetry-instrumentation-aws-lambda/package.json | 3 +-- .../node/opentelemetry-instrumentation-aws-sdk/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-bunyan/package.json | 3 +-- .../node/opentelemetry-instrumentation-cassandra/package.json | 3 +-- .../node/opentelemetry-instrumentation-connect/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-dns/package.json | 3 +-- .../examples/package.json | 3 +-- .../node/opentelemetry-instrumentation-express/package.json | 3 +-- .../node/opentelemetry-instrumentation-fastify/package.json | 3 +-- .../opentelemetry-instrumentation-generic-pool/package.json | 3 +-- .../node/opentelemetry-instrumentation-graphql/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-hapi/package.json | 3 +-- .../node/opentelemetry-instrumentation-ioredis/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-knex/package.json | 3 +-- .../opentelemetry-instrumentation-koa/examples/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-koa/package.json | 3 +-- .../node/opentelemetry-instrumentation-memcached/package.json | 3 +-- .../examples/package.json | 3 +-- .../node/opentelemetry-instrumentation-mongodb/package.json | 3 +-- .../opentelemetry-instrumentation-mysql/examples/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-mysql/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-mysql2/package.json | 3 +-- .../opentelemetry-instrumentation-nestjs-core/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-net/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-pg/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-pino/package.json | 3 +-- .../node/opentelemetry-instrumentation-redis-4/package.json | 3 +-- .../opentelemetry-instrumentation-redis/examples/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-redis/package.json | 3 +-- .../node/opentelemetry-instrumentation-restify/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-router/package.json | 3 +-- .../node/opentelemetry-instrumentation-winston/package.json | 3 +-- .../opentelemetry-instrumentation-document-load/package.json | 3 +-- .../web/opentelemetry-instrumentation-long-task/package.json | 3 +-- .../package.json | 3 +-- plugins/web/opentelemetry-plugin-react-load/package.json | 3 +-- propagators/opentelemetry-propagator-aws-xray/package.json | 3 +-- .../opentelemetry-propagator-grpc-census-binary/package.json | 3 --- propagators/opentelemetry-propagator-instana/package.json | 3 --- propagators/opentelemetry-propagator-ot-trace/package.json | 3 --- tsconfig.base.json | 3 +-- 64 files changed, 59 insertions(+), 133 deletions(-) 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 38ec49da90..60adc9a009 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -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 a1021951a7..db7a5c49f2 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -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 af04fbce2d..b9fbf41058 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -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 a24d9d20b2..7d53bacca0 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -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 c8d4aca6ee..cb74595f39 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -57,8 +57,7 @@ "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 640eaf264f..b1918ed6f4 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -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" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 2eca48794c..a16e01b5b2 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -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.0" } } diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 96ad3d5ee3..c0f086b10b 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -63,7 +63,6 @@ "@opentelemetry/instrumentation-document-load": "^0.33.0", "@opentelemetry/instrumentation-fetch": "^0.41.0", "@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.0" } } diff --git a/package.json b/package.json index 4cb48e1ea4..24049e1ff7 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,7 @@ "lerna": "5.5.2", "lerna-changelog": "2.2.0", "prettier": "2.8.7", - "typescript": "4.4.4", - "tslib": "^2.3.1" + "typescript": "4.4.4" }, "changelog": { "labels": { diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index d8ba6ba93d..b5e85ace85 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -59,8 +59,7 @@ }, "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 68d6ab680a..bb895a2aad 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -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 5717cc5776..3855ff61d1 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -47,8 +47,7 @@ "@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", diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 4d5fb5de3a..b8e3e3479e 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -52,7 +52,6 @@ "@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 591dafdf37..ed4e47f142 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -48,8 +48,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 450b9e1c7a..ab90424d92 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -61,8 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "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 dadd93de32..92edeb1c0d 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -60,8 +60,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.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/instrumentation-fs#readme" } diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 58d275ecb4..506350a388 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -57,8 +57,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "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 b649440c37..c8bb283c10 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -62,8 +62,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.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/instrumentation-mongoose#readme" } diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 257251b810..eb26da2b1f 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -59,8 +59,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.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/instrumentation-socket.io#readme" } diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index c283f6e165..59f37c9fd9 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -64,8 +64,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@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 8a0f54c753..525f0faab9 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -63,8 +63,7 @@ "@opentelemetry/propagator-aws-xray": "^1.3.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/aws-lambda": "8.10.119", - "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 14c2769c8a..aaac2459fb 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -49,8 +49,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@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", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 2b3ea4fd99..c840464dd7 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -65,8 +65,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@types/bunyan": "1.8.8", - "tslib": "^2.3.1" + "@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 9754f9beee..67bbdc4904 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -65,8 +65,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.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-cassandra#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index c73aad27e0..6eca188dd5 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -61,8 +61,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@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 3dcf28fb24..1a295836c4 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -64,8 +64,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@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..710ad522c8 100644 --- a/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -41,8 +41,7 @@ "@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 62e0a3ee34..81ee1eb314 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -68,8 +68,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/express": "4.17.17", - "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/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index bbbcafa0d9..c3950496be 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -64,8 +64,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.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-fastify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 7d59906169..f716d2ba0f 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -63,8 +63,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@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 9ec53dd373..8c8eb4d1ca 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -61,8 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "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 1f6de1882f..0dec59a585 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -62,8 +62,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/hapi__hapi": "20.0.13", - "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-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 0cea9985f8..f91d322150 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -72,8 +72,7 @@ "@opentelemetry/instrumentation": "^0.41.0", "@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 4950347cec..1983536b1f 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -61,8 +61,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.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-knex#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json index 6a23e6fe76..9875722081 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json @@ -40,8 +40,7 @@ "@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 bc7f3de3ae..0ab0d00929 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -71,8 +71,7 @@ "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/koa": "2.13.6", - "@types/koa__router": "8.0.11", - "tslib": "^2.3.1" + "@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 76310c0511..47d0761155 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -65,8 +65,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@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..3ee2b0c022 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json @@ -38,8 +38,7 @@ "@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 6a01a728d2..a1c123792c 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -72,8 +72,7 @@ "dependencies": { "@opentelemetry/sdk-metrics": "^1.9.1", "@opentelemetry/instrumentation": "^0.41.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-mongodb#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json index 2adaa420ae..36a9339882 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json @@ -40,8 +40,7 @@ "@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" + "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 a451bc175b..7e0dd110a1 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -65,8 +65,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/mysql": "2.15.21", - "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 f4664e43f9..e2db066922 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -67,8 +67,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@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 50a0681a4b..548ecc4d28 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -74,8 +74,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.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-nestjs-core#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 8b291bb03b..343edf2bc4 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -62,8 +62,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.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-net#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index efc34eb037..215d11813f 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -79,8 +79,7 @@ "@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 10f3802215..7bfab71a21 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -66,8 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "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 0eb238062c..b9155f4252 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -71,8 +71,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@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/examples/package.json b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json index 8d76b3b85a..3162130ecf 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json @@ -41,8 +41,7 @@ "@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 41c8c14c53..e90fca4e8e 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -72,8 +72,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@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 ee28b9ea2c..56e5297953 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -66,8 +66,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.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-restify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 7eba205673..b3b12ed911 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -60,8 +60,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.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-router#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 5b7dfd4284..fe6d76b6f6 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -66,8 +66,7 @@ "winston2": "npm:winston@2.4.7" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "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 76bdda8872..698334f942 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -80,8 +80,7 @@ "@opentelemetry/instrumentation": "^0.41.0", "@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 a5e6f8d8ff..3d31085724 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -79,8 +79,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/sdk-trace-web": "^1.8.0", - "tslib": "^2.3.1" + "@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 a4cd971a1f..a1224f352c 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -81,8 +81,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/sdk-trace-web": "^1.8.0", - "tslib": "^2.3.1" + "@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 cedd4252d2..112433c1fc 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -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 d6945e6d3c..7d4fe027cb 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -68,8 +68,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/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 88f07eeff6..44e32383c0 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -56,8 +56,5 @@ "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 b620fac54a..c4290cc404 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -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 91d77e37ab..a36c753cd0 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -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/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" From 5d204b4945eea8f9033a22bb77885580f63ce38b Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Thu, 3 Aug 2023 09:01:58 +0300 Subject: [PATCH 07/16] chore(deps): update dependency @types/semver to v7.5.0 (#1621) --- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/opentelemetry-instrumentation-restify/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 1539e0fcf8..8aad67862e 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -52,7 +52,7 @@ "@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", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 56e5297953..42b62378b2 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -53,7 +53,7 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/restify": "4.3.9", - "@types/semver": "^7.3.12", + "@types/semver": "7.5.0", "mocha": "7.2.0", "nyc": "15.1.0", "restify": "11.1.0", From e242645269940c97f6418d1375a3dab07c032a93 Mon Sep 17 00:00:00 2001 From: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Date: Thu, 3 Aug 2023 12:00:43 +0300 Subject: [PATCH 08/16] fix(renovate): change renovate patch schedule (#1603) --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"], From 154b30bc98ff0b848348faa18197eb7f11dcbdc4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 6 Aug 2023 11:29:09 +0200 Subject: [PATCH 09/16] chore(deps): update dependency prettier to v2.8.8 (#1622) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 24049e1ff7..ad0e87338c 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "husky": "7.0.4", "lerna": "5.5.2", "lerna-changelog": "2.2.0", - "prettier": "2.8.7", + "prettier": "2.8.8", "typescript": "4.4.4" }, "changelog": { From a1243eec445758d557bcb9add7f773810d7269a8 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 10 Aug 2023 15:41:47 +0700 Subject: [PATCH 10/16] chore: fix issue with nyc crashing (#1605) * chore: fix issue with nyc crashing * chore: revert hoist change, make @babel/core nohoist * chore: update @babel/core to test Garbage Collector issue * chore: bump typescripts to 4.4.4 in some package * Revert "chore: bump typescripts to 4.4.4 in some package" This reverts commit 5bf1bfbe433bf614787c0ccca79a40aa644c86b3. * Revert "Revert "chore: bump typescripts to 4.4.4 in some package"" This reverts commit 2877b7e500b629216a66f4b9300e82e3d452ab4f. * Fix cancelled issue --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .github/workflows/unit-test.yml | 11 +++++++++-- metapackages/auto-instrumentations-web/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../web/opentelemetry-plugin-react-load/package.json | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 89bc0eb04e..654d7a95fa 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -10,6 +10,9 @@ jobs: fail-fast: false matrix: node: ["14", "16", "18"] + include: + - node: 14 + code-coverage: true runs-on: ubuntu-latest services: memcached: @@ -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/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index c0f086b10b..6477d3bec5 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -33,7 +33,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 698334f942..82b2ac90e8 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -50,7 +50,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 3d31085724..5e0bfedb55 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.16", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index a1224f352c..7ee6154e39 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-zone-peer-dep": "^1.8.0", "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 112433c1fc..fce5e9d25b 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.0.0", "@opentelemetry/propagator-b3": "^1.3.1", "@types/mocha": "7.0.2", From e3d7f60562f49742831a9eed1e99aa58713f87e8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 10 Aug 2023 11:26:50 +0200 Subject: [PATCH 11/16] chore(deps): update all patch versions (#1604) --- .../package.json | 2 +- .../node/opentelemetry-resource-detector-aws/package.json | 2 +- .../opentelemetry-resource-detector-container/package.json | 2 +- .../opentelemetry-resource-detector-github/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 2 +- metapackages/auto-instrumentations-web/package.json | 4 ++-- packages/opentelemetry-host-metrics/package.json | 2 +- packages/opentelemetry-id-generator-aws-xray/package.json | 2 +- packages/opentelemetry-sampler-aws-xray/package.json | 2 +- plugins/node/instrumentation-amqplib/package.json | 4 ++-- plugins/node/instrumentation-cucumber/package.json | 6 +++--- plugins/node/instrumentation-mongoose/package.json | 2 +- .../node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- .../node/opentelemetry-instrumentation-bunyan/package.json | 2 +- .../opentelemetry-instrumentation-cassandra/package.json | 2 +- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- .../node/opentelemetry-instrumentation-express/package.json | 2 +- .../node/opentelemetry-instrumentation-ioredis/package.json | 2 +- plugins/node/opentelemetry-instrumentation-koa/package.json | 4 ++-- .../node/opentelemetry-instrumentation-mysql/package.json | 2 +- plugins/node/opentelemetry-instrumentation-net/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pg/package.json | 2 +- .../node/opentelemetry-instrumentation-pino/package.json | 2 +- .../node/opentelemetry-instrumentation-winston/package.json | 2 +- .../package.json | 4 ++-- .../opentelemetry-instrumentation-long-task/package.json | 4 ++-- .../package.json | 4 ++-- plugins/web/opentelemetry-plugin-react-load/package.json | 6 +++--- 28 files changed, 38 insertions(+), 38 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 60adc9a009..e6bd34924f 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -46,7 +46,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index db7a5c49f2..c1e52afb93 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -45,7 +45,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index b9fbf41058..19c95d285d 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -39,7 +39,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "^18.0.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "eslint-plugin-header": "^3.1.1", "mocha": "7.2.0", "nock": "13.3.2", diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index cb74595f39..36af2ffce2 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -48,7 +48,7 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index a16e01b5b2..56d43288f5 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -40,7 +40,7 @@ "@opentelemetry/api": "^1.4.1", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 6477d3bec5..e5cc476e7e 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.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index b5e85ace85..cbfaaf787d 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -49,7 +49,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index bb895a2aad..71cd335ae1 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -57,7 +57,7 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "karma": "6.3.16", diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 3855ff61d1..afb90e1707 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -54,7 +54,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index ed4e47f142..9f6a80634d 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -54,9 +54,9 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/amqplib": "^0.5.17", - "@types/lodash": "4.14.195", + "@types/lodash": "4.14.197", "@types/mocha": "8.2.3", - "@types/sinon": "10.0.15", + "@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 8aad67862e..289c073ea9 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -54,13 +54,13 @@ "@types/mocha": "7.0.2", "@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": "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.4.4" diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index c8bb283c10..71cda93208 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -52,7 +52,7 @@ "@types/node": "18.16.19", "expect": "29.2.0", "mocha": "7.2.0", - "mongoose": "6.11.3", + "mongoose": "6.11.5", "nyc": "15.1.0", "rimraf": "5.0.1", "test-all-versions": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index aaac2459fb..38837b7987 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -63,7 +63,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "aws-sdk": "2.1008.0", "eslint": "8.7.0", "expect": "29.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index c840464dd7..9979f86f61 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "bunyan": "1.8.15", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 67bbdc4904..306215305c 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -54,7 +54,7 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "cassandra-driver": "4.6.4", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 1a295836c4..14d1a37647 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -53,7 +53,7 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 81ee1eb314..b4924b0984 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -54,7 +54,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "express": "4.17.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index f91d322150..f60baa4ace 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -56,7 +56,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/node": "18.16.19", "cross-env": "7.0.3", "ioredis": "5.2.2", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 0ab0d00929..8084874db8 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -56,7 +56,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "koa": "2.13.1", "mocha": "7.2.0", "nyc": "15.1.0", @@ -70,7 +70,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/koa": "2.13.6", + "@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-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 7e0dd110a1..52e61596d5 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "mysql": "2.18.1", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 343edf2bc4..8272e92008 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -52,7 +52,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 215d11813f..797ffc4633 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -60,7 +60,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 7bfab71a21..3b8d1a76e4 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -54,7 +54,7 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "pino": "8.3.1", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index fe6d76b6f6..afd7294be3 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/triple-beam": "^1.3.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 82b2ac90e8..e32e1c4f54 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.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 5e0bfedb55..7d0a82ebf0 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.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 7ee6154e39..3528e3619a 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@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", @@ -55,7 +55,7 @@ "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index fce5e9d25b..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.22.9", + "@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.62", + "@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.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", From 3f2bfe8ed6feada3f1acc23677862501e8c06304 Mon Sep 17 00:00:00 2001 From: Carol Abadeer <60774943+carolabadeer@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:41:54 -0700 Subject: [PATCH 12/16] fix(aws-sdk-instrumentation): Patch new smithy client and middleware packages (#1626) Co-authored-by: Amir Blum --- .../src/aws-sdk.ts | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) 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) { From f4df836a279bd7512ecfeacc25db162e613a0e7e Mon Sep 17 00:00:00 2001 From: Jose Ignacio Gil Jaldo Date: Thu, 10 Aug 2023 13:19:02 +0200 Subject: [PATCH 13/16] fix(knex): nested queries result in wrong span names (#1537) * fix(knex): nested queries result in wrong span names. * Cleanup assertions. --------- Co-authored-by: Marc Pichler Co-authored-by: Amir Blum --- .../src/instrumentation.ts | 2 +- .../src/utils.ts | 8 + .../test/index.test.ts | 241 ++++++++++++++++++ 3 files changed, 250 insertions(+), 1 deletion(-) 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', () => { From ccf1efe0cf8f144ab0d0aab490dfff499bd3158e Mon Sep 17 00:00:00 2001 From: Jarle Fosen Date: Thu, 10 Aug 2023 14:09:27 +0200 Subject: [PATCH 14/16] fix(redis-4): omit credentials from db.connection_string span attribute (#1562) * fix(redis-4): omit credentials from db.connection_string span attribute * Reconstruct non-sensitive db.connection_string using built-in URL.href * style(redis-4): Fix code style according to community standards * fix(redis-4): Log error on connection string sanitization failure --------- Co-authored-by: Amir Blum Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .../src/instrumentation.ts | 4 +- .../src/utils.ts | 33 +++++++++- .../test/redis.test.ts | 63 ++++++++++++++++++- 3 files changed, 95 insertions(+), 5 deletions(-) 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 + ); }); }); From 4f1124524aee565c3cfbf3975aa5d3d039377621 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 10 Aug 2023 14:57:58 +0200 Subject: [PATCH 15/16] fix(deps): update otel core experimental to v0.41.2 (#1628) --- .../opentelemetry-resource-detector-instana/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 8 ++++---- metapackages/auto-instrumentations-web/package.json | 6 +++--- packages/opentelemetry-test-utils/package.json | 2 +- plugins/node/instrumentation-amqplib/package.json | 2 +- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/instrumentation-dataloader/package.json | 2 +- plugins/node/instrumentation-fs/package.json | 2 +- plugins/node/instrumentation-lru-memoizer/package.json | 2 +- plugins/node/instrumentation-mongoose/package.json | 2 +- plugins/node/instrumentation-socket.io/package.json | 2 +- plugins/node/instrumentation-tedious/package.json | 2 +- .../opentelemetry-instrumentation-aws-lambda/package.json | 2 +- .../opentelemetry-instrumentation-aws-sdk/package.json | 2 +- .../opentelemetry-instrumentation-bunyan/package.json | 2 +- .../opentelemetry-instrumentation-cassandra/package.json | 2 +- .../opentelemetry-instrumentation-connect/package.json | 2 +- .../node/opentelemetry-instrumentation-dns/package.json | 2 +- .../examples/package.json | 4 ++-- .../opentelemetry-instrumentation-express/package.json | 2 +- .../opentelemetry-instrumentation-fastify/package.json | 4 ++-- .../package.json | 2 +- .../opentelemetry-instrumentation-graphql/package.json | 2 +- .../node/opentelemetry-instrumentation-hapi/package.json | 2 +- .../opentelemetry-instrumentation-ioredis/package.json | 2 +- .../node/opentelemetry-instrumentation-knex/package.json | 2 +- .../examples/package.json | 4 ++-- .../node/opentelemetry-instrumentation-koa/package.json | 2 +- .../opentelemetry-instrumentation-memcached/package.json | 2 +- .../examples/package.json | 4 ++-- .../opentelemetry-instrumentation-mongodb/package.json | 2 +- .../examples/package.json | 6 +++--- .../node/opentelemetry-instrumentation-mysql/package.json | 2 +- .../opentelemetry-instrumentation-mysql2/package.json | 2 +- .../package.json | 2 +- .../node/opentelemetry-instrumentation-net/package.json | 2 +- .../node/opentelemetry-instrumentation-pg/package.json | 2 +- .../node/opentelemetry-instrumentation-pino/package.json | 2 +- .../opentelemetry-instrumentation-redis-4/package.json | 2 +- .../examples/package.json | 4 ++-- .../node/opentelemetry-instrumentation-redis/package.json | 2 +- .../opentelemetry-instrumentation-restify/package.json | 2 +- .../opentelemetry-instrumentation-router/package.json | 2 +- .../opentelemetry-instrumentation-winston/package.json | 2 +- .../package.json | 2 +- .../opentelemetry-instrumentation-long-task/package.json | 2 +- .../package.json | 4 ++-- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index b1918ed6f4..35fb4e0cdc 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -41,7 +41,7 @@ "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", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 56d43288f5..4b82be75b6 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -49,7 +49,7 @@ "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,6 +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" + "@opentelemetry/sdk-node": "^0.41.2" } } diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index e5cc476e7e..79836489d3 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -59,10 +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" + "@opentelemetry/instrumentation-xml-http-request": "^0.41.2" } } diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index b8e3e3479e..3995735c51 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -48,7 +48,7 @@ "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", diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 9f6a80634d..3505cbb613 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "devDependencies": { diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 289c073ea9..d23c06e907 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -66,7 +66,7 @@ "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 ab90424d92..590b3886fa 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@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 92edeb1c0d..4361e87fec 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -59,7 +59,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.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-fs#readme" diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 506350a388..ceccfb35ea 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -57,7 +57,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@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 71cda93208..5f320f246f 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -61,7 +61,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.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-mongoose#readme" diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index eb26da2b1f..1e64ffb84a 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -58,7 +58,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.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-socket.io#readme" diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 59f37c9fd9..b9c4219a8c 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -62,7 +62,7 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 525f0faab9..415d231a3f 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -59,7 +59,7 @@ "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", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 38837b7987..7a382575e5 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -47,7 +47,7 @@ }, "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 9979f86f61..70f8d8e6a0 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -64,7 +64,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@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 306215305c..82b5e743b1 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -64,7 +64,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.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/opentelemetry-instrumentation-cassandra#readme" diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 6eca188dd5..81adf97d4d 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -59,7 +59,7 @@ }, "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 14d1a37647..0f6f627514 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -62,7 +62,7 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json index 710ad522c8..c829a5ac71 100644 --- a/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -32,9 +32,9 @@ "@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", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index b4924b0984..77de1e3131 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -66,7 +66,7 @@ }, "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.17" }, diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index c3950496be..65c8c2cc8c 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -48,7 +48,7 @@ "@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.17", @@ -63,7 +63,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.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/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 f716d2ba0f..f892564893 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -61,7 +61,7 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 8c8eb4d1ca..7f76139977 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@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 0dec59a585..464fca8502 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -60,7 +60,7 @@ }, "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.13" }, diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index f60baa4ace..d5232bd687 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -69,7 +69,7 @@ "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" diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 1983536b1f..687e6f4ef4 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -60,7 +60,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.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/opentelemetry-instrumentation-knex#readme" diff --git a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json index 9875722081..4c21e26897 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json @@ -34,8 +34,8 @@ "@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", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 8084874db8..7332fa4c26 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -68,7 +68,7 @@ }, "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.8", "@types/koa__router": "8.0.11" diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 47d0761155..2454c18ce2 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -63,7 +63,7 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json index 3ee2b0c022..3b4f670047 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json @@ -33,8 +33,8 @@ "@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", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index a1c123792c..241426f8fa 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -71,7 +71,7 @@ }, "dependencies": { "@opentelemetry/sdk-metrics": "^1.9.1", - "@opentelemetry/instrumentation": "^0.41.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/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 36a9339882..698bd86aa5 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json @@ -34,12 +34,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-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", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.2", "mysql": "^2.18.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 52e61596d5..d9a09e3f27 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -63,7 +63,7 @@ "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.21" }, diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index e2db066922..423274ead7 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -65,7 +65,7 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 548ecc4d28..7777b1b293 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -73,7 +73,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.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/opentelemetry-instrumentation-nestjs-core#readme" diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 8272e92008..82584add10 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.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/opentelemetry-instrumentation-net#readme" diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 797ffc4633..03caf54269 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -75,7 +75,7 @@ }, "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", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 3b8d1a76e4..fbca6c4d77 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -66,7 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@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 b9155f4252..84e65f16da 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -69,7 +69,7 @@ "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" }, diff --git a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json index 3162130ecf..3d6c759807 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json @@ -34,8 +34,8 @@ "@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", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index e90fca4e8e..114097676d 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -70,7 +70,7 @@ "@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" }, diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 42b62378b2..10f36902ab 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -65,7 +65,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.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/opentelemetry-instrumentation-restify#readme" diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index b3b12ed911..8b0a049242 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -59,7 +59,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.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/opentelemetry-instrumentation-router#readme" diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index afd7294be3..713fd7c897 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -66,7 +66,7 @@ "winston2": "npm:winston@2.4.7" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@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 e32e1c4f54..3abf89be2a 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -77,7 +77,7 @@ }, "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" diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 7d0a82ebf0..b78a6af9c6 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -78,7 +78,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/sdk-trace-web": "^1.8.0" }, "peerDependencies": { diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 3528e3619a..bae6996228 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -50,7 +50,7 @@ "@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.16", "@types/mocha": "7.0.2", @@ -80,7 +80,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/sdk-trace-web": "^1.8.0" }, "peerDependencies": { From 8802eae92d70825d4e8fea526e657ce5f16f8502 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 11 Aug 2023 07:45:21 +0200 Subject: [PATCH 16/16] chore(deps): update dependency @cucumber/cucumber to v9 (#1623) --- plugins/node/instrumentation-cucumber/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index d23c06e907..34378b3ba1 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -46,7 +46,7 @@ "@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",