Skip to content

Commit e37cdd8

Browse files
vmarchaudvmarchaud
authored
Merge branch 'main' into main
2 parents cb8768c + 90a4b4d commit e37cdd8

File tree

29 files changed

+174
-173
lines changed

29 files changed

+174
-173
lines changed

‎README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,10 @@ To request automatic tracing support for a module not on this list, please [file
245245

246246
## Upgrade guidelines
247247

248-
### 0.19.0 to 1.0.0-rc.0
248+
### 0.18.x to 0.19.0
249249

250250
- All plugins have been removed in favor of instrumentations.
251-
252-
### 0.18.0 to 0.19.0
253-
251+
254252
- The `@opentelemetry/propagator-b3` package previously exported three propagators: `B3Propagator`,`B3SinglePropagator`, and `B3MultiPropagator`, but now only exports the `B3Propagator`. It extracts b3 context in single and multi-header encodings, and injects context using the single-header encoding by default, but can be configured to inject context using the multi-header endcoding during construction: `new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER })`. If you were previously using the `B3SinglePropagator` or `B3MultiPropagator` directly, you should update your code to use the `B3Propagator` with the appropriate configuration. See the [readme](./packages/opentelemetry-propagator-b3/readme.md) for full details and usage.
255253

256254
### 0.17.0 to 0.18.0

‎backwards-compatability/node10/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"test:backcompat": "tsc --noEmit index.ts"
99
},
1010
"dependencies": {
11-
"@opentelemetry/sdk-node": "^0.18.2",
12-
"@opentelemetry/tracing": "^0.18.2"
11+
"@opentelemetry/sdk-node": "0.18.2",
12+
"@opentelemetry/tracing": "0.18.2"
1313
},
1414
"devDependencies": {
1515
"@types/node": "10.17.56",

‎backwards-compatability/node12/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"test:backcompat": "tsc --noEmit index.ts"
99
},
1010
"dependencies": {
11-
"@opentelemetry/sdk-node": "^0.18.2",
12-
"@opentelemetry/tracing": "^0.18.2"
11+
"@opentelemetry/sdk-node": "0.18.2",
12+
"@opentelemetry/tracing": "0.18.2"
1313
},
1414
"devDependencies": {
1515
"@types/node": "12.20.7",

‎backwards-compatability/node8/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"test:backcompat": "tsc --noEmit index.ts"
99
},
1010
"dependencies": {
11-
"@opentelemetry/sdk-node": "^0.18.2",
12-
"@opentelemetry/tracing": "^0.18.2"
11+
"@opentelemetry/sdk-node": "0.18.2",
12+
"@opentelemetry/tracing": "0.18.2"
1313
},
1414
"devDependencies": {
1515
"@types/node": "8.10.66",

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"compile": "tsc --build"
1212
},
1313
"dependencies": {
14-
"@opentelemetry/context-async-hooks": "^0.18.2",
15-
"@opentelemetry/core": "^0.18.2",
16-
"@opentelemetry/tracing": "^0.18.2",
14+
"@opentelemetry/context-async-hooks": "0.18.2",
15+
"@opentelemetry/core": "0.18.2",
16+
"@opentelemetry/tracing": "0.18.2",
1717
"axios": "0.21.1",
1818
"body-parser": "1.19.0",
1919
"express": "4.17.1"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"webpack-merge": "5.7.3"
6565
},
6666
"dependencies": {
67-
"@opentelemetry/context-zone-peer-dep": "^0.18.2",
67+
"@opentelemetry/context-zone-peer-dep": "0.18.2",
6868
"zone.js": "^0.11.0"
6969
},
7070
"sideEffects": true

