Merge branch 'egou/v7/feat/add-exclusive-time-and-measurements-to-spans' of github.com:getsentry/sentry-javascript into egou/v7/feat/create-interaction-spans-on-inp

Author: edwardgou-sentry

packages/core/src/tracing/span.ts

@@ -120,7 +120,6 @@ export class Span implements SpanInterface {
   protected _endTime?: number | undefined;
   /** Internal keeper of the status */
   protected _status?: SpanStatusType | string | undefined;
-  protected _exclusiveTime?: number;
 
   private _logMessage?: string;
 
@@ -165,9 +164,6 @@ export class Span implements SpanInterface {
     if (spanContext.endTimestamp) {
       this._endTime = spanContext.endTimestamp;
     }
-    if (spanContext.exclusiveTime) {
-      this._exclusiveTime = spanContext.exclusiveTime;
-    }
   }
 
   // This rule conflicts with another eslint rule :(
@@ -635,7 +631,6 @@ export class Span implements SpanInterface {
       trace_id: this._traceId,
       origin: this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] as SpanOrigin | undefined,
       _metrics_summary: getMetricSummaryJsonForSpan(this),
-      exclusive_time: this._exclusiveTime,
       measurements: this._attributes[SEMANTIC_ATTRIBUTE_MEASUREMENTS] as Measurements | undefined,
     });
   }

packages/core/test/lib/tracing/span.test.ts

@@ -105,9 +105,6 @@ describe('span', () => {
     it('disallows invalid attribute types', () => {
       const span = new Span();
 
-      /** @ts-expect-error this is invalid */
-      span.setAttribute('str', {});
-
       /** @ts-expect-error this is invalid */
       span.setAttribute('str', null);
 

packages/types/src/span.ts

@@ -30,6 +30,7 @@ export type SpanAttributes = Partial<{
   'sentry.op': string;
   'sentry.source': string;
   'sentry.sample_rate': number;
+  measurements: Measurements;
 }> &
   Record<string, SpanAttributeValue | undefined>;
 
@@ -180,11 +181,6 @@ export interface SpanContext {
    * The origin of the span, giving context about what created the span.
    */
   origin?: SpanOrigin | undefined;
-
-  /**
-   * Exclusive time in milliseconds.
-   */
-  exclusiveTime?: number;
 }
 
 /** Span holding trace_id, span_id */