Skip to content

Commit

Permalink
Merge branch 'main' into release/1.15-0.41
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Jul 6, 2023
2 parents ddc7185 + a675ae8 commit f865bcc
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 23 deletions.
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 @@ -48,7 +48,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@grpc/proto-loader": "^0.7.3",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/api-logs": "0.41.0",
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 @@ -71,7 +71,7 @@
],
"sideEffects": false,
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api-logs": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@types/mocha": "10.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@grpc/proto-loader": "^0.7.3",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/otlp-exporter-base": "0.41.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@grpc/proto-loader": "^0.7.3",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/context-zone": "1.15.0",
"@opentelemetry/propagator-b3": "1.15.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/context-zone": "1.15.0",
"@opentelemetry/propagator-b3": "1.15.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@opentelemetry/api": "^1.3.0"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/sdk-metrics": "1.15.0",
"@types/mocha": "10.0.1",
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 @@ -48,7 +48,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/resources": "1.15.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
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 @@ -53,7 +53,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": ">=1.0.0 <1.5.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
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 @@ -50,7 +50,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.15",
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 @@ -60,7 +60,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
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 @@ -55,7 +55,7 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@opentelemetry/api": ">=1.0.0 <1.5.0",
"@opentelemetry/context-zone": "1.15.0",
"@opentelemetry/propagator-b3": "1.15.0",
Expand Down
8 changes: 4 additions & 4 deletions selenium-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"access": "restricted"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.6",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-decorators": "7.22.5",
"@babel/plugin-transform-runtime": "7.22.5",
"@babel/preset-env": "7.22.5",
"@babel/plugin-proposal-decorators": "7.22.6",
"@babel/plugin-transform-runtime": "7.22.6",
"@babel/preset-env": "7.22.6",
"@opentelemetry/api": "^1.0.0",
"babel-loader": "8.3.0",
"babel-polyfill": "6.26.0",
Expand Down

0 comments on commit f865bcc

Please sign in to comment.