Skip to content

Commit

Permalink
Merge branch 'main' into feat/otlp-grpc-uds
Browse files Browse the repository at this point in the history
  • Loading branch information
legendecas authored Jun 20, 2023
2 parents fd4fb8f + 67d4b80 commit 47fe3c9
Show file tree
Hide file tree
Showing 43 changed files with 44 additions and 43 deletions.
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"karma-mocha-webworker": "1.3.0",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"memfs": "3.5.3",
"mocha": "10.2.0",
"nyc": "15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/api-events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"ts-loader": "8.4.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/api-logs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"ts-loader": "8.4.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/exporter-logs-otlp-grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/exporter-logs-otlp-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"node-pre-gyp": "0.17.0",
"nyc": "15.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"axios": "1.4.0",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nock": "13.3.1",
"nyc": "15.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-sdk-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"codecov": "3.8.3",
"cross-var": "1.1.0",
"istanbul-instrumenter-loader": "3.0.1",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"semver": "7.5.2",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/otlp-exporter-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"codecov": "3.8.3",
"cross-var": "1.1.0",
"istanbul-instrumenter-loader": "3.0.1",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nock": "13.3.1",
"nyc": "15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/otlp-grpc-exporter-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"protobufjs-cli": "1.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"protobufjs-cli": "1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/otlp-transformer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"ts-loader": "8.4.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/sdk-logs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/shim-opencensus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.2.1",
"gh-pages": "5.0.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"@lerna/legacy-package-management": "7.0.2",
"linkinator": "5.0.1",
"markdownlint-cli": "0.34.0",
"prettier": "2.8.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-async-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@types/node": "18.6.5",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"ts-mocha": "10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-zone-peer-dep/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-zone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-jaeger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nock": "13.3.1",
"nyc": "15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-zipkin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nock": "13.3.1",
"nyc": "15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagator-b3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"codecov": "3.8.3",
"cross-var": "1.1.0",
"istanbul-instrumenter-loader": "3.0.1",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"ts-loader": "8.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagator-jaeger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"karma-mocha-webworker": "1.3.0",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nock": "13.3.1",
"nyc": "15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-sdk-trace-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"karma-mocha-webworker": "1.3.0",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-sdk-trace-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-sdk-trace-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"karma-mocha-webworker": "1.3.0",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-semantic-conventions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/sinon": "10.0.15",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nock": "13.3.1",
"nyc": "15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-shim-opentracing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@types/node": "18.6.5",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"ts-mocha": "10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-metrics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"lerna": "6.6.2",
"lerna": "7.0.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"devDependencies": {
"@types/node": "18.6.5",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"lerna": "7.0.2",
"typescript": "4.4.4"
},
"Add these to devDependencies for testing": {
Expand Down

0 comments on commit 47fe3c9

Please sign in to comment.