Skip to content

Commit 43fefee

Browse files
committed
instr-dataloader
1 parent e6deeaa commit 43fefee

File tree

3 files changed

+211
-19
lines changed

3 files changed

+211
-19
lines changed

package-lock.json

Lines changed: 201 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/node/instrumentation-dataloader/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"author": "OpenTelemetry Authors",
2929
"license": "Apache-2.0",
3030
"engines": {
31-
"node": ">=14"
31+
"node": "^18.19.0 || >=20.6.0"
3232
},
3333
"files": [
3434
"build/src/**/*.js",
@@ -43,9 +43,9 @@
4343
},
4444
"devDependencies": {
4545
"@opentelemetry/api": "^1.3.0",
46-
"@opentelemetry/context-async-hooks": "^1.8.0",
47-
"@opentelemetry/sdk-trace-base": "^1.8.0",
48-
"@opentelemetry/sdk-trace-node": "^1.8.0",
46+
"@opentelemetry/context-async-hooks": "^2.0.0-dev.1",
47+
"@opentelemetry/sdk-trace-base": "^2.0.0-dev.1",
48+
"@opentelemetry/sdk-trace-node": "^2.0.0-dev.1",
4949
"@types/mocha": "10.0.10",
5050
"@types/node": "18.18.14",
5151
"dataloader": "2.2.3",
@@ -55,7 +55,7 @@
5555
"typescript": "4.4.4"
5656
},
5757
"dependencies": {
58-
"@opentelemetry/instrumentation": "^0.57.2"
58+
"@opentelemetry/instrumentation": "^0.200.0-dev.1"
5959
},
6060
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme"
6161
}

plugins/node/instrumentation-dataloader/test/dataloader.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ describe('DataloaderInstrumentation', () => {
9292

9393
const [_, loadSpan] = memoryExporter.getFinishedSpans();
9494
assert.strictEqual(
95-
loadSpan.parentSpanId,
95+
loadSpan.parentSpanContext?.spanId,
9696
rootSpan.spanContext().spanId
9797
);
9898
}
@@ -110,7 +110,7 @@ describe('DataloaderInstrumentation', () => {
110110

111111
const [_, loadSpan] = memoryExporter.getFinishedSpans();
112112
assert.strictEqual(
113-
loadSpan.parentSpanId,
113+
loadSpan.parentSpanContext?.spanId,
114114
rootSpan.spanContext().spanId
115115
);
116116
}
@@ -188,7 +188,7 @@ describe('DataloaderInstrumentation', () => {
188188
assert.strictEqual(loadSpan.name, 'dataloader.load');
189189
assert.strictEqual(loadSpan.kind, SpanKind.CLIENT);
190190
assert.strictEqual(
191-
loadSpan.parentSpanId,
191+
loadSpan.parentSpanContext?.spanId,
192192
loadManySpan.spanContext().spanId
193193
);
194194
});
@@ -203,7 +203,7 @@ describe('DataloaderInstrumentation', () => {
203203

204204
const [, , loadManySpan] = memoryExporter.getFinishedSpans();
205205
assert.strictEqual(
206-
loadManySpan.parentSpanId,
206+
loadManySpan.parentSpanContext?.spanId,
207207
rootSpan.spanContext().spanId
208208
);
209209
}
@@ -221,7 +221,7 @@ describe('DataloaderInstrumentation', () => {
221221

222222
const [, , loadManySpan] = memoryExporter.getFinishedSpans();
223223
assert.strictEqual(
224-
loadManySpan.parentSpanId,
224+
loadManySpan.parentSpanContext?.spanId,
225225
rootSpan.spanContext().spanId
226226
);
227227
}

0 commit comments

Comments
 (0)