Skip to content

Commit 78511a3

Browse files
pichlermarcpichlermarc
authored
Merge branch 'main' into dluna/4217-re-export-version-fix
2 parents e1f77f4 + 586def4 commit 78511a3

File tree

42 files changed

+327
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+327
-329
lines changed

‎api/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
"access": "public"
6262
},
6363
"devDependencies": {
64-
"@types/mocha": "10.0.2",
64+
"@types/mocha": "10.0.3",
6565
"@types/node": "18.6.5",
66-
"@types/sinon": "10.0.19",
67-
"@types/webpack": "4.41.34",
66+
"@types/sinon": "10.0.20",
67+
"@types/webpack": "4.41.35",
6868
"@types/webpack-env": "1.16.3",
6969
"codecov": "3.8.3",
7070
"cross-var": "1.1.0",

‎experimental/packages/api-events/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"@opentelemetry/api": "^1.0.0"
6565
},
6666
"devDependencies": {
67-
"@types/mocha": "10.0.2",
67+
"@types/mocha": "10.0.3",
6868
"@types/node": "18.6.5",
6969
"@types/webpack-env": "1.16.3",
7070
"babel-plugin-istanbul": "6.1.1",

‎experimental/packages/api-logs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"@opentelemetry/api": "^1.0.0"
6565
},
6666
"devDependencies": {
67-
"@types/mocha": "10.0.2",
67+
"@types/mocha": "10.0.3",
6868
"@types/node": "18.6.5",
6969
"@types/webpack-env": "1.16.3",
7070
"babel-plugin-istanbul": "6.1.1",

‎experimental/packages/exporter-logs-otlp-grpc/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
"@opentelemetry/api-logs": "0.44.0",
5555
"@opentelemetry/otlp-exporter-base": "0.44.0",
5656
"@opentelemetry/resources": "1.17.1",
57-
"@types/mocha": "10.0.2",
57+
"@types/mocha": "10.0.3",
5858
"@types/node": "18.6.5",
59-
"@types/sinon": "10.0.19",
59+
"@types/sinon": "10.0.20",
6060
"codecov": "3.8.3",
6161
"cpx": "1.5.0",
6262
"cross-var": "1.1.0",

‎experimental/packages/exporter-logs-otlp-http/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
"@babel/core": "7.22.20",
7575
"@opentelemetry/api": "1.6.0",
7676
"@opentelemetry/resources": "1.17.1",
77-
"@types/mocha": "10.0.2",
77+
"@types/mocha": "10.0.3",
7878
"@types/node": "18.6.5",
79-
"@types/sinon": "10.0.19",
79+
"@types/sinon": "10.0.20",
8080
"@types/webpack-env": "1.16.3",
8181
"babel-loader": "8.3.0",
8282
"babel-plugin-istanbul": "6.1.1",

‎experimental/packages/exporter-logs-otlp-proto/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
"devDependencies": {
6666
"@babel/core": "7.22.20",
6767
"@opentelemetry/api": "1.6.0",
68-
"@types/mocha": "10.0.2",
68+
"@types/mocha": "10.0.3",
6969
"@types/node": "18.6.5",
70-
"@types/sinon": "10.0.19",
70+
"@types/sinon": "10.0.20",
7171
"babel-plugin-istanbul": "6.1.1",
7272
"codecov": "3.8.3",
7373
"cpx": "1.5.0",

‎experimental/packages/exporter-trace-otlp-grpc/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
"@grpc/proto-loader": "^0.7.10",
5252
"@opentelemetry/api": "1.6.0",
5353
"@opentelemetry/otlp-exporter-base": "0.44.0",
54-
"@types/mocha": "10.0.2",
54+
"@types/mocha": "10.0.3",
5555
"@types/node": "18.6.5",
56-
"@types/sinon": "10.0.19",
56+
"@types/sinon": "10.0.20",
5757
"codecov": "3.8.3",
5858
"cpx": "1.5.0",
5959
"cross-var": "1.1.0",

‎experimental/packages/exporter-trace-otlp-http/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
"devDependencies": {
6666
"@babel/core": "7.22.20",
6767
"@opentelemetry/api": "1.6.0",
68-
"@types/mocha": "10.0.2",
68+
"@types/mocha": "10.0.3",
6969
"@types/node": "18.6.5",
70-
"@types/sinon": "10.0.19",
70+
"@types/sinon": "10.0.20",
7171
"@types/webpack-env": "1.16.3",
7272
"babel-loader": "8.3.0",
7373
"babel-plugin-istanbul": "6.1.1",

‎experimental/packages/exporter-trace-otlp-proto/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
"devDependencies": {
6565
"@babel/core": "7.22.20",
6666
"@opentelemetry/api": "1.6.0",
67-
"@types/mocha": "10.0.2",
67+
"@types/mocha": "10.0.3",
6868
"@types/node": "18.6.5",
69-
"@types/sinon": "10.0.19",
69+
"@types/sinon": "10.0.20",
7070
"babel-plugin-istanbul": "6.1.1",
7171
"codecov": "3.8.3",
7272
"cpx": "1.5.0",

‎experimental/packages/opentelemetry-browser-detector/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
"devDependencies": {
5656
"@babel/core": "7.22.20",
5757
"@opentelemetry/api": "1.6.0",
58-
"@types/mocha": "10.0.2",
58+
"@types/mocha": "10.0.3",
5959
"@types/node": "18.6.5",
60-
"@types/sinon": "10.0.19",
60+
"@types/sinon": "10.0.20",
6161
"babel-plugin-istanbul": "6.1.1",
6262
"codecov": "3.8.3",
6363
"cross-var": "1.1.0",

‎experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"@babel/core": "7.22.20",
5151
"@grpc/proto-loader": "^0.7.10",
5252
"@opentelemetry/api": "1.6.0",
53-
"@types/mocha": "10.0.2",
53+
"@types/mocha": "10.0.3",
5454
"@types/node": "18.6.5",
55-
"@types/sinon": "10.0.19",
55+
"@types/sinon": "10.0.20",
5656
"codecov": "3.8.3",
5757
"cpx": "1.5.0",
5858
"cross-var": "1.1.0",

‎experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
"devDependencies": {
6666
"@babel/core": "7.22.20",
6767
"@opentelemetry/api": "1.6.0",
68-
"@types/mocha": "10.0.2",
68+
"@types/mocha": "10.0.3",
6969
"@types/node": "18.6.5",
70-
"@types/sinon": "10.0.19",
70+
"@types/sinon": "10.0.20",
7171
"@types/webpack-env": "1.16.3",
7272
"babel-loader": "8.3.0",
7373
"babel-plugin-istanbul": "6.1.1",

‎experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
"devDependencies": {
5858
"@babel/core": "7.22.20",
5959
"@opentelemetry/api": "1.6.0",
60-
"@types/mocha": "10.0.2",
60+
"@types/mocha": "10.0.3",
6161
"@types/node": "18.6.5",
62-
"@types/sinon": "10.0.19",
62+
"@types/sinon": "10.0.20",
6363
"codecov": "3.8.3",
6464
"cpx": "1.5.0",
6565
"cross-var": "1.1.0",

‎experimental/packages/opentelemetry-exporter-prometheus/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
"devDependencies": {
4646
"@opentelemetry/api": "1.6.0",
4747
"@opentelemetry/semantic-conventions": "1.17.1",
48-
"@types/mocha": "10.0.2",
48+
"@types/mocha": "10.0.3",
4949
"@types/node": "18.6.5",
50-
"@types/sinon": "10.0.19",
50+
"@types/sinon": "10.0.20",
5151
"codecov": "3.8.3",
5252
"cross-var": "1.1.0",
5353
"lerna": "6.6.2",

‎experimental/packages/opentelemetry-instrumentation-fetch/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
"@opentelemetry/context-zone": "1.17.1",
6060
"@opentelemetry/propagator-b3": "1.17.1",
6161
"@opentelemetry/sdk-trace-base": "1.17.1",
62-
"@types/mocha": "10.0.2",
62+
"@types/mocha": "10.0.3",
6363
"@types/node": "18.6.5",
64-
"@types/sinon": "10.0.19",
64+
"@types/sinon": "10.0.20",
6565
"@types/webpack-env": "1.16.3",
6666
"babel-loader": "8.3.0",
6767
"babel-plugin-istanbul": "6.1.1",

‎experimental/packages/opentelemetry-instrumentation-grpc/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
"@protobuf-ts/grpc-transport": "2.9.1",
5858
"@protobuf-ts/runtime": "2.9.1",
5959
"@protobuf-ts/runtime-rpc": "2.9.1",
60-
"@types/mocha": "10.0.2",
60+
"@types/mocha": "10.0.3",
6161
"@types/node": "18.6.5",
62-
"@types/semver": "7.5.3",
63-
"@types/sinon": "10.0.19",
62+
"@types/semver": "7.5.4",
63+
"@types/sinon": "10.0.20",
6464
"codecov": "3.8.3",
6565
"cross-var": "1.1.0",
6666
"lerna": "6.6.2",

‎experimental/packages/opentelemetry-instrumentation-http/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@
5050
"@opentelemetry/sdk-metrics": "1.17.1",
5151
"@opentelemetry/sdk-trace-base": "1.17.1",
5252
"@opentelemetry/sdk-trace-node": "1.17.1",
53-
"@types/mocha": "10.0.2",
53+
"@types/mocha": "10.0.3",
5454
"@types/node": "18.6.5",
55-
"@types/request-promise-native": "1.0.19",
56-
"@types/semver": "7.5.3",
57-
"@types/sinon": "10.0.19",
58-
"@types/superagent": "4.1.19",
55+
"@types/request-promise-native": "1.0.20",
56+
"@types/semver": "7.5.4",
57+
"@types/sinon": "10.0.20",
58+
"@types/superagent": "4.1.20",
5959
"axios": "1.5.1",
6060
"codecov": "3.8.3",
6161
"cross-var": "1.1.0",
6262
"lerna": "6.6.2",
6363
"mocha": "10.2.0",
64-
"nock": "13.3.4",
64+
"nock": "13.3.8",
6565
"nyc": "15.1.0",
6666
"request": "2.88.2",
6767
"request-promise-native": "1.0.9",

‎experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
"@opentelemetry/context-zone": "1.17.1",
6060
"@opentelemetry/propagator-b3": "1.17.1",
6161
"@opentelemetry/sdk-trace-base": "1.17.1",
62-
"@types/mocha": "10.0.2",
62+
"@types/mocha": "10.0.3",
6363
"@types/node": "18.6.5",
64-
"@types/sinon": "10.0.19",
64+
"@types/sinon": "10.0.20",
6565
"@types/webpack-env": "1.16.3",
6666
"babel-loader": "8.3.0",
6767
"babel-plugin-istanbul": "6.1.1",

‎experimental/packages/opentelemetry-instrumentation/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
"@babel/core": "7.22.20",
8585
"@opentelemetry/api": "1.6.0",
8686
"@opentelemetry/sdk-metrics": "1.17.1",
87-
"@types/mocha": "10.0.2",
87+
"@types/mocha": "10.0.3",
8888
"@types/node": "18.6.5",
89-
"@types/semver": "7.5.3",
90-
"@types/sinon": "10.0.19",
89+
"@types/semver": "7.5.4",
90+
"@types/sinon": "10.0.20",
9191
"@types/webpack-env": "1.16.3",
9292
"babel-loader": "8.3.0",
9393
"babel-plugin-istanbul": "6.1.1",

‎experimental/packages/opentelemetry-sdk-node/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@
6565
"@opentelemetry/api": "1.6.0",
6666
"@opentelemetry/context-async-hooks": "1.17.1",
6767
"@opentelemetry/exporter-jaeger": "1.17.1",
68-
"@types/mocha": "10.0.2",
68+
"@types/mocha": "10.0.3",
6969
"@types/node": "18.6.5",
70-
"@types/semver": "7.5.3",
71-
"@types/sinon": "10.0.19",
70+
"@types/semver": "7.5.4",
71+
"@types/sinon": "10.0.20",
7272
"codecov": "3.8.3",
7373
"cross-var": "1.1.0",
7474
"lerna": "6.6.2",

‎experimental/packages/otlp-exporter-base/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
"devDependencies": {
6767
"@babel/core": "7.22.20",
6868
"@opentelemetry/api": "1.6.0",
69-
"@types/mocha": "10.0.2",
69+
"@types/mocha": "10.0.3",
7070
"@types/node": "18.6.5",
71-
"@types/sinon": "10.0.19",
71+
"@types/sinon": "10.0.20",
7272
"babel-plugin-istanbul": "6.1.1",
7373
"codecov": "3.8.3",
7474
"cross-var": "1.1.0",

‎experimental/packages/otlp-grpc-exporter-base/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
"@opentelemetry/otlp-transformer": "0.44.0",
5454
"@opentelemetry/resources": "1.17.1",
5555
"@opentelemetry/sdk-trace-base": "1.17.1",
56-
"@types/mocha": "10.0.2",
56+
"@types/mocha": "10.0.3",
5757
"@types/node": "18.6.5",
58-
"@types/sinon": "10.0.19",
58+
"@types/sinon": "10.0.20",
5959
"codecov": "3.8.3",
6060
"cpx": "1.5.0",
6161
"cross-var": "1.1.0",

‎experimental/packages/otlp-proto-exporter-base/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
"devDependencies": {
6262
"@babel/core": "7.22.20",
6363
"@opentelemetry/api": "1.6.0",
64-
"@types/mocha": "10.0.2",
64+
"@types/mocha": "10.0.3",
6565
"@types/node": "18.6.5",
66-
"@types/sinon": "10.0.19",
66+
"@types/sinon": "10.0.20",
6767
"codecov": "3.8.3",
6868
"cross-var": "1.1.0",
6969
"lerna": "6.6.2",

‎experimental/packages/otlp-transformer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
},
5959
"devDependencies": {
6060
"@opentelemetry/api": "1.6.0",
61-
"@types/mocha": "10.0.2",
61+
"@types/mocha": "10.0.3",
6262
"@types/webpack-env": "1.16.3",
6363
"babel-plugin-istanbul": "6.1.1",
6464
"codecov": "3.8.3",

‎experimental/packages/sdk-logs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
"@babel/core": "7.22.20",
7676
"@opentelemetry/api": ">=1.4.0 <1.7.0",
7777
"@opentelemetry/api-logs": "0.44.0",
78-
"@types/mocha": "10.0.2",
78+
"@types/mocha": "10.0.3",
7979
"@types/node": "18.6.5",
80-
"@types/sinon": "10.0.19",
80+
"@types/sinon": "10.0.20",
8181
"babel-plugin-istanbul": "6.1.1",
8282
"codecov": "3.8.3",
8383
"cross-var": "1.1.0",

‎experimental/packages/shim-opencensus/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
"@opentelemetry/api": "1.6.0",
5353
"@opentelemetry/context-async-hooks": "1.17.1",
5454
"@opentelemetry/sdk-trace-base": "1.17.1",
55-
"@types/mocha": "10.0.2",
55+
"@types/mocha": "10.0.3",
5656
"@types/node": "18.6.5",
57-
"@types/sinon": "10.0.19",
57+
"@types/sinon": "10.0.20",
5858
"codecov": "3.8.3",
5959
"cross-var": "1.1.0",
6060
"lerna": "6.6.2",

0 commit comments

Comments
 (0)