Skip to content

Commit ce482c4

Browse files
dyladandyladan
committed
Merge remote-tracking branch 'origin/main' into span-processor-interface
2 parents 6353425 + 3d4d8b5 commit ce482c4

File tree

36 files changed

+183
-37
lines changed

36 files changed

+183
-37
lines changed

‎.github/workflows/peer-api.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Ensure API Peer Dependency
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
9+
jobs:
10+
peer-api-check:
11+
runs-on: ubuntu-latest
12+
container:
13+
image: node:14
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
18+
- name: Install lerna
19+
run: npm install -g lerna
20+
21+
- name: Check API dependency semantics
22+
run: lerna exec "node ../../scripts/peer-api-check.js"

‎integration-tests/propagation-validation-server/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"compile": "tsc --build"
1212
},
1313
"dependencies": {
14-
"@opentelemetry/api": "^1.0.0-rc.0",
1514
"@opentelemetry/context-async-hooks": "^0.18.2",
1615
"@opentelemetry/core": "^0.18.2",
1716
"@opentelemetry/tracing": "^0.18.2",
@@ -20,6 +19,10 @@
2019
"express": "4.17.1"
2120
},
2221
"devDependencies": {
22+
"@opentelemetry/api": "^1.0.0-rc.0",
2323
"typescript": "4.2.3"
24+
},
25+
"peerDependencies": {
26+
"@opentelemetry/api": "^1.0.0-rc.0"
2427
}
2528
}

‎packages/opentelemetry-api-metrics/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@
4747
"publishConfig": {
4848
"access": "public"
4949
},
50-
"dependencies": {
50+
"peerDependencies": {
5151
"@opentelemetry/api": "^1.0.0-rc.0"
5252
},
5353
"devDependencies": {
54+
"@opentelemetry/api": "^1.0.0-rc.0",
5455
"@types/mocha": "8.2.2",
5556
"@types/node": "14.14.37",
5657
"@types/webpack-env": "1.16.0",

‎packages/opentelemetry-context-async-hooks/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"access": "public"
4141
},
4242
"devDependencies": {
43+
"@opentelemetry/api": "^1.0.0-rc.0",
4344
"@types/mocha": "8.2.2",
4445
"@types/node": "14.14.37",
4546
"@types/shimmer": "1.0.1",
@@ -52,7 +53,7 @@
5253
"ts-node": "9.1.1",
5354
"typescript": "4.2.3"
5455
},
55-
"dependencies": {
56+
"peerDependencies": {
5657
"@opentelemetry/api": "^1.0.0-rc.0"
5758
}
5859
}

‎packages/opentelemetry-context-zone-peer-dep/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
},
4343
"devDependencies": {
4444
"@babel/core": "7.13.14",
45+
"@opentelemetry/api": "^1.0.0-rc.0",
4546
"@types/mocha": "8.2.2",
4647
"@types/node": "14.14.37",
4748
"@types/sinon": "9.0.11",
@@ -69,10 +70,8 @@
6970
"webpack-cli": "4.6.0",
7071
"zone.js": "0.11.4"
7172
},
72-
"dependencies": {
73-
"@opentelemetry/api": "^1.0.0-rc.0"
74-
},
7573
"peerDependencies": {
74+
"@opentelemetry/api": "^1.0.0-rc.0",
7675
"zone.js": "^0.10.2 || ^0.11.0"
7776
},
7877
"sideEffects": false

‎packages/opentelemetry-core/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"access": "public"
5151
},
5252
"devDependencies": {
53+
"@opentelemetry/api": "^1.0.0-rc.0",
5354
"@opentelemetry/propagator-b3": "^0.18.2",
5455
"@types/mocha": "8.2.2",
5556
"@types/node": "14.14.37",
@@ -75,8 +76,10 @@
7576
"typescript": "4.2.3",
7677
"webpack": "4.46.0"
7778
},
79+
"peerDependencies": {
80+
"@opentelemetry/api": "^1.0.0-rc.0"
81+
},
7882
"dependencies": {
79-
"@opentelemetry/api": "^1.0.0-rc.0",
8083
"semver": "^7.1.3"
8184
}
8285
}

