From a2272e461de4731325e4469eecbdfb443e7a9717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B2=92=E7=B2=92=E6=A9=99?= Date: Thu, 1 Jun 2023 23:13:52 +0800 Subject: [PATCH 1/3] fix: align dependency versions --- .../packages/exporter-logs-otlp-http/package.json | 2 +- .../packages/opentelemetry-browser-detector/package.json | 2 +- .../opentelemetry-instrumentation-http/package.json | 2 +- .../packages/opentelemetry-instrumentation/package.json | 8 ++++---- .../packages/otlp-grpc-exporter-base/package.json | 2 +- .../packages/otlp-proto-exporter-base/package.json | 2 +- experimental/packages/sdk-logs/package.json | 2 +- experimental/packages/shim-opencensus/package.json | 4 ++-- packages/opentelemetry-sdk-trace-node/package.json | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index b6f4808b42f..91c58bfab26 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -89,7 +89,7 @@ "karma-webpack": "4.0.2", "mocha": "10.0.0", "nyc": "15.1.0", - "sinon": "14.0.0", + "sinon": "15.0.0", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index fa3e4746a03..64c9691fdfa 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -55,7 +55,7 @@ "devDependencies": { "@babel/core": "7.16.0", "@opentelemetry/api": "1.4.1", - "@types/mocha": "9.1.1", + "@types/mocha": "10.0.0", "@types/node": "18.6.5", "@types/sinon": "10.0.13", "codecov": "3.8.3", diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index b46eef6a181..edd7ca896fc 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -75,7 +75,7 @@ "@opentelemetry/core": "1.13.0", "@opentelemetry/instrumentation": "0.39.1", "@opentelemetry/semantic-conventions": "1.13.0", - "semver": "^7.3.5" + "semver": "7.3.5" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 41649528210..54d8421f44d 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -71,11 +71,11 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@types/shimmer": "^1.0.2", + "@types/shimmer": "1.0.2", "import-in-the-middle": "1.3.5", - "require-in-the-middle": "^7.1.0", - "semver": "^7.3.2", - "shimmer": "^1.2.1" + "require-in-the-middle": "7.1.1", + "semver": "7.3.5", + "shimmer": "1.2.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 97f8940ef6c..1840391b155 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -73,7 +73,7 @@ "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "1.13.0", "@opentelemetry/otlp-exporter-base": "0.39.1", - "protobufjs": "^7.2.2" + "protobufjs": "7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base", "sideEffects": false diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 29018d61b4f..c660f434918 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -79,7 +79,7 @@ "dependencies": { "@opentelemetry/core": "1.13.0", "@opentelemetry/otlp-exporter-base": "0.39.1", - "protobufjs": "^7.1.2" + "protobufjs": "7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", "sideEffects": false diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index be9010f5a77..78ab480b6ea 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -86,7 +86,7 @@ "karma-webpack": "4.0.2", "mocha": "10.0.0", "nyc": "15.1.0", - "sinon": "14.0.0", + "sinon": "15.0.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index 202f8e2d67d..9a91f6a1c11 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -64,8 +64,8 @@ }, "dependencies": { "@opentelemetry/core": "1.13.0", - "require-in-the-middle": "^7.0.0", - "semver": "^7.3.5" + "require-in-the-middle": "7.1.1", + "semver": "7.3.5" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/shim-opencensus", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 60ef5ccba8c..5a1ef5d6114 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -68,7 +68,7 @@ "@opentelemetry/propagator-b3": "1.13.0", "@opentelemetry/propagator-jaeger": "1.13.0", "@opentelemetry/sdk-trace-base": "1.13.0", - "semver": "^7.3.5" + "semver": "7.3.5" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", "sideEffects": false From 2d680b54eff382c80e9ca358e4c0fc949c00fa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B2=92=E7=B2=92=E6=A9=99?= Date: Wed, 7 Jun 2023 21:06:20 +0800 Subject: [PATCH 2/3] fix: unpin dependencies only --- .../opentelemetry-instrumentation-grpc/package.json | 2 +- .../opentelemetry-instrumentation-http/package.json | 2 +- .../opentelemetry-instrumentation/package.json | 10 +++++----- .../packages/opentelemetry-sdk-node/package.json | 2 +- .../packages/otlp-grpc-exporter-base/package.json | 2 +- .../packages/otlp-proto-exporter-base/package.json | 2 +- experimental/packages/shim-opencensus/package.json | 4 ++-- package.json | 2 +- packages/opentelemetry-sdk-trace-node/package.json | 2 +- packages/sdk-metrics/package.json | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index abe73ed1d17..2b4a4f428ff 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -62,7 +62,7 @@ "mocha": "10.0.0", "node-pre-gyp": "0.17.0", "nyc": "15.1.0", - "semver": "7.3.5", + "semver": "7.5.1", "sinon": "15.0.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 69aa77f1964..e98db9809db 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -75,7 +75,7 @@ "@opentelemetry/core": "1.14.0", "@opentelemetry/instrumentation": "0.40.0", "@opentelemetry/semantic-conventions": "1.14.0", - "semver": "7.3.5" + "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index e18c7da1695..10bf66b8f5c 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -71,11 +71,11 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@types/shimmer": "1.0.2", - "import-in-the-middle": "1.3.5", - "require-in-the-middle": "7.1.1", - "semver": "7.3.5", - "shimmer": "1.2.1" + "@types/shimmer": "^1.0.2", + "import-in-the-middle": "^1.4.0", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.1", + "shimmer": "^1.2.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index db67154c4ff..781cbb1fc26 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -71,7 +71,7 @@ "istanbul-instrumenter-loader": "3.0.1", "mocha": "10.0.0", "nyc": "15.1.0", - "semver": "7.3.5", + "semver": "7.5.1", "sinon": "15.0.0", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index a894158ba1d..a62e3bde51c 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -73,7 +73,7 @@ "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "1.14.0", "@opentelemetry/otlp-exporter-base": "0.40.0", - "protobufjs": "7.2.3" + "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base", "sideEffects": false diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index e27751052b8..ab043bf0e5f 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -79,7 +79,7 @@ "dependencies": { "@opentelemetry/core": "1.14.0", "@opentelemetry/otlp-exporter-base": "0.40.0", - "protobufjs": "7.2.3" + "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", "sideEffects": false diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index 2d1da39eda4..41def826675 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -64,8 +64,8 @@ }, "dependencies": { "@opentelemetry/core": "1.14.0", - "require-in-the-middle": "7.1.1", - "semver": "7.3.5" + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/shim-opencensus", "sideEffects": false diff --git a/package.json b/package.json index 93302e80ef7..7f8357c48ca 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "linkinator": "5.0.1", "markdownlint-cli": "0.32.2", "prettier": "2.8.0", - "semver": "7.3.5", + "semver": "7.5.1", "typedoc": "0.22.18", "typedoc-plugin-missing-exports": "1.0.0", "typedoc-plugin-resolve-crossmodule-references": "0.2.2", diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 7d62b517924..0b8a6ea80d5 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -68,7 +68,7 @@ "@opentelemetry/propagator-b3": "1.14.0", "@opentelemetry/propagator-jaeger": "1.14.0", "@opentelemetry/sdk-trace-base": "1.14.0", - "semver": "7.3.5" + "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", "sideEffects": false diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 80ab750d71b..be670e46834 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -78,7 +78,7 @@ "dependencies": { "@opentelemetry/core": "1.14.0", "@opentelemetry/resources": "1.14.0", - "lodash.merge": "4.6.2" + "lodash.merge": "^4.6.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", "sideEffects": false From 8824f190f6939d32a9435453600a8748f0552b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B2=92=E7=B2=92=E6=A9=99?= Date: Wed, 7 Jun 2023 23:58:15 +0800 Subject: [PATCH 3/3] Revert unpinned `import-in-the-middle` --- .../packages/opentelemetry-instrumentation/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 10bf66b8f5c..0b5610a052a 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -72,7 +72,7 @@ }, "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "^1.4.0", + "import-in-the-middle": "1.3.5", "require-in-the-middle": "^7.1.1", "semver": "^7.5.1", "shimmer": "^1.2.1"