fix

Author: mydea

packages/opentelemetry-node/src/spanprocessor.ts

@@ -85,7 +85,7 @@ export class SentrySpanProcessor implements OtelSpanProcessor {
     // so we cannot use hub.getSpan(), as we cannot rely on this being on the current span
     const sentryParentSpan = otelParentSpanId && SENTRY_SPAN_PROCESSOR_MAP.get(otelParentSpanId);
 
-    if (this._strictSpanParentHandling && !!otelParentSpanId && !sentryParentSpan) {
+    if (this._strictSpanParentHandling && otelParentSpanId && !sentryParentSpan) {
       logger.warn(
         `SentrySpanProcessor could not find parent span with OTEL-spanId ${otelParentSpanId}. Dropping the span "${otelSpan.name}" with OTEL-spanID ${otelSpanId}...`,
       );
@@ -129,6 +129,7 @@ export class SentrySpanProcessor implements OtelSpanProcessor {
     if (!sentrySpan) {
       __DEBUG_BUILD__ &&
         logger.error(`SentrySpanProcessor could not find span with OTEL-spanId ${otelSpanId} to finish.`);
+      this._clearSpan(otelSpanId);
       return;
     }
 
@@ -312,6 +313,8 @@ function scheduleToClear(otelSpanId: string): void {
 
   if (!span) {
     // hmm, something is fishy here, but abort...
+    // But to be sure we still try to delete the SCHEDULE_TO_CLEAR, to avoid leaks
+    SCHEDULE_TO_CLEAR.delete(otelSpanId);
     return;
   }
 

packages/opentelemetry-node/test/spanprocessor.test.ts

@@ -937,7 +937,7 @@ describe('SentrySpanProcessor', () => {
       });
     });
 
-    it('aborts when encountering a missing parent reference xxx', () => {
+    it('aborts when encountering a missing parent reference', () => {
       const startTimestampMs = 1667381672309;
       const endTimestampMs = 1667381672875;
       const startTime = otelNumberToHrtime(startTimestampMs);
@@ -1004,11 +1004,9 @@ describe('SentrySpanProcessor', () => {
           child.end();
 
           expect(parentSpan).toBeDefined();
-          expect(childSpan).toBeDefined();
+          expect(childSpan).not.toBeDefined();
           expect(parentSpan).toBeInstanceOf(Transaction);
-          expect(childSpan).toBeInstanceOf(Transaction);
           expect(parentSpan?.endTimestamp).toBeDefined();
-          expect(childSpan?.endTimestamp).toBeDefined();
         });
       });
     });