reduce to standalone: boolean; remove segment

Author: Lms24

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/segment-false/subject.js

@@ -1,12 +1,12 @@
 import { expect } from '@playwright/test';
 import type { SpanEnvelope } from '@sentry/types';
 
-import { sentryTest } from '../../../../../utils/fixtures';
+import { sentryTest } from '../../../../utils/fixtures';
 import {
   getFirstSentryEnvelopeRequest,
   properFullEnvelopeRequestParser,
   shouldSkipTracingTest,
-} from '../../../../../utils/helpers';
+} from '../../../../utils/helpers';
 
 sentryTest('sends a segment span envelope', async ({ getLocalTestPath, page }) => {
   if (shouldSkipTracingTest()) {

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/segment-false/test.ts

@@ -63,9 +63,6 @@ export class SentrySpan implements Span {
   /** if true, treat span as a standalone span (not part of a transaction) */
   private _isStandaloneSpan?: boolean;
 
-  /** send standalone span as segment span */
-  private _isSegmentSpan?: boolean;
-
   /**
    * You should never call the constructor manually, always use `Sentry.startSpan()`
    * or other span methods.
@@ -106,7 +103,6 @@ export class SentrySpan implements Span {
     }
 
     this._isStandaloneSpan = spanContext.isStandalone;
-    this._isSegmentSpan = spanContext.isStandalone && spanContext.isSegment;
   }
 
   /** @inheritdoc */
@@ -199,8 +195,8 @@ export class SentrySpan implements Span {
       profile_id: this._attributes[SEMANTIC_ATTRIBUTE_PROFILE_ID] as string | undefined,
       exclusive_time: this._attributes[SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME] as number | undefined,
       measurements: timedEventsToMeasurements(this._events),
-      is_segment: !this._isStandaloneSpan ? undefined : this._isSegmentSpan,
-      segment_id: this._isStandaloneSpan && this._isSegmentSpan ? this._spanId : undefined,
+      is_segment: this._isStandaloneSpan || undefined,
+      segment_id: this._isStandaloneSpan ? this._spanId : undefined,
     });
   }
 
@@ -240,7 +236,8 @@ export class SentrySpan implements Span {
       client.emit('spanEnd', this);
     }
 
-    // If this is not a root span, we're done, otherwise, we send it when it is ended
+    // If this is not a root span (== segment span) and we don't want to send it standalone, we're done.
+    // otherwise, we send it
     if (this !== getRootSpan(this)) {
       return;
     }
@@ -289,6 +286,7 @@ export class SentrySpan implements Span {
     // The transaction span itself should be filtered out
     const finishedSpans = getSpanDescendants(this).filter(span => span !== this);
 
+    // TODO: filter out standalone spans!
     const spans = finishedSpans.map(span => spanToJSON(span)).filter(isFullFinishedSpan);
 
     const source = this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] as TransactionSource | undefined;

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/segment-true/subject.js

@@ -294,7 +294,6 @@ function normalizeContext(context: StartSpanOptions): SentrySpanArguments {
   const exp = context.experimental || {};
   const initialCtx: SentrySpanArguments = {
     isStandalone: exp.standalone,
-    isSegment: exp.standalone && exp.segment,
     ...context,
   };
 

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/segment-undefined/test.ts

@@ -552,12 +552,12 @@ describe('startSpan', () => {
     expect(result).toBe('aha');
   });
 
-  describe('[experimental] standalone and segment', () => {
-    it('starts a standalone segment span if both options are set', () => {
+  describe('[experimental] standalone spans', () => {
+    it('starts a standalone segment span if standalone is set', () => {
       const span = startSpan(
         {
           name: 'test span',
-          experimental: { standalone: true, segment: true },
+          experimental: { standalone: true },
         },
         span => {
           return span;
@@ -570,43 +570,11 @@ describe('startSpan', () => {
       expect(spanJson.segment_id).toMatch(/^[a-f0-9]{16}$/);
     });
 
-    it('starts a non-segment span if standalone is set and segment is false', () => {
-      const span = startSpan(
-        {
-          name: 'test span',
-          experimental: { standalone: true, segment: false },
-        },
-        span => {
-          return span;
-        },
-      );
-
-      const spanJson = spanToJSON(span);
-      expect(spanJson.is_segment).toBe(false);
-      expect(spanJson.segment_id).toBeUndefined();
-    });
-
-    it('starts a standalone span (no data about segment) if only standalone is set ', () => {
-      const span = startSpan(
-        {
-          name: 'test span',
-          experimental: { standalone: true },
-        },
-        span => {
-          return span;
-        },
-      );
-
-      const spanJson = spanToJSON(span);
-      expect(spanJson.is_segment).toBeUndefined();
-      expect(spanJson.segment_id).toBeUndefined();
-    });
-
-    it.each([undefined, false])('ignores segment if standalone is falsy (%s)', standalone => {
+    it.each([undefined, false])("doesn't set segment properties if standalone is falsy (%s)", standalone => {
       const span = startSpan(
         {
           name: 'test span',
-          experimental: { standalone, segment: true },
+          experimental: { standalone },
         },
         span => {
           return span;

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/segment-undefined/subject.js renamed to dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/subject.js

@@ -191,23 +191,13 @@ export interface SentrySpanArguments {
   endTimestamp?: number | undefined;
 
   /**
-   * Set to `true` if this span should be sent as a standalone span as
-   * opposed to a transaction.
+   * Set to `true` if this span should be sent as a standalone segment span
+   * as opposed to a transaction.
    *
    * @experimental this option is currently experimental and should only be
    * used within SDK code. It might be removed or changed in the future.
    */
   isStandalone?: boolean | undefined;
-
-  /**
-   * Set to `true` if this span is a segment span. For now, this is used for
-   * standalone single spans that are not part of a transaction but should
-   * show up in the Sentry UI (as opposed to a non-segment standalone span).
-   *
-   * @experimental this option is currently experimental and should only be
-   * used within SDK code. It might be removed or changed in the future.
-   */
-  isSegment?: boolean | undefined;
 }
 
 /**

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/segment-true/test.ts renamed to dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts

@@ -33,7 +33,7 @@ export interface StartSpanOptions {
   experimental?: {
     /**
      * If set to true, always start a standalone span which will be sent as a
-     * standalone span envelope instead of a transaction envelope.
+     * standalone segment span envelope instead of a transaction envelope.
      *
      * @internal this option is currently experimental and should only be
      * used within SDK code. It might be removed or changed in the future.
@@ -43,18 +43,5 @@ export interface StartSpanOptions {
      * @hidden
      */
     standalone?: boolean;
-
-    /**
-     * If set to true and `standalone` is also set to `true`, the span will be
-     * sent as a standalone segment span (with `is_segment: true` and `segment_id`).
-     *
-     * If `standalone` is not set to `true`, this option has no effect.
-     *
-     * @internal this option is currently experimental and should only be
-     * used within SDK code. It might be removed or changed in the future.
-     *
-     * @hidden
-     */
-    segment?: boolean;
   };
 }