wip

Author: Lms24

packages/core/src/client.ts

@@ -508,6 +508,14 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
    */
   public on(hook: 'spanEnd', callback: (span: Span) => void): () => void;
 
+  /**
+   * Register a callback for after a span is ended.
+   * NOTE: The span cannot be mutated anymore in this callback.
+   * Receives the span as argument.
+   * @returns {() => void} A function that, when executed, removes the registered callback.
+   */
+  public on(hook: 'segmentSpanEnd', callback: (span: Span) => void): () => void;
+
   /**
    * Register a callback for when an idle span is allowed to auto-finish.
    * @returns {() => void} A function that, when executed, removes the registered callback.
@@ -730,6 +738,9 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
   /** Fire a hook whenever a span ends. */
   public emit(hook: 'spanEnd', span: Span): void;
 
+  /** Fire a hook whenever a segment span ends. */
+  public emit(hook: 'segmentSpanEnd', span: Span): void;
+
   /**
    * Fire a hook indicating that an idle span is allowed to auto finish.
    */

packages/core/src/tracing/sentrySpan.ts

@@ -298,6 +298,8 @@ export class SentrySpan implements Span {
       return;
     }
 
+    client?.emit('segmentSpanEnd', this);
+
     // if this is a standalone span, we send it immediately
     if (this._isStandaloneSpan) {
       if (this._sampled) {
@@ -310,6 +312,9 @@ export class SentrySpan implements Span {
         }
       }
       return;
+    } else if (client?.getOptions()._experiments?._INTERNAL_spanStreaming) {
+      // nothing to do here; the spanStreaming integration will listen to the respective client hook.
+      return;
     }
 
     const transactionEvent = this._convertSpanToTransaction();

packages/core/src/types-hoist/options.ts

@@ -282,6 +282,14 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
   _experiments?: {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     [key: string]: any;
+
+    /**
+     * DO NOT set this option manually.
+     *
+     * @internal, this option is only used and set internally.
+     * @hidden
+     */
+    _INTERNAL_spanStreaming?: boolean;
   };
 
   /**