From 2dbdb21f26799f92ba5fee6d0281aba5e71e0235 Mon Sep 17 00:00:00 2001 From: Matteo Gazziola <15204191+matteoga@users.noreply.github.com> Date: Sun, 6 Feb 2022 12:28:14 +0100 Subject: [PATCH 1/2] test(express-instrumentation): add test-all-versions (#811) --- plugins/node/opentelemetry-instrumentation-express/.tav.yml | 3 +++ .../node/opentelemetry-instrumentation-express/package.json | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 plugins/node/opentelemetry-instrumentation-express/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-express/.tav.yml b/plugins/node/opentelemetry-instrumentation-express/.tav.yml new file mode 100644 index 0000000000..241e7dcc4b --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-express/.tav.yml @@ -0,0 +1,3 @@ +express: + - versions: "^4.16.2" + commands: npm run test diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 774a1112d5..54457544a0 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -6,6 +6,7 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { + "test-all-versions": "tav", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "tdd": "yarn test -- --watch-extensions ts --watch", @@ -59,6 +60,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", + "test-all-versions": "^5.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, From fa6b3d45fe6fe27b87913d152c0d32d1f6f4df6e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Feb 2022 08:01:13 +0100 Subject: [PATCH 2/2] chore(deps): update dependency sinon to v13 (#867) --- .../opentelemetry-resource-detector-alibaba-cloud/package.json | 2 +- detectors/node/opentelemetry-resource-detector-aws/package.json | 2 +- .../node/opentelemetry-resource-detector-github/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 2 +- metapackages/auto-instrumentations-web/package.json | 2 +- .../opentelemetry-browser-extension-autoinjection/package.json | 2 +- packages/opentelemetry-host-metrics/package.json | 2 +- packages/opentelemetry-id-generator-aws-xray/package.json | 2 +- plugins/node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- plugins/node/opentelemetry-instrumentation-bunyan/package.json | 2 +- .../node/opentelemetry-instrumentation-cassandra/package.json | 2 +- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- plugins/node/opentelemetry-instrumentation-ioredis/package.json | 2 +- plugins/node/opentelemetry-instrumentation-net/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pino/package.json | 2 +- plugins/node/opentelemetry-instrumentation-winston/package.json | 2 +- .../opentelemetry-instrumentation-document-load/package.json | 2 +- .../web/opentelemetry-instrumentation-long-task/package.json | 2 +- .../opentelemetry-instrumentation-user-interaction/package.json | 2 +- plugins/web/opentelemetry-plugin-react-load/package.json | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index d447b2f94d..e537289118 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -55,7 +55,7 @@ "nock": "12.0.3", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 90d760197f..3ed6aedbf7 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -54,7 +54,7 @@ "nock": "12.0.3", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 46ea2d2a93..adc2021c05 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -56,7 +56,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index a8d0621dc8..378531b9f3 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -40,7 +40,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index b0b1b878ea..ddce13ced3 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -52,7 +52,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", "typescript": "4.3.5", diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json index 3da1a54479..3d2ed32a08 100644 --- a/packages/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -53,7 +53,7 @@ "nyc": "15.1.0", "responsive-loader": "2.3.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "sinon-chrome": "3.0.1", "ts-loader": "9.2.5", "ts-mocha": "8.0.0", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index fb102bbabc..787d6198ae 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -56,7 +56,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index 09ee6f66cb..2b5d2f4bea 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -74,7 +74,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", "typescript": "4.3.5", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 51abbf5eea..67c650cc0b 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -69,7 +69,7 @@ "nock": "13.2.1", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "gts": "3.1.0", "@opentelemetry/contrib-test-utils": "^0.29.0", "test-all-versions": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 22143807b2..89c982d005 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -61,7 +61,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "test-all-versions": "5.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index fd7303a23b..b92d82e566 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -62,7 +62,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 426bf9ba75..073cf4db96 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -60,7 +60,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 2d3ff5e623..a9850a2a09 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -66,7 +66,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "test-all-versions": "5.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index df47a6eb2e..b7ad423abe 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -58,7 +58,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" }, diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index a3dac903dd..6687fc4e96 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -61,7 +61,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "test-all-versions": "5.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5" diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index fac1b3162f..c095b0e211 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -61,7 +61,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "test-all-versions": "5.0.1", "ts-mocha": "8.0.0", "typescript": "4.3.5", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 943bbd6403..ce0622030b 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -71,7 +71,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", "typescript": "4.3.5", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 4bcab2e192..1d819ef549 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -71,7 +71,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", "typescript": "4.3.5", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index c1d4109a16..fcdfdc772f 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -73,7 +73,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", "typescript": "4.3.5", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 6c6e8c6228..ba4f95800f 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -75,7 +75,7 @@ "react": "17.0.2", "react-dom": "17.0.2", "rimraf": "3.0.2", - "sinon": "12.0.1", + "sinon": "13.0.1", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", "typescript": "4.3.5",