Skip to content

Commit

Permalink
Merge branch 'main' into fix/version-mismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
@llc1123
llc1123 authored Jun 8, 2023
2 parents 5c6747f + 51dd6f2 commit fb3b520
Show file tree
Hide file tree
Showing 41 changed files with 102 additions and 102 deletions.
8 changes: 4 additions & 4 deletions api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
"access": "public"
},
"devDependencies": {
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/webpack": "4.41.26",
"@types/sinon": "10.0.15",
"@types/webpack": "4.41.33",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
"dpdm": "3.10.0",
Expand All @@ -73,7 +73,7 @@
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-mocha": "2.0.1",
"karma-mocha-webworker": "1.3.0",
"karma-spec-reporter": "0.0.32",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"memfs": "3.4.9",
"mocha": "10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/api-events/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"
},
"devDependencies": {
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
Expand All @@ -73,7 +73,7 @@
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/api-logs/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"
},
"devDependencies": {
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
Expand All @@ -73,7 +73,7 @@
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-logs-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"@opentelemetry/api-logs": "0.40.0",
"@opentelemetry/otlp-exporter-base": "0.40.0",
"@opentelemetry/resources": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cpx": "1.5.0",
"mocha": "10.2.0",
Expand Down
8 changes: 4 additions & 4 deletions experimental/packages/exporter-logs-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api-logs": "0.40.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.2.3",
"codecov": "3.8.3",
Expand All @@ -85,11 +85,11 @@
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.0.0",
"sinon": "14.0.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-logs-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cpx": "1.5.0",
"mocha": "10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-trace-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
"@grpc/proto-loader": "^0.7.3",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/otlp-exporter-base": "0.40.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cpx": "1.5.0",
"mocha": "10.2.0",
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/exporter-trace-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.2.3",
"codecov": "3.8.3",
Expand All @@ -77,7 +77,7 @@
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-trace-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cpx": "1.5.0",
"mocha": "10.2.0",
Expand Down
2 changes: 1 addition & 1 deletion 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.4.1",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"mocha": "10.2.0",
"nyc": "15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
"@babel/core": "7.16.0",
"@grpc/proto-loader": "^0.7.3",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cpx": "1.5.0",
"mocha": "10.2.0",
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.2.3",
"codecov": "3.8.3",
Expand All @@ -77,7 +77,7 @@
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cpx": "1.5.0",
"mocha": "10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-exporter-prometheus/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
"devDependencies": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/semantic-conventions": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"mocha": "10.2.0",
"nyc": "15.1.0",
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
"@opentelemetry/context-zone": "1.14.0",
"@opentelemetry/propagator-b3": "1.14.0",
"@opentelemetry/sdk-trace-base": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.2.3",
"codecov": "3.8.3",
Expand All @@ -70,7 +70,7 @@
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-instrumentation-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
"@opentelemetry/core": "1.14.0",
"@opentelemetry/sdk-trace-base": "1.14.0",
"@opentelemetry/sdk-trace-node": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/semver": "7.3.9",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"grpc": "1.24.11",
"mocha": "10.2.0",
Expand Down
8 changes: 4 additions & 4 deletions experimental/packages/opentelemetry-instrumentation-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
"@opentelemetry/sdk-metrics": "1.14.0",
"@opentelemetry/sdk-trace-base": "1.14.0",
"@opentelemetry/sdk-trace-node": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/request-promise-native": "1.0.18",
"@types/semver": "7.3.9",
"@types/sinon": "10.0.13",
"@types/superagent": "4.1.13",
"@types/sinon": "10.0.15",
"@types/superagent": "4.1.18",
"axios": "1.4.0",
"codecov": "3.8.3",
"mocha": "10.2.0",
Expand All @@ -64,7 +64,7 @@
"request": "2.88.2",
"request-promise-native": "1.0.9",
"sinon": "15.0.0",
"superagent": "8.0.0",
"superagent": "8.0.9",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
},
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
"@opentelemetry/context-zone": "1.14.0",
"@opentelemetry/propagator-b3": "1.14.0",
"@opentelemetry/sdk-trace-base": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.2.3",
"codecov": "3.8.3",
Expand All @@ -70,7 +70,7 @@
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-instrumentation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
"@babel/core": "7.16.0",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/sdk-metrics": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/semver": "7.3.9",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.2.3",
"codecov": "3.8.3",
Expand All @@ -97,7 +97,7 @@
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-sdk-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
"devDependencies": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/context-async-hooks": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/semver": "7.3.9",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"istanbul-instrumenter-loader": "3.0.1",
"mocha": "10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
},
"devDependencies": {
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"istanbul-instrumenter-loader": "3.0.1",
"mocha": "10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-grpc-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"@opentelemetry/otlp-transformer": "0.40.0",
"@opentelemetry/resources": "1.14.0",
"@opentelemetry/sdk-trace-base": "1.14.0",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cpx": "1.5.0",
"mocha": "10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-proto-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"mocha": "10.2.0",
"nyc": "15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-transformer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
"@opentelemetry/api": "1.4.1",
"@opentelemetry/api-logs": "0.39.1",
"@opentelemetry/sdk-logs": "0.39.1",
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
"istanbul-instrumenter-loader": "3.0.1",
"karma": "6.3.16",
"karma-chrome-launcher": "3.1.0",
"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": "10.2.0",
"nyc": "15.1.0",
Expand Down
Loading

0 comments on commit fb3b520

Please sign in to comment.