test

Author: mhennoch

packages/instrumentation-oracledb/src/OracleTelemetryTraceHandler.ts

@@ -25,6 +25,7 @@ import {
   trace,
   diag,
   TraceFlags,
+  SpanContext,
 } from '@opentelemetry/api';
 import {
   ATTR_DB_NAMESPACE,
@@ -64,10 +65,12 @@ function getTraceHandlerBaseClass(
   }
 }
 
-
-function _buildTraceparent(span: Span): string | undefined {
-  const sc = span.spanContext();
-  return `00-${sc.traceId}-${sc.spanId}-0${Number(sc.traceFlags || TraceFlags.NONE).toString(16)}`;
+export function buildTraceparent(
+  spanContext: SpanContext
+): string | undefined {
+  return `00-${spanContext.traceId}-${spanContext.spanId}-0${Number(
+    spanContext.traceFlags || TraceFlags.NONE
+  ).toString(16)}`;
 }
 
 export function getOracleTelemetryTraceHandlerClass(
@@ -367,8 +370,8 @@ export function getOracleTelemetryTraceHandlerClass(
             traceContext.operation === SpanNames.EXECUTE_MANY)
         ) {
           const connection = traceContext.additionalConfig?.self;
-          const traceparent = _buildTraceparent(
-            traceContext.userContext.span
+          const traceparent = buildTraceparent(
+            traceContext.userContext.span.spanContext()
           );
           if (connection && 'action' in connection && traceparent) {
             try {

packages/instrumentation-oracledb/test/oracle.test.ts

@@ -36,6 +36,7 @@ import {
 import * as assert from 'assert';
 import { OracleInstrumentation } from '../src';
 import { SpanNames } from '../src/constants';
+import { buildTraceparent} from '../src/OracleTelemetryTraceHandler';
 
 import {
   ATTR_DB_NAMESPACE,
@@ -512,6 +513,7 @@ describe('oracledb', () => {
     instrumentation.setConfig({
       enhancedDatabaseReporting: false,
       dbStatementDump: false,
+      traceContextPropagation: false,
     });
   });
 
@@ -963,6 +965,28 @@ describe('oracledb', () => {
       });
     });
 
+    it('should propagate trace context via connection.action when enabled', async () => {
+      instrumentation.setConfig({ traceContextPropagation: true });
+      const result = await connection.execute(
+        "select sys_context('USERENV', 'ACTION') as action from dual",
+        [],
+        { outFormat: oracledb.OUT_FORMAT_OBJECT }
+      );
+      const row = result.rows?.[0] as Record<string, string> | undefined;
+      const actionValue = row?.ACTION;        
+      const spans = memoryExporter.getFinishedSpans();
+      const executeSpan = spans[spans.length - 1];
+      assert.ok(executeSpan, 'expected span to verify trace propagation');
+      assert.ok(
+        executeSpan.name.startsWith(SpanNames.EXECUTE),
+        `expected execute span, got ${executeSpan.name}`
+      );
+      const expectedTraceparent = buildTraceparent(
+        executeSpan.spanContext()
+      );
+      assert.strictEqual(actionValue, expectedTraceparent);
+    });
+
     it('should intercept connection.execute(sql, values) bind-by-name', async () => {
       const span = tracer.startSpan('test span');
       await context.with(trace.setSpan(context.active(), span), async () => {