‎packages/opentelemetry-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
},
5252
"devDependencies": {
5353
"@opentelemetry/api": "^1.0.0-rc.0",
54-
"@opentelemetry/propagator-b3": "^0.18.2",
54+
"@opentelemetry/propagator-b3": "0.18.2",
5555
"@types/mocha": "8.2.2",
5656
"@types/node": "14.14.37",
5757
"@types/semver": "7.3.4",

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"devDependencies": {
4848
"@babel/core": "7.13.14",
4949
"@opentelemetry/api": "^1.0.0-rc.0",
50-
"@opentelemetry/api-metrics": "^0.18.2",
50+
"@opentelemetry/api-metrics": "0.18.2",
5151
"@types/mocha": "8.2.2",
5252
"@types/node": "14.14.37",
5353
"@types/sinon": "9.0.11",
@@ -68,11 +68,11 @@
6868
},
6969
"dependencies": {
7070
"@grpc/proto-loader": "^0.5.4",
71-
"@opentelemetry/core": "^0.18.2",
72-
"@opentelemetry/exporter-collector": "^0.18.2",
73-
"@opentelemetry/metrics": "^0.18.2",
74-
"@opentelemetry/resources": "^0.18.2",
75-
"@opentelemetry/tracing": "^0.18.2",
71+
"@opentelemetry/core": "0.18.2",
72+
"@opentelemetry/exporter-collector": "0.18.2",
73+
"@opentelemetry/metrics": "0.18.2",
74+
"@opentelemetry/resources": "0.18.2",
75+
"@opentelemetry/tracing": "0.18.2",
7676
"grpc": "^1.24.2"
7777
}
7878
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"devDependencies": {
4848
"@babel/core": "7.13.14",
4949
"@opentelemetry/api": "^1.0.0-rc.0",
50-
"@opentelemetry/api-metrics": "^0.18.2",
50+
"@opentelemetry/api-metrics": "0.18.2",
5151
"@types/mocha": "8.2.2",
5252
"@types/node": "14.14.37",
5353
"@types/sinon": "9.0.11",
@@ -68,11 +68,11 @@
6868
},
6969
"dependencies": {
7070
"@grpc/proto-loader": "^0.5.4",
71-
"@opentelemetry/core": "^0.18.2",
72-
"@opentelemetry/exporter-collector": "^0.18.2",
73-
"@opentelemetry/metrics": "^0.18.2",
74-
"@opentelemetry/resources": "^0.18.2",
75-
"@opentelemetry/tracing": "^0.18.2",
71+
"@opentelemetry/core": "0.18.2",
72+
"@opentelemetry/exporter-collector": "0.18.2",
73+
"@opentelemetry/metrics": "0.18.2",
74+
"@opentelemetry/resources": "0.18.2",
75+
"@opentelemetry/tracing": "0.18.2",
7676
"protobufjs": "^6.9.0"
7777
}
7878
}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181
"@opentelemetry/api": "^1.0.0-rc.0"
8282
},
8383
"dependencies": {
84-
"@opentelemetry/api-metrics": "^0.18.2",
85-
"@opentelemetry/core": "^0.18.2",
86-
"@opentelemetry/metrics": "^0.18.2",
87-
"@opentelemetry/resources": "^0.18.2",
88-
"@opentelemetry/tracing": "^0.18.2"
84+
"@opentelemetry/api-metrics": "0.18.2",
85+
"@opentelemetry/core": "0.18.2",
86+
"@opentelemetry/metrics": "0.18.2",
87+
"@opentelemetry/resources": "0.18.2",
88+
"@opentelemetry/tracing": "0.18.2"
8989
}
9090
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
"devDependencies": {
4343
"@opentelemetry/api": "^1.0.0-rc.0",
44-
"@opentelemetry/resources": "^0.18.2",
44+
"@opentelemetry/resources": "0.18.2",
4545
"@types/mocha": "8.2.2",
4646
"@types/node": "14.14.37",
4747
"@types/sinon": "9.0.11",
@@ -60,8 +60,8 @@
6060
"@opentelemetry/api": "^1.0.0-rc.0"
6161
},
6262
"dependencies": {
63-
"@opentelemetry/core": "^0.18.2",
64-
"@opentelemetry/tracing": "^0.18.2",
63+
"@opentelemetry/core": "0.18.2",
64+
"@opentelemetry/tracing": "0.18.2",
6565
"jaeger-client": "^3.15.0"
6666
}
6767
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"@opentelemetry/api": "^1.0.0-rc.0"
5858
},
5959
"dependencies": {
60-
"@opentelemetry/api-metrics": "^0.18.2",
61-
"@opentelemetry/core": "^0.18.2",
62-
"@opentelemetry/metrics": "^0.18.2"
60+
"@opentelemetry/api-metrics": "0.18.2",
61+
"@opentelemetry/core": "0.18.2",
62+
"@opentelemetry/metrics": "0.18.2"
6363
}
6464
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
"@opentelemetry/api": "^1.0.0-rc.0"
8080
},
8181
"dependencies": {
82-
"@opentelemetry/core": "^0.18.2",
83-
"@opentelemetry/resources": "^0.18.2",
84-
"@opentelemetry/tracing": "^0.18.2"
82+
"@opentelemetry/core": "0.18.2",
83+
"@opentelemetry/resources": "0.18.2",
84+
"@opentelemetry/tracing": "0.18.2"
8585
}
8686
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
"devDependencies": {
4545
"@babel/core": "7.13.14",
4646
"@opentelemetry/api": "^1.0.0-rc.0",
47-
"@opentelemetry/context-zone": "^0.18.2",
48-
"@opentelemetry/propagator-b3": "^0.18.2",
49-
"@opentelemetry/tracing": "^0.18.2",
47+
"@opentelemetry/context-zone": "0.18.2",
48+
"@opentelemetry/propagator-b3": "0.18.2",
49+
"@opentelemetry/tracing": "0.18.2",
5050
"@types/mocha": "8.2.2",
5151
"@types/node": "14.14.37",
5252
"@types/shimmer": "1.0.1",
@@ -78,9 +78,9 @@
7878
"@opentelemetry/api": "^1.0.0-rc.0"
7979
},
8080
"dependencies": {
81-
"@opentelemetry/core": "^0.18.2",
82-
"@opentelemetry/instrumentation": "^0.18.2",
83-
"@opentelemetry/semantic-conventions": "^0.18.2",
84-
"@opentelemetry/web": "^0.18.2"
81+
"@opentelemetry/core": "0.18.2",
82+
"@opentelemetry/instrumentation": "0.18.2",
83+
"@opentelemetry/semantic-conventions": "0.18.2",
84+
"@opentelemetry/web": "0.18.2"
8585
}
8686
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
"@grpc/grpc-js": "1.2.12",
4545
"@grpc/proto-loader": "0.5.6",
4646
"@opentelemetry/api": "^1.0.0-rc.0",
47-
"@opentelemetry/context-async-hooks": "^0.18.2",
48-
"@opentelemetry/core": "^0.18.2",
49-
"@opentelemetry/node": "^0.18.2",
50-
"@opentelemetry/tracing": "^0.18.2",
47+
"@opentelemetry/context-async-hooks": "0.18.2",
48+
"@opentelemetry/core": "0.18.2",
49+
"@opentelemetry/node": "0.18.2",
50+
"@opentelemetry/tracing": "0.18.2",
5151
"@types/mocha": "8.2.2",
5252
"@types/node": "14.14.37",
5353
"@types/semver": "7.3.4",
@@ -70,8 +70,8 @@
7070
"@opentelemetry/api": "^1.0.0-rc.0"
7171
},
7272
"dependencies": {
73-
"@opentelemetry/api-metrics": "^0.18.2",
74-
"@opentelemetry/instrumentation": "^0.18.2",
75-
"@opentelemetry/semantic-conventions": "^0.18.2"
73+
"@opentelemetry/api-metrics": "0.18.2",
74+
"@opentelemetry/instrumentation": "0.18.2",
75+
"@opentelemetry/semantic-conventions": "0.18.2"
7676
}
7777
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
},
4343
"devDependencies": {
4444
"@opentelemetry/api": "^1.0.0-rc.0",
45-
"@opentelemetry/context-async-hooks": "^0.18.2",
46-
"@opentelemetry/core": "^0.18.2",
47-
"@opentelemetry/node": "^0.18.2",
48-
"@opentelemetry/tracing": "^0.18.2",
45+
"@opentelemetry/context-async-hooks": "0.18.2",
46+
"@opentelemetry/core": "0.18.2",
47+
"@opentelemetry/node": "0.18.2",
48+
"@opentelemetry/tracing": "0.18.2",
4949
"@types/got": "9.6.11",
5050
"@types/mocha": "8.2.2",
5151
"@types/node": "14.14.37",
@@ -73,8 +73,8 @@
7373
"@opentelemetry/api": "^1.0.0-rc.0"
7474
},
7575
"dependencies": {
76-
"@opentelemetry/instrumentation": "^0.18.2",
77-
"@opentelemetry/semantic-conventions": "^0.18.2",
76+
"@opentelemetry/instrumentation": "0.18.2",
77+
"@opentelemetry/semantic-conventions": "0.18.2",
7878
"semver": "^7.1.3"
7979
}
8080
}

0 commit comments

Comments
 (0)