Skip to content

Commit

Permalink
Merge branch 'main' into fix-otlp-json-export
Browse files Browse the repository at this point in the history
  • Loading branch information
@pichlermarc
pichlermarc authored Nov 6, 2023
2 parents 4e4f6e5 + 586def4 commit fe78777
Show file tree
Hide file tree
Showing 42 changed files with 327 additions and 329 deletions.
6 changes: 3 additions & 3 deletions api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
"access": "public"
},
"devDependencies": {
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/webpack": "4.41.34",
"@types/sinon": "10.0.20",
"@types/webpack": "4.41.35",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion 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.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/webpack-env": "1.16.3",
"babel-plugin-istanbul": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion 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.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/webpack-env": "1.16.3",
"babel-plugin-istanbul": "6.1.1",
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.44.0",
"@opentelemetry/otlp-exporter-base": "0.44.0",
"@opentelemetry/resources": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-logs-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
"@babel/core": "7.22.20",
"@opentelemetry/api": "1.6.0",
"@opentelemetry/resources": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"@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 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.22.20",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.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.10",
"@opentelemetry/api": "1.6.0",
"@opentelemetry/otlp-exporter-base": "0.44.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
Expand Down
4 changes: 2 additions & 2 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.22.20",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"@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 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.22.20",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-browser-detector/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
"devDependencies": {
"@babel/core": "7.22.20",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.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.22.20",
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
Expand Down
4 changes: 2 additions & 2 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.22.20",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"@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 experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
"devDependencies": {
"@babel/core": "7.22.20",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.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.6.0",
"@opentelemetry/semantic-conventions": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
Expand Down
4 changes: 2 additions & 2 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.17.1",
"@opentelemetry/propagator-b3": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-instrumentation-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
"@protobuf-ts/grpc-transport": "2.9.1",
"@protobuf-ts/runtime": "2.9.1",
"@protobuf-ts/runtime-rpc": "2.9.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.19",
"@types/semver": "7.5.4",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
Expand Down
12 changes: 6 additions & 6 deletions experimental/packages/opentelemetry-instrumentation-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@
"@opentelemetry/sdk-metrics": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@opentelemetry/sdk-trace-node": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/request-promise-native": "1.0.19",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.19",
"@types/superagent": "4.1.19",
"@types/request-promise-native": "1.0.20",
"@types/semver": "7.5.4",
"@types/sinon": "10.0.20",
"@types/superagent": "4.1.20",
"axios": "1.5.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"mocha": "10.2.0",
"nock": "13.3.4",
"nock": "13.3.8",
"nyc": "15.1.0",
"request": "2.88.2",
"request-promise-native": "1.0.9",
Expand Down
4 changes: 2 additions & 2 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.17.1",
"@opentelemetry/propagator-b3": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
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.22.20",
"@opentelemetry/api": "1.6.0",
"@opentelemetry/sdk-metrics": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.19",
"@types/semver": "7.5.4",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-sdk-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@
"@opentelemetry/api": "1.6.0",
"@opentelemetry/context-async-hooks": "1.17.1",
"@opentelemetry/exporter-jaeger": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
"@types/sinon": "10.0.19",
"@types/semver": "7.5.4",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
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 @@ -66,9 +66,9 @@
"devDependencies": {
"@babel/core": "7.22.20",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.1.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.44.0",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.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.22.20",
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/otlp-transformer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"devDependencies": {
"@opentelemetry/api": "1.6.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/webpack-env": "1.16.3",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/sdk-logs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
"@babel/core": "7.22.20",
"@opentelemetry/api": ">=1.4.0 <1.7.0",
"@opentelemetry/api-logs": "0.44.0",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/shim-opencensus/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"@opentelemetry/api": "1.6.0",
"@opentelemetry/context-async-hooks": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@types/mocha": "10.0.2",
"@types/mocha": "10.0.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.19",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"lerna": "6.6.2",
Expand Down
Loading

0 comments on commit fe78777

Please sign in to comment.