From 7c97def7fec9c6339f5d64bd2887b8c3af2f5429 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 12 Apr 2022 12:40:53 +0200 Subject: [PATCH 1/4] chore(deps): update codecov/codecov-action action to v3 (#961) Co-authored-by: Rauno Viskus --- .github/workflows/unit-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 125b3f50df..9e88f92263 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -155,7 +155,7 @@ jobs: run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} - name: Report Coverage if: matrix.node == '14' - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: verbose: true @@ -201,6 +201,6 @@ jobs: - name: Unit tests run: npm run test:browser - name: Report Coverage - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: verbose: true From e99d6829604b90541e0bd33c426583565ac60167 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 12 Apr 2022 12:59:51 +0200 Subject: [PATCH 2/4] chore(deps): update actions/cache action to v3 (#955) Co-authored-by: Valentin Marchaud Co-authored-by: Rauno Viskus --- .github/workflows/release-please.yml | 2 +- .github/workflows/test-all-versions.yml | 2 +- .github/workflows/unit-test.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 9ac19a04f2..8a6b806f24 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -31,7 +31,7 @@ jobs: - name: Cache Dependencies if: ${{ steps.release.outputs.releases_created }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index d360f5cd94..e48b0a66e4 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -134,7 +134,7 @@ jobs: with: node-version: ${{ matrix.node }} - name: Cache Dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 9e88f92263..d3e4fbfd2a 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -126,7 +126,7 @@ jobs: with: node-version: ${{ matrix.node }} - name: Cache Dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -176,7 +176,7 @@ jobs: with: node-version: ${{ matrix.node }} - name: Cache Dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules From baaacbdd35ca4baab0afae64647aa8c0380ee4b7 Mon Sep 17 00:00:00 2001 From: Rauno Viskus Date: Thu, 14 Apr 2022 12:04:23 +0300 Subject: [PATCH 3/4] feat: add supported node versions for all packages (#973) --- .../opentelemetry-resource-detector-alibaba-cloud/package.json | 2 +- .../node/opentelemetry-resource-detector-aws/package.json | 2 +- .../node/opentelemetry-resource-detector-docker/package.json | 3 +++ .../node/opentelemetry-resource-detector-github/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 3 +++ metapackages/auto-instrumentations-web/package.json | 3 +++ .../opentelemetry-browser-extension-autoinjection/package.json | 3 +++ packages/opentelemetry-host-metrics/package.json | 2 +- packages/opentelemetry-id-generator-aws-xray/package.json | 2 +- packages/opentelemetry-propagation-utils/package.json | 3 +++ packages/opentelemetry-test-utils/package.json | 3 +++ plugins/node/instrumentation-amqplib/package.json | 2 +- plugins/node/instrumentation-fs/package.json | 2 +- plugins/node/instrumentation-tedious/package.json | 2 +- .../node/opentelemetry-instrumentation-aws-lambda/package.json | 2 +- .../node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- plugins/node/opentelemetry-instrumentation-bunyan/package.json | 2 +- .../node/opentelemetry-instrumentation-cassandra/package.json | 2 +- .../node/opentelemetry-instrumentation-connect/package.json | 2 +- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- .../node/opentelemetry-instrumentation-express/package.json | 2 +- .../node/opentelemetry-instrumentation-fastify/package.json | 2 +- .../opentelemetry-instrumentation-generic-pool/package.json | 2 +- .../node/opentelemetry-instrumentation-graphql/package.json | 2 +- plugins/node/opentelemetry-instrumentation-hapi/package.json | 2 +- .../node/opentelemetry-instrumentation-ioredis/package.json | 2 +- plugins/node/opentelemetry-instrumentation-knex/package.json | 2 +- plugins/node/opentelemetry-instrumentation-koa/package.json | 2 +- .../node/opentelemetry-instrumentation-memcached/package.json | 2 +- .../node/opentelemetry-instrumentation-mongodb/package.json | 2 +- plugins/node/opentelemetry-instrumentation-mysql/package.json | 2 +- plugins/node/opentelemetry-instrumentation-mysql2/package.json | 2 +- .../opentelemetry-instrumentation-nestjs-core/package.json | 2 +- plugins/node/opentelemetry-instrumentation-net/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pg/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pino/package.json | 2 +- plugins/node/opentelemetry-instrumentation-redis/package.json | 2 +- .../node/opentelemetry-instrumentation-restify/package.json | 2 +- plugins/node/opentelemetry-instrumentation-router/package.json | 2 +- .../node/opentelemetry-instrumentation-winston/package.json | 2 +- .../opentelemetry-instrumentation-document-load/package.json | 2 +- .../web/opentelemetry-instrumentation-long-task/package.json | 2 +- .../package.json | 2 +- plugins/web/opentelemetry-plugin-react-load/package.json | 2 +- propagators/opentelemetry-propagator-aws-xray/package.json | 2 +- .../opentelemetry-propagator-grpc-census-binary/package.json | 2 +- propagators/opentelemetry-propagator-ot-trace/package.json | 2 +- 47 files changed, 59 insertions(+), 41 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 6f6f058602..321ad5c266 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 6e1a2fd6ab..1e27946474 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -27,7 +27,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/detectors/node/opentelemetry-resource-detector-docker/package.json b/detectors/node/opentelemetry-resource-detector-docker/package.json index ba23367df6..10d658f9c0 100644 --- a/detectors/node/opentelemetry-resource-detector-docker/package.json +++ b/detectors/node/opentelemetry-resource-detector-docker/package.json @@ -21,6 +21,9 @@ }, "author": "OpenTelemetry Authors", "license": "Apache-2.0", + "engines": { + "node": ">=8.12.0" + }, "files": [ "build/src/**/*.js", "build/src/**/*.js.map", diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index e48d30527f..3555a9de7e 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index d63c481fbe..53e1f72755 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -5,6 +5,9 @@ "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "license": "Apache-2.0", + "engines": { + "node": ">=8.12.0" + }, "publishConfig": { "access": "public" }, diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index e105eb2343..4dcc57182f 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -5,6 +5,9 @@ "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "license": "Apache-2.0", + "engines": { + "node": ">=8.12.0" + }, "publishConfig": { "access": "public" }, diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json index 2f0d6854d8..9ac10f481d 100644 --- a/packages/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -22,6 +22,9 @@ "keywords": [], "author": "OpenTelemetry Authors", "license": "Apache-2.0", + "engines": { + "node": ">=8.12.0" + }, "peerDependencies": { "@opentelemetry/api": "^1.0.2" }, diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index c5cfe2e1c0..52d118bf7e 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -29,7 +29,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index bdadbc2008..7c1f66edb9 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -37,7 +37,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/esm/**/*.js", diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index f4c9a9652a..cd6ee25ee8 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -31,6 +31,9 @@ ], "author": "OpenTelemetry Authors", "license": "Apache-2.0", + "engines": { + "node": ">=8.12.0" + }, "bugs": { "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 12f27a01f9..a6cd71cd34 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -30,6 +30,9 @@ ], "author": "OpenTelemetry Authors", "license": "Apache-2.0", + "engines": { + "node": ">=8.12.0" + }, "bugs": { "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 4d8c069547..fb9d571bb2 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -72,4 +72,4 @@ "engines": { "node": ">=10.0.0" } -} \ No newline at end of file +} diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 06d31acf35..9e79a381ba 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 0c65f1de96..eaf9a23ac3 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -33,7 +33,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=10.0.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 73fee9c91e..dd57a99989 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index bcda7b91d4..25f527d712 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -77,6 +77,6 @@ "typescript": "4.3.4" }, "engines": { - "node": ">=12" + "node": ">=12.0.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 664fa36639..cb478417e6 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 4c5783693e..45be298d02 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -29,7 +29,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 7484135eba..7e13293843 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 17799ac8fe..a9009204e2 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 413f3baf17..a64d08acab 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 84658456de..79a3e282f8 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 478d886883..8cd0d84ddd 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 6b2ba3ba3e..8f13292579 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index a016f4ca77..34770f39aa 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 66bb133b02..706c864914 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -33,7 +33,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 3343a20f51..38a22342c5 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index afa172fdf8..105dceab10 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -31,7 +31,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 82187f2d22..4bed639705 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 4aaea71094..ab9572a8db 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -32,7 +32,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=12" + "node": ">=12.0.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index a9f64bbaca..f97ad62a88 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index db6a337bdf..c314b899b9 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index eea07261c0..88de5ec3e7 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -31,7 +31,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index be45fc640a..77b8d5f9f9 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -29,7 +29,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 5daa7d09ee..5bd4c7a235 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -36,7 +36,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 9026d8a809..7970bd5f58 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=12.0.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 4e4f3cd2ae..046b5f34b5 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -32,7 +32,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 083f9278f3..67cbaf2097 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 4272f4e5ae..d26bb046c5 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 57fe3f9dbe..6e7127dd4f 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 2f16d246ba..ea36555ed3 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/esm/**/*.js", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index a2cb3c202d..f4f1077aae 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/esm/**/*.js", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index cc81c413fc..97761f807d 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/esm/**/*.js", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index da5270a1c2..40848443bf 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/esm/**/*.js", diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index 06a8e66e62..4bfec9262d 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/esm/**/*.js", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index db91952f86..170416ffc9 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.12.0" }, "files": [ "build/src/**/*.js", diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index c01690e8e6..c2fdc5be45 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -30,7 +30,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.5.0" + "node": ">=8.12.0" }, "files": [ "build/esm/**/*.js", From b55b79b72451c65080e01c2ec11655cabd5f65d9 Mon Sep 17 00:00:00 2001 From: Nathan Walters Date: Fri, 15 Apr 2022 10:48:29 -0700 Subject: [PATCH 4/4] fix: correctly disable Express instrumentation (#972) Co-authored-by: Rauno Viskus --- .../src/instrumentation.ts | 7 ++-- .../test/express.test.ts | 32 +++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts index 37a1ea3763..8b7ed5d119 100644 --- a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts @@ -101,9 +101,10 @@ export class ExpressInstrumentation extends InstrumentationBase< (moduleExports, moduleVersion) => { if (moduleExports === undefined) return; diag.debug(`Removing patch for express@${moduleVersion}`); - this._unwrap(moduleExports.Router.prototype, 'route'); - this._unwrap(moduleExports.Router.prototype, 'use'); - this._unwrap(moduleExports.application.prototype, 'use'); + const routerProto = moduleExports.Router as unknown as express.Router; + this._unwrap(routerProto, 'route'); + this._unwrap(routerProto, 'use'); + this._unwrap(moduleExports.application, 'use'); } ), ]; diff --git a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts index cfbe225db5..04f2826f61 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts @@ -56,20 +56,12 @@ describe('ExpressInstrumentation', () => { describe('Instrumenting normal get operations', () => { it('should create a child span for middlewares', async () => { const rootSpan = tracer.startSpan('rootSpan'); - const app = express(); - app.use((req, res, next) => - context.with(trace.setSpan(context.active(), rootSpan), next) - ); - app.use(express.json()); const customMiddleware: express.RequestHandler = (req, res, next) => { for (let i = 0; i < 1000000; i++) { continue; } return next(); }; - app.use(customMiddleware); - const router = express.Router(); - app.use('/toto', router); let finishListenerCount: number | undefined; const { server, port } = await serverWithMiddleware( tracer, @@ -289,22 +281,30 @@ describe('ExpressInstrumentation', () => { describe('Disabling plugin', () => { it('should not create new spans', async () => { + instrumentation.disable(); const rootSpan = tracer.startSpan('rootSpan'); - const app = express(); - app.use(express.json()); - app.use((req, res, next) => { - for (let i = 0; i < 1000; i++) { - continue; + const { server, port } = await serverWithMiddleware( + tracer, + rootSpan, + app => { + app.use(express.json()); + const customMiddleware: express.RequestHandler = (req, res, next) => { + for (let i = 0; i < 1000; i++) { + continue; + } + return next(); + }; + app.use(customMiddleware); } - return next(); - }); - const { server, port } = await createServer(app); + ); assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); await context.with( trace.setSpan(context.active(), rootSpan), async () => { await httpRequest.get(`http://localhost:${port}/toto/tata`); rootSpan.end(); + // There should be exactly one span, and it should be the root span. + // There should not be any spans from the Express instrumentation. assert.deepEqual(memoryExporter.getFinishedSpans().length, 1); assert.notStrictEqual( memoryExporter.getFinishedSpans()[0],