‎packages/opentelemetry-exporter-collector-grpc/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
},
4747
"devDependencies": {
4848
"@babel/core": "7.13.14",
49+
"@opentelemetry/api": "^1.0.0-rc.0",
4950
"@opentelemetry/api-metrics": "^0.18.2",
5051
"@types/mocha": "8.2.2",
5152
"@types/node": "14.14.37",
@@ -62,9 +63,11 @@
6263
"ts-node": "9.1.1",
6364
"typescript": "4.2.3"
6465
},
66+
"peerDependencies": {
67+
"@opentelemetry/api": "^1.0.0-rc.0"
68+
},
6569
"dependencies": {
6670
"@grpc/proto-loader": "^0.5.4",
67-
"@opentelemetry/api": "^1.0.0-rc.0",
6871
"@opentelemetry/core": "^0.18.2",
6972
"@opentelemetry/exporter-collector": "^0.18.2",
7073
"@opentelemetry/metrics": "^0.18.2",

‎packages/opentelemetry-exporter-collector-proto/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
},
4747
"devDependencies": {
4848
"@babel/core": "7.13.14",
49+
"@opentelemetry/api": "^1.0.0-rc.0",
4950
"@opentelemetry/api-metrics": "^0.18.2",
5051
"@types/mocha": "8.2.2",
5152
"@types/node": "14.14.37",
@@ -62,9 +63,11 @@
6263
"ts-node": "9.1.1",
6364
"typescript": "4.2.3"
6465
},
66+
"peerDependencies": {
67+
"@opentelemetry/api": "^1.0.0-rc.0"
68+
},
6569
"dependencies": {
6670
"@grpc/proto-loader": "^0.5.4",
67-
"@opentelemetry/api": "^1.0.0-rc.0",
6871
"@opentelemetry/core": "^0.18.2",
6972
"@opentelemetry/exporter-collector": "^0.18.2",
7073
"@opentelemetry/metrics": "^0.18.2",

‎packages/opentelemetry-exporter-collector/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"access": "public"
4949
},
5050
"devDependencies": {
51+
"@opentelemetry/api": "^1.0.0-rc.0",
5152
"@babel/core": "7.13.14",
5253
"@types/mocha": "8.2.2",
5354
"@types/node": "14.14.37",
@@ -76,8 +77,10 @@
7677
"webpack-cli": "4.6.0",
7778
"webpack-merge": "5.7.3"
7879
},
80+
"peerDependencies": {
81+
"@opentelemetry/api": "^1.0.0-rc.0"
82+
},
7983
"dependencies": {
80-
"@opentelemetry/api": "^1.0.0-rc.0",
8184
"@opentelemetry/api-metrics": "^0.18.2",
8285
"@opentelemetry/core": "^0.18.2",
8386
"@opentelemetry/metrics": "^0.18.2",

‎packages/opentelemetry-exporter-jaeger/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"access": "public"
4141
},
4242
"devDependencies": {
43+
"@opentelemetry/api": "^1.0.0-rc.0",
4344
"@opentelemetry/resources": "^0.18.2",
4445
"@types/mocha": "8.2.2",
4546
"@types/node": "14.14.37",
@@ -55,8 +56,10 @@
5556
"ts-node": "9.1.1",
5657
"typescript": "4.2.3"
5758
},
59+
"peerDependencies": {
60+
"@opentelemetry/api": "^1.0.0-rc.0"
61+
},
5862
"dependencies": {
59-
"@opentelemetry/api": "^1.0.0-rc.0",
6063
"@opentelemetry/core": "^0.18.2",
6164
"@opentelemetry/tracing": "^0.18.2",
6265
"jaeger-client": "^3.15.0"

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"access": "public"
4040
},
4141
"devDependencies": {
42+
"@opentelemetry/api": "^1.0.0-rc.0",
4243
"@types/mocha": "8.2.2",
4344
"@types/node": "14.14.37",
4445
"@types/sinon": "9.0.11",
@@ -52,8 +53,10 @@
5253
"ts-node": "9.1.1",
5354
"typescript": "4.2.3"
5455
},
56+
"peerDependencies": {
57+
"@opentelemetry/api": "^1.0.0-rc.0"
58+
},
5559
"dependencies": {
56-
"@opentelemetry/api": "^1.0.0-rc.0",
5760
"@opentelemetry/api-metrics": "^0.18.2",
5861
"@opentelemetry/core": "^0.18.2",
5962
"@opentelemetry/metrics": "^0.18.2"

‎packages/opentelemetry-exporter-zipkin/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
},
4848
"devDependencies": {
4949
"@babel/core": "7.13.14",
50+
"@opentelemetry/api": "^1.0.0-rc.0",
5051
"@types/mocha": "8.2.2",
5152
"@types/node": "14.14.37",
5253
"@types/sinon": "9.0.11",
@@ -74,8 +75,10 @@
7475
"webpack-cli": "4.6.0",
7576
"webpack-merge": "5.7.3"
7677
},
78+
"peerDependencies": {
79+
"@opentelemetry/api": "^1.0.0-rc.0"
80+
},
7781
"dependencies": {
78-
"@opentelemetry/api": "^1.0.0-rc.0",
7982
"@opentelemetry/core": "^0.18.2",
8083
"@opentelemetry/resources": "^0.18.2",
8184
"@opentelemetry/tracing": "^0.18.2"

‎packages/opentelemetry-grpc-utils/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"devDependencies": {
4343
"@grpc/grpc-js": "1.2.12",
4444
"@grpc/proto-loader": "0.5.6",
45+
"@opentelemetry/api": "^1.0.0-rc.0",
4546
"@opentelemetry/context-async-hooks": "^0.18.2",
4647
"@opentelemetry/node": "^0.18.2",
4748
"@opentelemetry/tracing": "^0.18.2",
@@ -63,8 +64,10 @@
6364
"ts-node": "9.1.1",
6465
"typescript": "4.2.3"
6566
},
67+
"peerDependencies": {
68+
"@opentelemetry/api": "^1.0.0-rc.0"
69+
},
6670
"dependencies": {
67-
"@opentelemetry/api": "^1.0.0-rc.0",
6871
"@opentelemetry/core": "^0.18.2",
6972
"@opentelemetry/semantic-conventions": "^0.18.2",
7073
"shimmer": "1.2.1"

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
},
4444
"devDependencies": {
4545
"@babel/core": "7.13.14",
46+
"@opentelemetry/api": "^1.0.0-rc.0",
4647
"@opentelemetry/context-zone": "^0.18.2",
4748
"@opentelemetry/propagator-b3": "^0.18.2",
4849
"@opentelemetry/tracing": "^0.18.2",
@@ -73,8 +74,10 @@
7374
"webpack-cli": "4.6.0",
7475
"webpack-merge": "5.7.3"
7576
},
77+
"peerDependencies": {
78+
"@opentelemetry/api": "^1.0.0-rc.0"
79+
},
7680
"dependencies": {
77-
"@opentelemetry/api": "^1.0.0-rc.0",
7881
"@opentelemetry/core": "^0.18.2",
7982
"@opentelemetry/instrumentation": "^0.18.2",
8083
"@opentelemetry/semantic-conventions": "^0.18.2",

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"devDependencies": {
4444
"@grpc/grpc-js": "1.2.12",
4545
"@grpc/proto-loader": "0.5.6",
46+
"@opentelemetry/api": "^1.0.0-rc.0",
4647
"@opentelemetry/context-async-hooks": "^0.18.2",
4748
"@opentelemetry/core": "^0.18.2",
4849
"@opentelemetry/node": "^0.18.2",
@@ -65,8 +66,10 @@
6566
"ts-node": "9.1.1",
6667
"typescript": "4.2.3"
6768
},
69+
"peerDependencies": {
70+
"@opentelemetry/api": "^1.0.0-rc.0"
71+
},
6872
"dependencies": {
69-
"@opentelemetry/api": "^1.0.0-rc.0",
7073
"@opentelemetry/api-metrics": "^0.18.2",
7174
"@opentelemetry/instrumentation": "^0.18.2",
7275
"@opentelemetry/semantic-conventions": "^0.18.2"

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"access": "public"
4242
},
4343
"devDependencies": {
44+
"@opentelemetry/api": "^1.0.0-rc.0",
4445
"@opentelemetry/context-async-hooks": "^0.18.2",
4546
"@opentelemetry/core": "^0.18.2",
4647
"@opentelemetry/node": "^0.18.2",
@@ -68,8 +69,10 @@
6869
"ts-node": "9.1.1",
6970
"typescript": "4.2.3"
7071
},
72+
"peerDependencies": {
73+
"@opentelemetry/api": "^1.0.0-rc.0"
74+
},
7175
"dependencies": {
72-
"@opentelemetry/api": "^1.0.0-rc.0",
7376
"@opentelemetry/instrumentation": "^0.18.2",
7477
"@opentelemetry/semantic-conventions": "^0.18.2",
7578
"semver": "^7.1.3"

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
},
4444
"devDependencies": {
4545
"@babel/core": "7.13.14",
46+
"@opentelemetry/api": "^1.0.0-rc.0",
4647
"@opentelemetry/context-zone": "^0.18.2",
4748
"@opentelemetry/propagator-b3": "^0.18.2",
4849
"@opentelemetry/tracing": "^0.18.2",
@@ -72,8 +73,10 @@
7273
"webpack-cli": "4.6.0",
7374
"webpack-merge": "5.7.3"
7475
},
76+
"peerDependencies": {
77+
"@opentelemetry/api": "^1.0.0-rc.0"
78+
},
7579
"dependencies": {
76-
"@opentelemetry/api": "^1.0.0-rc.0",
7780
"@opentelemetry/core": "^0.18.2",
7881
"@opentelemetry/instrumentation": "^0.18.2",
7982
"@opentelemetry/semantic-conventions": "^0.18.2",

‎packages/opentelemetry-instrumentation/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,17 @@
5454
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
5555
},
5656
"dependencies": {
57-
"@opentelemetry/api": "^1.0.0-rc.0",
5857
"@opentelemetry/api-metrics": "^0.18.2",
5958
"require-in-the-middle": "^5.0.3",
6059
"semver": "^7.3.2",
6160
"shimmer": "^1.2.1"
6261
},
62+
"peerDependencies": {
63+
"@opentelemetry/api": "^1.0.0-rc.0"
64+
},
6365
"devDependencies": {
6466
"@babel/core": "7.13.14",
67+
"@opentelemetry/api": "^1.0.0-rc.0",
6568
"@types/mocha": "8.2.2",
6669
"@types/node": "14.14.37",
6770
"@types/semver": "7.3.4",

‎packages/opentelemetry-metrics/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"access": "public"
4141
},
4242
"devDependencies": {
43+
"@opentelemetry/api": "^1.0.0-rc.0",
4344
"@types/lodash.merge": "4.6.6",
4445
"@types/mocha": "8.2.2",
4546
"@types/node": "14.14.37",
@@ -54,8 +55,10 @@
5455
"ts-node": "9.1.1",
5556
"typescript": "4.2.3"
5657
},
58+
"peerDependencies": {
59+
"@opentelemetry/api": "^1.0.0-rc.0"
60+
},
5761
"dependencies": {
58-
"@opentelemetry/api": "^1.0.0-rc.0",
5962
"@opentelemetry/api-metrics": "^0.18.2",
6063
"@opentelemetry/core": "^0.18.2",
6164
"@opentelemetry/resources": "^0.18.2",

‎packages/opentelemetry-node/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"access": "public"
4242
},
4343
"devDependencies": {
44+
"@opentelemetry/api": "^1.0.0-rc.0",
4445
"@opentelemetry/resources": "^0.18.2",
4546
"@types/mocha": "8.2.2",
4647
"@types/node": "14.14.37",
@@ -58,8 +59,10 @@
5859
"ts-node": "9.1.1",
5960
"typescript": "4.2.3"
6061
},
62+
"peerDependencies": {
63+
"@opentelemetry/api": "^1.0.0-rc.0"
64+
},
6165
"dependencies": {
62-
"@opentelemetry/api": "^1.0.0-rc.0",
6366
"@opentelemetry/context-async-hooks": "^0.18.2",
6467
"@opentelemetry/core": "^0.18.2",
6568
"@opentelemetry/tracing": "^0.18.2",

0 commit comments

Comments
 (0)