Skip to content

Commit 0704e73

Browse files
committed
- update dependency versions. Test is changed to
use new propery, instrumentationScope and replaced addSpanProcessor with new syntax of BasicTracerProvider constructor.
1 parent 604f833 commit 0704e73

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

plugins/node/opentelemetry-instrumentation-oracledb/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"author": "OpenTelemetry Authors",
3535
"license": "Apache-2.0",
3636
"engines": {
37-
"node": ">=14"
37+
"node": "^18.19.0 || >=20.6.0"
3838
},
3939
"files": [
4040
"build/src/**/*.js",
@@ -49,10 +49,10 @@
4949
},
5050
"devDependencies": {
5151
"@opentelemetry/api": "^1.3.0",
52-
"@opentelemetry/context-async-hooks": "^1.8.0",
53-
"@opentelemetry/contrib-test-utils": "^0.45.1",
54-
"@opentelemetry/sdk-trace-base": "^1.8.0",
55-
"@opentelemetry/sdk-trace-node": "^1.8.0",
52+
"@opentelemetry/context-async-hooks": "^2.0.0",
53+
"@opentelemetry/contrib-test-utils": "^0.46.0",
54+
"@opentelemetry/sdk-trace-base": "^2.0.0",
55+
"@opentelemetry/sdk-trace-node": "^2.0.0",
5656
"@types/mocha": "10.0.10",
5757
"@types/node": "18.18.14",
5858
"@types/sinon": "17.0.4",
@@ -63,10 +63,10 @@
6363
"safe-stable-stringify": "^2.4.1",
6464
"sinon": "15.2.0",
6565
"test-all-versions": "6.1.0",
66-
"typescript": "4.4.4"
66+
"typescript": "5.0.4"
6767
},
6868
"dependencies": {
69-
"@opentelemetry/instrumentation": "^0.57.2",
69+
"@opentelemetry/instrumentation": "^0.200.0",
7070
"@opentelemetry/semantic-conventions": "^1.27.0",
7171
"@types/oracledb": "6.5.2"
7272
},

plugins/node/opentelemetry-instrumentation-oracledb/test/oracle.test.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ import {
6161

6262
const memoryExporter = new InMemorySpanExporter();
6363
let contextManager: AsyncHooksContextManager;
64-
const provider = new BasicTracerProvider();
64+
const provider = new BasicTracerProvider({
65+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
66+
});
6567
const tracer = provider.getTracer('external');
6668
const instrumentation = new OracleInstrumentation();
6769
instrumentation.enable();
@@ -259,7 +261,7 @@ const verifySpanData = (
259261
if (parentSpan) {
260262
testUtils.assertPropagation(span, parentSpan as unknown as Span);
261263
} else {
262-
assert(span.parentSpanId === undefined);
264+
assert(span.parentSpanContext?.spanId === undefined);
263265
}
264266
};
265267

@@ -502,7 +504,6 @@ describe('oracledb', () => {
502504
}
503505
await doSetup();
504506
updateAttrSpanList(connection);
505-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
506507
contextManager = new AsyncHooksContextManager().enable();
507508
context.setGlobalContextManager(contextManager);
508509
instrumentation.setTracerProvider(provider);
@@ -1307,19 +1308,21 @@ describe('oracledb', () => {
13071308
);
13081309
assert.strictEqual(!!tracer, true);
13091310
assert.ok(tracer, 'Tracer instance should not be null');
1310-
assert.strictEqual(
1311-
tracer.instrumentationLibrary.name,
1312-
'@opentelemetry/instrumentation-oracledb'
1313-
);
1314-
13151311
const res = await connection.execute(sql);
13161312
try {
13171313
assert.ok(res);
13181314
verifySpans(null);
13191315
} catch (e: any) {
13201316
assert.ok(false, e.message);
13211317
}
1322-
const spans = memoryExporter.getFinishedSpans();
1318+
const spans = memoryExporter.getFinishedSpans().filter(s => {
1319+
assert.strictEqual(
1320+
s.instrumentationScope.name,
1321+
'@opentelemetry/instrumentation-oracledb',
1322+
`Unexpected span name: ${s.instrumentationScope.name}`
1323+
);
1324+
return true;
1325+
});
13231326
assert.strictEqual(spans.length, numExecSpans);
13241327
});
13251328
});

0 commit comments

Comments
 (0)