fix test & cleanup

Author: mydea

dev-packages/node-integration-tests/suites/tracing-experimental/hapi/test.ts

@@ -45,6 +45,11 @@ describe('hapi auto-instrumentation', () => {
 
   test('CJS - should handle returned plain errors in routes.', done => {
     createRunner(__dirname, 'scenario.js')
+      .expect({
+        transaction: {
+          transaction: 'GET /error',
+        },
+      })
       .expect({ event: EXPECTED_ERROR_EVENT })
       .expectError()
       .start(done)
@@ -53,6 +58,11 @@ describe('hapi auto-instrumentation', () => {
 
   test('CJS - should handle returned Boom errors in routes.', done => {
     createRunner(__dirname, 'scenario.js')
+      .expect({
+        transaction: {
+          transaction: 'GET /boom-error',
+        },
+      })
       .expect({ event: EXPECTED_ERROR_EVENT })
       .expectError()
       .start(done)
@@ -61,6 +71,11 @@ describe('hapi auto-instrumentation', () => {
 
   test('CJS - should handle promise rejections in routes.', done => {
     createRunner(__dirname, 'scenario.js')
+      .expect({
+        transaction: {
+          transaction: 'GET /promise-error',
+        },
+      })
       .expect({ event: EXPECTED_ERROR_EVENT })
       .expectError()
       .start(done)

dev-packages/node-integration-tests/suites/tracing-experimental/mysql/scenario-withoutCallback.js

@@ -24,7 +24,7 @@ connection.connect(function (err) {
   }
 });
 
-Sentry.startSpan(
+Sentry.startSpanManual(
   {
     op: 'transaction',
     name: 'Test Transaction',

packages/opentelemetry/src/spanExporter.ts

@@ -46,6 +46,7 @@ export class SentrySpanExporter {
     if (getLocalParentId(span)) {
       const openSpanCount = this._finishedSpans.length;
       DEBUG_BUILD && logger.log(`SpanExporter has ${openSpanCount} unsent spans remaining`);
+      this._cleanupOldSpans();
       return;
     }
 
@@ -72,17 +73,7 @@ export class SentrySpanExporter {
     DEBUG_BUILD &&
       logger.log(`SpanExporter exported ${sentSpanCount} spans, ${remainingOpenSpanCount} unsent spans remaining`);
 
-    this._finishedSpans = remainingSpans.filter(span => {
-      const shouldDrop = shouldCleanupSpan(span, 5 * 60);
-      DEBUG_BUILD &&
-        shouldDrop &&
-        logger.log(
-          `SpanExporter dropping span ${span.name} (${
-            span.spanContext().spanId
-          }) because it is pending for more than 5 minutes.`,
-        );
-      return !shouldDrop;
-    });
+    this._cleanupOldSpans(remainingSpans);
   }
 
   /** Clear the exporter. */
@@ -98,6 +89,24 @@ export class SentrySpanExporter {
       this._flushTimeout = undefined;
     }
   }
+
+  /**
+   * Remove any span that is older than 5min.
+   * We do this to avoid leaking memory.
+   */
+  private _cleanupOldSpans(spans = this._finishedSpans): void {
+    this._finishedSpans = spans.filter(span => {
+      const shouldDrop = shouldCleanupSpan(span, 5 * 60);
+      DEBUG_BUILD &&
+        shouldDrop &&
+        logger.log(
+          `SpanExporter dropping span ${span.name} (${
+            span.spanContext().spanId
+          }) because it is pending for more than 5 minutes.`,
+        );
+      return !shouldDrop;
+    });
+  }
 }
 
 /**