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/semanticAttributes.ts

@@ -19,8 +19,3 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_OP = 'sentry.op';
  * Use this attribute to represent the origin of a span.
  */
 export const SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN = 'sentry.origin';
-
-/**
- * Use this attribute to represent measurements of a span.
- */
-export const SEMANTIC_ATTRIBUTE_MEASUREMENTS = 'measurements';

packages/core/src/tracing/span.ts

@@ -18,11 +18,7 @@ import { dropUndefinedKeys, logger, timestampInSeconds, uuid4 } from '@sentry/ut
 
 import { DEBUG_BUILD } from '../debug-build';
 import { getMetricSummaryJsonForSpan } from '../metrics/metric-summary';
-import {
-  SEMANTIC_ATTRIBUTE_MEASUREMENTS,
-  SEMANTIC_ATTRIBUTE_SENTRY_OP,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-} from '../semanticAttributes';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes';
 import { getRootSpan } from '../utils/getRootSpan';
 import {
   TRACE_FLAG_NONE,
@@ -122,6 +118,8 @@ export class Span implements SpanInterface {
   protected _status?: SpanStatusType | string | undefined;
   protected _exclusiveTime?: number;
 
+  protected _measurements: Measurements;
+
   private _logMessage?: string;
 
   /**
@@ -168,6 +166,7 @@ export class Span implements SpanInterface {
     if (spanContext.exclusiveTime) {
       this._exclusiveTime = spanContext.exclusiveTime;
     }
+    this._measurements = spanContext.measurements ? { ...spanContext.measurements } : {};
   }
 
   // This rule conflicts with another eslint rule :(
@@ -636,7 +635,7 @@ export class Span implements SpanInterface {
       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,
+      measurements: Object.keys(this._measurements).length > 0 ? this._measurements : undefined,
     });
   }
 

packages/core/src/tracing/transaction.ts

@@ -3,7 +3,6 @@ import type {
   Contexts,
   DynamicSamplingContext,
   MeasurementUnit,
-  Measurements,
   SpanTimeInput,
   Transaction as TransactionInterface,
   TransactionContext,
@@ -31,8 +30,6 @@ export class Transaction extends SpanClass implements TransactionInterface {
 
   protected _name: string;
 
-  private _measurements: Measurements;
-
   private _contexts: Contexts;
 
   private _trimEnd?: boolean | undefined;
@@ -53,7 +50,6 @@ export class Transaction extends SpanClass implements TransactionInterface {
    */
   public constructor(transactionContext: TransactionContext, hub?: Hub) {
     super(transactionContext);
-    this._measurements = {};
     this._contexts = {};
 
     // eslint-disable-next-line deprecation/deprecation

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

@@ -105,6 +105,9 @@ 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

@@ -22,15 +22,13 @@ export type SpanAttributeValue =
   | boolean
   | Array<null | undefined | string>
   | Array<null | undefined | number>
-  | Array<null | undefined | boolean>
-  | Measurements;
+  | Array<null | undefined | boolean>;
 
 export type SpanAttributes = Partial<{
   'sentry.origin': string;
   'sentry.op': string;
   'sentry.source': string;
   'sentry.sample_rate': number;
-  measurements: Measurements;
 }> &
   Record<string, SpanAttributeValue | undefined>;
 
@@ -186,6 +184,11 @@ export interface SpanContext {
    * Exclusive time in milliseconds.
    */
   exclusiveTime?: number;
+
+  /**
+   * Measurements of the Span.
+   */
+  measurements?: Measurements;
 }
 
 /** Span holding trace_id, span_id */