ensure nest js attached error to the correct span

highlight · Apr 17, 2024 · 72775a6 · 72775a6
1 parent bcb17ae
commit 72775a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/sdk/highlight-nest/src/index.ts b/sdk/highlight-nest/src/index.ts
@@ -111,7 +111,13 @@ export class HighlightInterceptor
 		const fn = api.context.bind(spanCtx, () =>
 			next.handle().pipe(
 				catchError((err) => {
-					NodeH.consumeError(err)
+					NodeH.consumeError(
+						err,
+						undefined,
+						undefined,
+						{},
+						{ span: requestSpan },
+					)
 					return throwError(() => err)
 				}),
 				finalize(() => {

diff --git a/sdk/highlight-node/src/client.ts b/sdk/highlight-node/src/client.ts
@@ -350,8 +350,9 @@ export class Highlight {
 		secureSessionId: string | undefined,
 		requestId: string | undefined,
 		metadata?: Attributes,
+		options?: { span: OtelSpan },
 	) {
-		let span = api.trace.getActiveSpan()
+		let span = options?.span ?? api.trace.getActiveSpan()
 		if (!span) {
 			span = this.tracer.startSpan('highlight.error')
 		}

diff --git a/sdk/highlight-node/src/sdk.ts b/sdk/highlight-node/src/sdk.ts
@@ -36,6 +36,7 @@ export interface HighlightInterface {
 		secureSessionId?: string,
 		requestId?: string,
 		metadata?: Attributes,
+		options?: { span: OtelSpan },
 	) => void
 	recordMetric: (
 		secureSessionId: string,
@@ -95,13 +96,15 @@ export const H: HighlightInterface = {
 		secureSessionId?: string,
 		requestId?: string,
 		metadata?: Attributes,
+		options?: { span: OtelSpan },
 	) => {
 		try {
 			highlight_obj.consumeCustomError(
 				error,
 				secureSessionId,
 				requestId,
 				metadata,
+				options,
 			)
 		} catch (e) {
 			console.warn('highlight-node consumeError error: ', e)