fix(browser): Fix idle span ending

Author: mydea

packages/core/src/tracing/idleSpan.ts

@@ -100,9 +100,11 @@ export function startIdleSpan(startSpanOptions: StartSpanOptions, options: Parti
     idleTimeout = TRACING_DEFAULTS.idleTimeout,
     finalTimeout = TRACING_DEFAULTS.finalTimeout,
     childSpanTimeout = TRACING_DEFAULTS.childSpanTimeout,
-    beforeSpanEnd,
   } = options;
 
+  // We reset this to undefined when this is called the first time
+  let beforeSpanEnd = options.beforeSpanEnd;
+
   const client = getClient();
 
   if (!client || !hasTracingEnabled()) {
@@ -114,6 +116,12 @@ export function startIdleSpan(startSpanOptions: StartSpanOptions, options: Parti
   const span = _startIdleSpan(startSpanOptions);
 
   function _endSpan(timestamp: number = timestampInSeconds()): void {
+    // Ensure to call this before the span is actually ended
+    if (beforeSpanEnd) {
+      beforeSpanEnd(span);
+      beforeSpanEnd = undefined;
+    }
+
     // Ensure we end with the last span timestamp, if possible
     const spans = getSpanDescendants(span).filter(child => child !== span);
 
@@ -227,8 +235,13 @@ export function startIdleSpan(startSpanOptions: StartSpanOptions, options: Parti
     _finished = true;
     activities.clear();
 
+    // If the span is idle-finished, this was already called in _endSpan
+    // But if the span is manually finished, we ensure to still call this here
+    // this is a bit later, as at this point the span is already ended,
+    // but better late than never!
     if (beforeSpanEnd) {
       beforeSpanEnd(span);
+      beforeSpanEnd = undefined;
     }
 
     _setSpanForScope(scope, previousActiveSpan);