Skip to content

Commit 138eade

Browse files
MSNevMSNev
authored
Merge branch 'main' into inline-sources
2 parents bafebf8 + 69b925d commit 138eade

File tree

54 files changed

+264
-180
lines changed

Some content is hidden

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

54 files changed

+264
-180
lines changed

‎.github/workflows/unit-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
with:
104104
path: |
105105
experimental/node_modules
106-
experimental/packages/*/node_modules
106+
experimental/*/*/node_modules
107107
key: node-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('experimental/**/package.json') }}
108108

109109
- name: Bootstrap
@@ -143,7 +143,7 @@ jobs:
143143
with:
144144
path: |
145145
experimental/node_modules
146-
experimental/packages/*/node_modules
146+
experimental/*/*/node_modules
147147
key: browser-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
148148

149149
- name: Bootstrap

‎.github/workflows/w3c-integration-test.yml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
package-lock.json
2323
packages/*/package-lock.json
2424
benchmark/*/package-lock.json
25-
backwards-compatability/*/package-lock.json
2625
metapackages/*/package-lock.json
2726
packages/*/package-lock.json
2827
integration-tests/*/package-lock.json

‎CHANGELOG.md

+92
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,96 @@ All notable changes to this project will be documented in this file.
44

55
## Unreleased
66

