Skip to content

Commit

Permalink
[AutoMerge] ## Merging otel-js @ [1c7d7a3...](open-telemetry/opentele…
Browse files Browse the repository at this point in the history 
…metry-js@1c7d7a3)

  - commit 1c7d7a3
  - Author: Luismi Ramírez <luismi.ramirez@protonmail.com>
  - Date:   Thu Oct 19 08:14:18 2023 +0200
  -     fix(sdk-node) Remove @opentelemetry/exporter-jaeger explicit dependency (#4214)
  - ...
  • Loading branch information
@opentelemetrybot
opentelemetrybot committed Oct 23, 2023
2 parents 42d1cfc + 1c7d7a3 commit eff5d46
Show file tree
Hide file tree
Showing 38 changed files with 48 additions and 45 deletions.
2 changes: 1 addition & 1 deletion auto-merge/js/.github/workflows/docs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '18'

- name: restore lock files
uses: actions/cache@master # must use unreleased master to cache multiple paths
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"devDependencies": {
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack": "4.41.34",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
Expand Down
4 changes: 4 additions & 0 deletions auto-merge/js/experimental/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ All notable changes to experimental packages in this project will be documented

### :bug: (Bug Fix)

* fix(sdk-node): remove the explicit dependency on @opentelemetry/exporter-jaeger that was kept on the previous release
* '@opentelemetry/exporter-jaeger' is no longer be a dependency of this package. To continue using '@opentelemetry/exporter-jaeger', please install it manually.
* NOTE: `@opentelemetry/exporter-jaeger` is deprecated, consider switching to one of the alternatives described [here](https://www.npmjs.com/package/@opentelemetry/exporter-jaeger)

### :books: (Refine Doc)

### :house: (Internal)
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@opentelemetry/resources": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@opentelemetry/resources": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/exporter-logs-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/exporter-trace-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/otlp-exporter-base": "0.44.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/exporter-trace-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/exporter-trace-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/opentelemetry-browser-detector/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@opentelemetry/semantic-conventions": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@opentelemetry/sdk-trace-base": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
Expand Down
4 changes: 2 additions & 2 deletions auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
"@types/node": "18.6.5",
"@types/request-promise-native": "1.0.19",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/superagent": "4.1.19",
"axios": "1.5.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
"mocha": "10.2.0",
"nock": "13.3.3",
"nock": "13.3.4",
"nyc": "15.1.0",
"request": "2.88.2",
"request-promise-native": "1.0.9",
Expand Down
2 changes: 1 addition & 1 deletion ...erge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@opentelemetry/sdk-trace-base": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/opentelemetry-instrumentation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
5 changes: 2 additions & 3 deletions auto-merge/js/experimental/packages/opentelemetry-sdk-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"dependencies": {
"@opentelemetry/api-logs": "0.44.0",
"@opentelemetry/core": "1.17.1",
"@opentelemetry/exporter-jaeger": "1.17.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.44.0",
"@opentelemetry/exporter-trace-otlp-http": "0.44.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.44.0",
Expand All @@ -65,11 +64,11 @@
"devDependencies": {
"@opentelemetry/api": "1.6.0",
"@opentelemetry/context-async-hooks": "1.17.1",
"@opentelemetry/exporter-jaeger": "1.17.0",
"@opentelemetry/exporter-jaeger": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/otlp-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/otlp-grpc-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@opentelemetry/sdk-trace-base": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/otlp-proto-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/sdk-logs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@opentelemetry/api-logs": "0.44.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/shim-opencensus/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@opentelemetry/sdk-trace-base": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"eslint-config-prettier": "9.0.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-prettier": "5.0.1",
"gh-pages": "6.0.0",
"lerna": "7.1.5",
"@lerna/legacy-package-management": "7.1.5",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/packages/opentelemetry-context-zone-peer-dep/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@opentelemetry/api": ">=1.0.0 <1.7.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"@types/zone.js": "0.5.12",
"babel-loader": "8.3.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/packages/opentelemetry-context-zone/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@babel/core": "7.22.20",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"codecov": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/packages/opentelemetry-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@opentelemetry/api": ">=1.0.0 <1.7.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions auto-merge/js/packages/opentelemetry-exporter-jaeger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
"@opentelemetry/resources": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
"mocha": "10.2.0",
"nock": "13.3.3",
"nock": "13.3.4",
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-mocha": "10.0.0",
Expand Down
4 changes: 2 additions & 2 deletions auto-merge/js/packages/opentelemetry-exporter-zipkin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand All @@ -78,7 +78,7 @@
"karma-webpack": "4.0.2",
"lerna": "7.1.5",
"mocha": "10.2.0",
"nock": "13.3.3",
"nock": "13.3.4",
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-loader": "8.4.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/packages/opentelemetry-propagator-jaeger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@opentelemetry/api": ">=1.0.0 <1.7.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions auto-merge/js/packages/opentelemetry-resources/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand All @@ -78,7 +78,7 @@
"karma-webpack": "4.0.2",
"lerna": "7.1.5",
"mocha": "10.2.0",
"nock": "13.3.3",
"nock": "13.3.4",
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-mocha": "10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/packages/opentelemetry-sdk-trace-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/packages/opentelemetry-sdk-trace-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
Expand Down
4 changes: 2 additions & 2 deletions auto-merge/js/packages/opentelemetry-sdk-trace-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
"@opentelemetry/context-zone": "1.17.1",
"@opentelemetry/propagator-b3": "1.17.1",
"@opentelemetry/resources": "1.17.1",
"@types/jquery": "3.5.21",
"@types/jquery": "3.5.22",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
4 changes: 2 additions & 2 deletions auto-merge/js/packages/opentelemetry-semantic-conventions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
"devDependencies": {
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "7.1.5",
"mocha": "10.2.0",
"nock": "13.3.3",
"nock": "13.3.4",
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-mocha": "10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/packages/sdk-metrics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@types/lodash.merge": "4.6.7",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"@types/sinon": "10.0.19",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down

0 comments on commit eff5d46

Please sign in to comment.