Skip to content

Commit

Permalink
Merge branch 'main' into fix/exporter-concurrency-limit
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Nov 23, 2023
2 parents f8ae76c + b3a539d commit 6d7b32d
Show file tree
Hide file tree
Showing 48 changed files with 461 additions and 2,034 deletions.
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
lockfile-version=2
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ We have a weekly SIG meeting! See the [community page](https://github.com/open-t
- [Neville Wylie](https://github.com/MSNev), Microsoft
- [Purvi Kanal](https://github.com/pkanal), Honeycomb
- [Svetlana Brennan](https://github.com/svetlanabrennan), New Relic
- [Trent Mick](https://github.com/trentm), Elastic

*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*

Expand Down
4 changes: 2 additions & 2 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
"access": "public"
},
"devDependencies": {
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"@types/webpack": "4.41.35",
"@types/webpack": "4.41.36",
"@types/webpack-env": "1.16.3",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
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 @@ -64,7 +64,7 @@
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@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
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.3",
"@types/mocha": "10.0.4",
"@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
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/api-logs": "0.45.1",
"@opentelemetry/otlp-exporter-base": "0.45.1",
"@opentelemetry/resources": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-logs-otlp-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
],
"sideEffects": false,
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/resources": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-logs-otlp-proto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-trace-otlp-grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/otlp-exporter-base": "0.45.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-trace-otlp-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-trace-otlp-proto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"devDependencies": {
"@opentelemetry/api": "1.7.0",
"@opentelemetry/semantic-conventions": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/context-zone": "1.18.1",
"@opentelemetry/propagator-b3": "1.18.1",
"@opentelemetry/sdk-trace-base": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
"@protobuf-ts/grpc-transport": "2.9.1",
"@protobuf-ts/runtime": "2.9.1",
"@protobuf-ts/runtime-rpc": "2.9.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/semver": "7.5.4",
"@types/semver": "7.5.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
"@opentelemetry/sdk-metrics": "1.18.1",
"@opentelemetry/sdk-trace-base": "1.18.1",
"@opentelemetry/sdk-trace-node": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/request-promise-native": "1.0.20",
"@types/semver": "7.5.4",
"@types/request-promise-native": "1.0.21",
"@types/semver": "7.5.5",
"@types/sinon": "10.0.20",
"@types/superagent": "4.1.20",
"@types/superagent": "4.1.21",
"axios": "1.5.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/context-zone": "1.18.1",
"@opentelemetry/propagator-b3": "1.18.1",
"@opentelemetry/sdk-trace-base": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
"@opentelemetry/api": "^1.3.0"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/sdk-metrics": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/semver": "7.5.4",
"@types/semver": "7.5.5",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-sdk-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"@opentelemetry/api": "1.7.0",
"@opentelemetry/context-async-hooks": "1.18.1",
"@opentelemetry/exporter-jaeger": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/semver": "7.5.4",
"@types/semver": "7.5.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
"cross-var": "1.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-exporter-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
"@opentelemetry/core": "1.18.1"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-grpc-exporter-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/otlp-transformer": "0.45.1",
"@opentelemetry/resources": "1.18.1",
"@opentelemetry/sdk-trace-base": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-proto-exporter-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
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 @@ -59,7 +59,7 @@
},
"devDependencies": {
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@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
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
"@opentelemetry/api-logs": ">=0.39.1"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@babel/core": "7.23.3",
"@opentelemetry/api": ">=1.4.0 <1.8.0",
"@opentelemetry/api-logs": "0.45.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"babel-plugin-istanbul": "6.1.1",
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 @@ -52,7 +52,7 @@
"@opentelemetry/api": "1.7.0",
"@opentelemetry/context-async-hooks": "1.18.1",
"@opentelemetry/sdk-trace-base": "1.18.1",
"@types/mocha": "10.0.3",
"@types/mocha": "10.0.4",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"codecov": "3.8.3",
Expand Down
Loading

0 comments on commit 6d7b32d

Please sign in to comment.