7+
## 1.0.0
8+
9+
No changes
10+
11+
## 0.26.0
12+
13+
### :boom: Breaking Change
14+
15+
* `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-otlp-grpc`, `opentelemetry-exporter-otlp-http`, `opentelemetry-exporter-otlp-proto`
16+
* [#2476](https://github.com/open-telemetry/opentelemetry-js/pull/2476) chore!: rename collector exporters ([@dyladan](https://github.com/dyladan))
17+
* `opentelemetry-core`, `opentelemetry-instrumentation-grpc`, `opentelemetry-sdk-trace-base`, `opentelemetry-shim-opentracing`
18+
* [#2429](https://github.com/open-telemetry/opentelemetry-js/pull/2429) fix!: remove 'Http' from W3C propagator names ([@aabmass](https://github.com/aabmass))
19+
20+
### :rocket: (Enhancement)
21+
22+
* `opentelemetry-core`, `opentelemetry-sdk-trace-base`
23+
* [#2430](https://github.com/open-telemetry/opentelemetry-js/pull/2430) feat(opentelemetry-sdk-trace-base): implemented general limits of attributes ([@banothurameshnaik](https://github.com/banothurameshnaik))
24+
* [#2418](https://github.com/open-telemetry/opentelemetry-js/pull/2418) feat(opentelemetry-sdk-trace-base): implemented option to limit length of values of attributes ([@banothurameshnaik](https://github.com/banothurameshnaik))
25+
* `opentelemetry-instrumentation`
26+
* [#2450](https://github.com/open-telemetry/opentelemetry-js/pull/2450) fix: handle missing package.json file when checking for version ([@nozik](https://github.com/nozik))
27+
* `opentelemetry-semantic-conventions`
28+
* [#2456](https://github.com/open-telemetry/opentelemetry-js/pull/2456) feat: upgrade semantic conventions to the latest 1.6.1 version ([@weyert](https://github.com/weyert))
29+
* `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`
30+
* [#2438](https://github.com/open-telemetry/opentelemetry-js/pull/2438) feat: OTEL_EXPORTER_OTLP_ENDPOINT append version and signal ([@longility](https://github.com/longility))
31+
32+
### :bug: (Bug Fix)
33+
34+
* Other
35+
* [#2494](https://github.com/open-telemetry/opentelemetry-js/pull/2494) fix: remove setting http.route in http span attributes ([@mustafain117](https://github.com/mustafain117))
36+
* `opentelemetry-instrumentation-fetch`
37+
* [#2426](https://github.com/open-telemetry/opentelemetry-js/pull/2426) fix(opentelemetry-instrumentation-fetch): fixed override of headers ([@philipszalla](https://github.com/philipszalla))
38+
* `opentelemetry-sdk-trace-base`
39+
* [#2434](https://github.com/open-telemetry/opentelemetry-js/pull/2434) fix: ReferenceError when OTEL_TRACES_SAMPLER used without OTEL_TRACES_SAMPLER_ARG ([@hermanbanken](https://github.com/hermanbanken))
40+
41+
### :books: (Refine Doc)
42+
43+
* [#2478](https://github.com/open-telemetry/opentelemetry-js/pull/2478) Update links to packages moved to experimental ([@jessitron](https://github.com/jessitron))
44+
* [#2463](https://github.com/open-telemetry/opentelemetry-js/pull/2463) docs(README): Fix links in README.md ([@JamesJHPark](https://github.com/JamesJHPark))
45+
* [#2437](https://github.com/open-telemetry/opentelemetry-js/pull/2437) docs(examples): updated examples readme links ([@banothurameshnaik](https://github.com/banothurameshnaik))
46+
* [#2421](https://github.com/open-telemetry/opentelemetry-js/pull/2421) docs(website): support GH page links to canonical src ([@chalin](https://github.com/chalin))
47+
* [#2408](https://github.com/open-telemetry/opentelemetry-js/pull/2408) docs: make link to exporters filter only exporters ([@Rauno56](https://github.com/Rauno56))
48+
* [#2297](https://github.com/open-telemetry/opentelemetry-js/pull/2297) eslint configuration for getting-started examples ([@alisabzevari](https://github.com/alisabzevari))
49+
50+
### :house: (Internal)
51+
52+
* `opentelemetry-exporter-otlp-http`
53+
* [#2490](https://github.com/open-telemetry/opentelemetry-js/pull/2490) chore: mark otlp exporters experimental ([@dyladan](https://github.com/dyladan))
54+
* [#2491](https://github.com/open-telemetry/opentelemetry-js/pull/2491) fix: remove usage of serviceName property in tests for otel collector ([@mustafain117](https://github.com/mustafain117))
55+
* `opentelemetry-sdk-node`
56+
* [#2473](https://github.com/open-telemetry/opentelemetry-js/pull/2473) chore: move sdk-node to experimental ([@dyladan](https://github.com/dyladan))
57+
* [#2453](https://github.com/open-telemetry/opentelemetry-js/pull/2453) chore(sdk-node): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
58+
* Other
59+
* [#2469](https://github.com/open-telemetry/opentelemetry-js/pull/2469) Drop website_docs folder ([@chalin](https://github.com/chalin))
60+
* [#2474](https://github.com/open-telemetry/opentelemetry-js/pull/2474) chore: move missed test file to its package ([@dyladan](https://github.com/dyladan))
61+
* [#2435](https://github.com/open-telemetry/opentelemetry-js/pull/2435) chore: simplify unit test cache ([@dyladan](https://github.com/dyladan))
62+
* `opentelemetry-context-zone`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-propagator-b3`, `opentelemetry-propagator-jaeger`, `opentelemetry-resources`, `opentelemetry-sdk-metrics-base`, `opentelemetry-sdk-node`, `opentelemetry-sdk-trace-base`, `opentelemetry-sdk-trace-web`
63+
* [#2462](https://github.com/open-telemetry/opentelemetry-js/pull/2462) chore: split stable and experimental packages into groups using directories ([@dyladan](https://github.com/dyladan))
64+
* `opentelemetry-instrumentation-http`
65+
* [#2126](https://github.com/open-telemetry/opentelemetry-js/pull/2126) feat(instrumentation-http): add diag debug on http request events ([@Asafb26](https://github.com/Asafb26))
66+
* [#2455](https://github.com/open-telemetry/opentelemetry-js/pull/2455) chore(instrumentation-http): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
67+
* `opentelemetry-instrumentation-fetch`
68+
* [#2454](https://github.com/open-telemetry/opentelemetry-js/pull/2454) chore(instrumentation-fetch): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
69+
* `opentelemetry-exporter-collector`
70+
* [#2452](https://github.com/open-telemetry/opentelemetry-js/pull/2452) chore(exporter-collector): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
71+
* `opentelemetry-sdk-trace-base`, `opentelemetry-sdk-trace-node`
72+
* [#2446](https://github.com/open-telemetry/opentelemetry-js/pull/2446) chore(sdk-trace): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
73+
* `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-shim-opentracing`
74+
* [#2447](https://github.com/open-telemetry/opentelemetry-js/pull/2447) chore(exporter): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
75+
76+
### Committers: 18
77+
78+
* Aaron Abbott ([@aabmass](https://github.com/aabmass))
79+
* Ali Sabzevari ([@alisabzevari](https://github.com/alisabzevari))
80+
* Asaf Ben Aharon ([@Asafb26](https://github.com/Asafb26))
81+
* Banothu Ramesh Naik ([@banothurameshnaik](https://github.com/banothurameshnaik))
82+
* Daniel Dyla ([@dyladan](https://github.com/dyladan))
83+
* Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
84+
* Herman ([@hermanbanken](https://github.com/hermanbanken))
85+
* James ([@JamesJHPark](https://github.com/JamesJHPark))
86+
* Jessica Kerr ([@jessitron](https://github.com/jessitron))
87+
* Long Mai ([@longility](https://github.com/longility))
88+
* Mustafain Ali Khan ([@mustafain117](https://github.com/mustafain117))
89+
* Patrice Chalin ([@chalin](https://github.com/chalin))
90+
* Philip Szalla ([@philipszalla](https://github.com/philipszalla))
91+
* Ran Nozik ([@nozik](https://github.com/nozik))
92+
* Rauno Viskus ([@Rauno56](https://github.com/Rauno56))
93+
* Siim Kallas ([@seemk](https://github.com/seemk))
94+
* Weyert de Boer ([@weyert](https://github.com/weyert))
95+
* legendecas ([@legendecas](https://github.com/legendecas))
96+
797
## 0.25.0
898

999
### :boom: Breaking Change
@@ -20,6 +110,8 @@ All notable changes to this project will be documented in this file.
20110

21111
### :bug: (Bug Fix)
22112

113+
* `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-jaeger`, `opentelemetry-exporter-zipkin`, `opentelemetry-sdk-trace-base`
114+
* [#2499](https://github.com/open-telemetry/opentelemetry-js/pull/2499) fix: 2389- replaced logger unformatted strings with template literals ([@PaurushGarg](https://github.com/PaurushGarg))
23115
* `opentelemetry-instrumentation-fetch`
24116
* [#2411](https://github.com/open-telemetry/opentelemetry-js/pull/2411) fix(instrumentation-fetch): `fetch(string, Request)` silently drops request body ([@t2t2](https://github.com/t2t2))
25117
* `opentelemetry-sdk-trace-base`

‎backwards-compatability/node10/index.ts renamed to ‎experimental/backwards-compatability/node10/index.ts

File renamed without changes.

‎backwards-compatability/node10/package.json renamed to ‎experimental/backwards-compatability/node10/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "backcompat-node10",
3-
"version": "0.25.0",
3+
"version": "0.26.0",
44
"private": true,
55
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
66
"main": "index.js",
77
"scripts": {
8-
"test:backcompat": "tsc --noEmit index.ts"
8+
"test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
99
},
1010
"dependencies": {
1111
"@opentelemetry/sdk-node": "0.25.0",
12-
"@opentelemetry/sdk-trace-base": "0.25.0"
12+
"@opentelemetry/sdk-trace-base": "0.26.0"
1313
},
1414
"devDependencies": {
1515
"@types/node": "10.17.60",

‎backwards-compatability/node8/tsconfig.json renamed to ‎experimental/backwards-compatability/node10/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.es5.json",
2+
"extends": "../../../tsconfig.es5.json",
33
"compilerOptions": {
44
"rootDir": ".",
55
"outDir": "build"
@@ -9,7 +9,7 @@
99
],
1010
"references": [
1111
{
12-
"path": "../../packages/opentelemetry-sdk-trace-base"
12+
"path": "../../packages/opentelemetry-sdk-node"
1313
}
1414
]
1515
}

‎backwards-compatability/node12/index.ts renamed to ‎experimental/backwards-compatability/node12/index.ts

File renamed without changes.

‎backwards-compatability/node12/package.json renamed to ‎experimental/backwards-compatability/node12/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "backcompat-node12",
3-
"version": "0.25.0",
3+
"version": "0.26.0",
44
"private": true,
55
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
66
"main": "index.js",
77
"scripts": {
8-
"test:backcompat": "tsc --noEmit index.ts"
8+
"test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
99
},
1010
"dependencies": {
1111
"@opentelemetry/sdk-node": "0.25.0",
12-
"@opentelemetry/sdk-trace-base": "0.25.0"
12+
"@opentelemetry/sdk-trace-base": "0.26.0"
1313
},
1414
"devDependencies": {
1515
"@types/node": "12.20.20",

‎backwards-compatability/node10/tsconfig.json renamed to ‎experimental/backwards-compatability/node12/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.es5.json",
2+
"extends": "../../../tsconfig.es5.json",
33
"compilerOptions": {
44
"rootDir": ".",
55
"outDir": "build"
@@ -9,7 +9,7 @@
99
],
1010
"references": [
1111
{
12-
"path": "../../packages/opentelemetry-sdk-trace-base"
12+
"path": "../../packages/opentelemetry-sdk-node"
1313
}
1414
]
1515
}

‎backwards-compatability/node8/index.ts renamed to ‎experimental/backwards-compatability/node8/index.ts

File renamed without changes.

‎backwards-compatability/node8/package.json renamed to ‎experimental/backwards-compatability/node8/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "backcompat-node8",
3-
"version": "0.25.0",
3+
"version": "0.26.0",
44
"private": true,
55
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
66
"main": "index.js",
77
"scripts": {
8-
"test:backcompat": "tsc --noEmit index.ts"
8+
"test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
99
},
1010
"dependencies": {
1111
"@opentelemetry/sdk-node": "0.25.0",
12-
"@opentelemetry/sdk-trace-base": "0.25.0"
12+
"@opentelemetry/sdk-trace-base": "0.26.0"
1313
},
1414
"devDependencies": {
1515
"@types/node": "8.10.66",

‎backwards-compatability/node12/tsconfig.json renamed to ‎experimental/backwards-compatability/node8/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.es5.json",
2+
"extends": "../../../tsconfig.es5.json",
33
"compilerOptions": {
44
"rootDir": ".",
55
"outDir": "build"
@@ -9,7 +9,7 @@
99
],
1010
"references": [
1111
{
12-
"path": "../../packages/opentelemetry-sdk-trace-base"
12+
"path": "../../packages/opentelemetry-sdk-node"
1313
}
1414
]
1515
}

‎experimental/lerna.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version": "0.25.0",
44
"npmClient": "npm",
55
"packages": [
6-
"packages/*"
6+
"packages/*",
7+
"backwards-compatability/*"
78
]
89
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
"dependencies": {
7070
"@grpc/grpc-js": "^1.3.7",
7171
"@grpc/proto-loader": "^0.6.4",
72-
"@opentelemetry/core": "0.25.0",
72+
"@opentelemetry/core": "0.26.0",
7373
"@opentelemetry/exporter-otlp-http": "0.25.0",
7474
"@opentelemetry/sdk-metrics-base": "0.25.0",
75-
"@opentelemetry/resources": "0.25.0",
76-
"@opentelemetry/sdk-trace-base": "0.25.0"
75+
"@opentelemetry/resources": "0.26.0",
76+
"@opentelemetry/sdk-trace-base": "0.26.0"
7777
}
7878
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@
8787
},
8888
"dependencies": {
8989
"@opentelemetry/api-metrics": "0.25.0",
90-
"@opentelemetry/core": "0.25.0",
91-
"@opentelemetry/resources": "0.25.0",
90+
"@opentelemetry/core": "0.26.0",
91+
"@opentelemetry/resources": "0.26.0",
9292
"@opentelemetry/sdk-metrics-base": "0.25.0",
93-
"@opentelemetry/sdk-trace-base": "0.25.0"
93+
"@opentelemetry/sdk-trace-base": "0.26.0"
9494
}
9595
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@
6868
},
6969
"dependencies": {
7070
"@grpc/proto-loader": "^0.6.4",
71-
"@opentelemetry/core": "0.25.0",
71+
"@opentelemetry/core": "0.26.0",
7272
"@opentelemetry/exporter-otlp-http": "0.25.0",
7373
"@opentelemetry/sdk-metrics-base": "0.25.0",
74-
"@opentelemetry/resources": "0.25.0",
75-
"@opentelemetry/sdk-trace-base": "0.25.0",
74+
"@opentelemetry/resources": "0.26.0",
75+
"@opentelemetry/sdk-trace-base": "0.26.0",
7676
"protobufjs": "^6.9.0"
7777
}
7878
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
},
5959
"dependencies": {
6060
"@opentelemetry/api-metrics": "0.25.0",
61-
"@opentelemetry/core": "0.25.0",
61+
"@opentelemetry/core": "0.26.0",
6262
"@opentelemetry/sdk-metrics-base": "0.25.0"
6363
}
6464
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"devDependencies": {
5151
"@babel/core": "7.15.0",
5252
"@opentelemetry/api": "^1.0.2",
53-
"@opentelemetry/context-zone": "0.25.0",
54-
"@opentelemetry/propagator-b3": "0.25.0",
55-
"@opentelemetry/sdk-trace-base": "0.25.0",
53+
"@opentelemetry/context-zone": "0.26.0",
54+
"@opentelemetry/propagator-b3": "0.26.0",
55+
"@opentelemetry/sdk-trace-base": "0.26.0",
5656
"@types/mocha": "8.2.3",
5757
"@types/node": "14.17.11",
5858
"@types/sinon": "10.0.2",
@@ -81,9 +81,9 @@
8181
"@opentelemetry/api": "^1.0.2"
8282
},
8383
"dependencies": {
84-
"@opentelemetry/core": "0.25.0",
84+
"@opentelemetry/core": "0.26.0",
8585
"@opentelemetry/instrumentation": "0.25.0",
86-
"@opentelemetry/sdk-trace-web": "0.25.0",
87-
"@opentelemetry/semantic-conventions": "0.25.0"
86+
"@opentelemetry/sdk-trace-web": "0.26.0",
87+
"@opentelemetry/semantic-conventions": "0.26.0"
8888
}
8989
}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
"@grpc/grpc-js": "1.3.7",
4747
"@grpc/proto-loader": "0.6.4",
4848
"@opentelemetry/api": "^1.0.2",
49-
"@opentelemetry/context-async-hooks": "0.25.0",
50-
"@opentelemetry/core": "0.25.0",
51-
"@opentelemetry/sdk-trace-base": "0.25.0",
52-
"@opentelemetry/sdk-trace-node": "0.25.0",
49+
"@opentelemetry/context-async-hooks": "0.26.0",
50+
"@opentelemetry/core": "0.26.0",
51+
"@opentelemetry/sdk-trace-base": "0.26.0",
52+
"@opentelemetry/sdk-trace-node": "0.26.0",
5353
"@types/mocha": "8.2.3",
5454
"@types/node": "14.17.11",
5555
"@types/semver": "7.3.8",
@@ -71,6 +71,6 @@
7171
"dependencies": {
7272
"@opentelemetry/api-metrics": "0.25.0",
7373
"@opentelemetry/instrumentation": "0.25.0",
74-
"@opentelemetry/semantic-conventions": "0.25.0"
74+
"@opentelemetry/semantic-conventions": "0.26.0"
7575
}
7676
}

‎experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase {
185185
kind: SpanKind.SERVER,
186186
};
187187

188-
instrumentation._diag.debug('patch func: %s', JSON.stringify(spanOptions));
188+
instrumentation._diag.debug(`patch func: ${JSON.stringify(spanOptions)}`);
189189

190190
context.with(
191191
propagation.extract(ROOT_CONTEXT, call.metadata, {

‎experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase<
190190
kind: SpanKind.SERVER,
191191
};
192192

193-
instrumentation._diag.debug('patch func: %s', JSON.stringify(spanOptions));
193+
instrumentation._diag.debug(`patch func: ${JSON.stringify(spanOptions)}`);
194194

195195
context.with(
196196
propagation.extract(context.active(), call.metadata, {

‎experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
SpanKind,
2020
propagation, trace,
2121
} from '@opentelemetry/api';
22-
import { HttpTraceContextPropagator } from '@opentelemetry/core';
22+
import { W3CTraceContextPropagator } from '@opentelemetry/core';
2323
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
2424
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
2525
import { ContextManager } from '@opentelemetry/api';
@@ -386,7 +386,7 @@ export const runTests = (
386386
let contextManager: ContextManager;
387387

388388
before(() => {
389-
propagation.setGlobalPropagator(new HttpTraceContextPropagator());
389+
propagation.setGlobalPropagator(new W3CTraceContextPropagator());
390390
});
391391

392392
beforeEach(() => {

0 commit comments

Comments
 (0)