Revert "feat(core): Add metric summaries to spans (#10432)" (#10495)

This reverts commit 94cdd8b.

I mistakenly merged this - we have to fix the metric summaries format.

Summaries are typed as `pub type MetricSummaryMapping =
Object<Array<MetricSummary>>;`

Which means that the `_metrics_summary` type needs to be
`_metrics_summary?: Record<string, Array<MetricSummary>>;`. This is
because we need to create separate entries if the tags have changed.

```
"c:processor.item_processed": [
    {
        "min": 1,
        "max": 1,
        "count": 3,
        "sum": 3,
        "tags": {"success": true}
    },
    {
        "min": 1,
        "max": 1,
        "count": 2,
        "sum": 2,
        "tags": {"success": false}
    }
],
```

Author: AbhiPrasad

dev-packages/node-integration-tests/suites/tracing/metric-summaries/scenario.js

@@ -6,9 +6,8 @@ import type {
   Primitive,
 } from '@sentry/types';
 import { timestampInSeconds } from '@sentry/utils';
-import { DEFAULT_FLUSH_INTERVAL, MAX_WEIGHT, NAME_AND_TAG_KEY_NORMALIZATION_REGEX, SET_METRIC_TYPE } from './constants';
+import { DEFAULT_FLUSH_INTERVAL, MAX_WEIGHT, NAME_AND_TAG_KEY_NORMALIZATION_REGEX } from './constants';
 import { METRIC_MAP } from './instance';
-import { updateMetricSummaryOnActiveSpan } from './metric-summary';
 import type { MetricBucket, MetricType } from './types';
 import { getBucketKey, sanitizeTags } from './utils';
 
@@ -63,11 +62,7 @@ export class MetricsAggregator implements MetricsAggregatorBase {
     const tags = sanitizeTags(unsanitizedTags);
 
     const bucketKey = getBucketKey(metricType, name, unit, tags);
-
     let bucketItem = this._buckets.get(bucketKey);
-    // If this is a set metric, we need to calculate the delta from the previous weight.
-    const previousWeight = bucketItem && metricType === SET_METRIC_TYPE ? bucketItem.metric.weight : 0;
-
     if (bucketItem) {
       bucketItem.metric.add(value);
       // TODO(abhi): Do we need this check?
@@ -87,10 +82,6 @@ export class MetricsAggregator implements MetricsAggregatorBase {
       this._buckets.set(bucketKey, bucketItem);
     }
 
-    // If value is a string, it's a set metric so calculate the delta from the previous weight.
-    const val = typeof value === 'string' ? bucketItem.metric.weight - previousWeight : value;
-    updateMetricSummaryOnActiveSpan(metricType, name, val, unit, unsanitizedTags, bucketKey);
-
     // We need to keep track of the total weight of the buckets so that we can
     // flush them when we exceed the max weight.
     this._bucketsTotalWeight += bucketItem.metric.weight;

dev-packages/node-integration-tests/suites/tracing/metric-summaries/test.ts

@@ -1,8 +1,14 @@
-import type { Client, ClientOptions, MeasurementUnit, MetricsAggregator, Primitive } from '@sentry/types';
+import type {
+  Client,
+  ClientOptions,
+  MeasurementUnit,
+  MetricBucketItem,
+  MetricsAggregator,
+  Primitive,
+} from '@sentry/types';
 import { timestampInSeconds } from '@sentry/utils';
-import { DEFAULT_BROWSER_FLUSH_INTERVAL, NAME_AND_TAG_KEY_NORMALIZATION_REGEX, SET_METRIC_TYPE } from './constants';
+import { DEFAULT_BROWSER_FLUSH_INTERVAL, NAME_AND_TAG_KEY_NORMALIZATION_REGEX } from './constants';
 import { METRIC_MAP } from './instance';
-import { updateMetricSummaryOnActiveSpan } from './metric-summary';
 import type { MetricBucket, MetricType } from './types';
 import { getBucketKey, sanitizeTags } from './utils';
 
@@ -40,33 +46,24 @@ export class BrowserMetricsAggregator implements MetricsAggregator {
     const tags = sanitizeTags(unsanitizedTags);
 
     const bucketKey = getBucketKey(metricType, name, unit, tags);
-
-    let bucketItem = this._buckets.get(bucketKey);
-    // If this is a set metric, we need to calculate the delta from the previous weight.
-    const previousWeight = bucketItem && metricType === SET_METRIC_TYPE ? bucketItem.metric.weight : 0;
-
+    const bucketItem: MetricBucketItem | undefined = this._buckets.get(bucketKey);
     if (bucketItem) {
       bucketItem.metric.add(value);
       // TODO(abhi): Do we need this check?
       if (bucketItem.timestamp < timestamp) {
         bucketItem.timestamp = timestamp;
       }
     } else {
-      bucketItem = {
+      this._buckets.set(bucketKey, {
         // @ts-expect-error we don't need to narrow down the type of value here, saves bundle size.
         metric: new METRIC_MAP[metricType](value),
         timestamp,
         metricType,
         name,
         unit,
         tags,
-      };
-      this._buckets.set(bucketKey, bucketItem);
+      });
     }
-
-    // If value is a string, it's a set metric so calculate the delta from the previous weight.
-    const val = typeof value === 'string' ? bucketItem.metric.weight - previousWeight : value;
-    updateMetricSummaryOnActiveSpan(metricType, name, val, unit, unsanitizedTags, bucketKey);
   }
 
   /**

packages/core/src/metrics/aggregator.ts

@@ -16,7 +16,6 @@ import type {
 import { dropUndefinedKeys, logger, timestampInSeconds, uuid4 } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
-import { getMetricSummaryJsonForSpan } from '../metrics/metric-summary';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes';
 import { getRootSpan } from '../utils/getRootSpan';
 import {
@@ -625,7 +624,6 @@ export class Span implements SpanInterface {
       timestamp: this._endTime,
       trace_id: this._traceId,
       origin: this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] as SpanOrigin | undefined,
-      _metrics_summary: getMetricSummaryJsonForSpan(this),
     });
   }
 

packages/core/src/metrics/browser-aggregator.ts

@@ -15,7 +15,6 @@ import { dropUndefinedKeys, logger } from '@sentry/utils';
 import { DEBUG_BUILD } from '../debug-build';
 import type { Hub } from '../hub';
 import { getCurrentHub } from '../hub';
-import { getMetricSummaryJsonForSpan } from '../metrics/metric-summary';
 import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../semanticAttributes';
 import { spanTimeInputToSeconds, spanToJSON, spanToTraceContext } from '../utils/spanUtils';
 import { getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
@@ -332,7 +331,6 @@ export class Transaction extends SpanClass implements TransactionInterface {
         capturedSpanIsolationScope,
         dynamicSamplingContext: getDynamicSamplingContextFromSpan(this),
       },
-      _metrics_summary: getMetricSummaryJsonForSpan(this),
       ...(source && {
         transaction_info: {
           source,

packages/core/src/metrics/metric-summary.ts

@@ -11,7 +11,7 @@ import type { Request } from './request';
 import type { CaptureContext } from './scope';
 import type { SdkInfo } from './sdkinfo';
 import type { Severity, SeverityLevel } from './severity';
-import type { MetricSummary, Span, SpanJSON } from './span';
+import type { Span, SpanJSON } from './span';
 import type { Thread } from './thread';
 import type { TransactionSource } from './transaction';
 import type { User } from './user';
@@ -73,7 +73,6 @@ export interface ErrorEvent extends Event {
 }
 export interface TransactionEvent extends Event {
   type: 'transaction';
-  _metrics_summary?: Record<string, MetricSummary>;
 }
 
 /** JSDoc */

packages/core/src/tracing/span.ts

@@ -99,7 +99,6 @@ export type {
   SpanJSON,
   SpanContextData,
   TraceFlag,
-  MetricSummary,
 } from './span';
 export type { StackFrame } from './stackframe';
 export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
@@ -151,9 +150,5 @@ export type {
 
 export type { BrowserClientReplayOptions, BrowserClientProfilingOptions } from './browseroptions';
 export type { CheckIn, MonitorConfig, FinishedCheckIn, InProgressCheckIn, SerializedCheckIn } from './checkin';
-export type {
-  MetricsAggregator,
-  MetricBucketItem,
-  MetricInstance,
-} from './metrics';
+export type { MetricsAggregator, MetricBucketItem, MetricInstance } from './metrics';
 export type { ParameterizedString } from './parameterize';

packages/core/src/tracing/transaction.ts

@@ -31,14 +31,6 @@ export type SpanAttributes = Partial<{
 }> &
   Record<string, SpanAttributeValue | undefined>;
 
-export type MetricSummary = {
-  min: number;
-  max: number;
-  count: number;
-  sum: number;
-  tags?: Record<string, Primitive> | undefined;
-};
-
 /** This type is aligned with the OpenTelemetry TimeInput type. */
 export type SpanTimeInput = HrTime | number | Date;
 
@@ -55,7 +47,6 @@ export interface SpanJSON {
   timestamp?: number;
   trace_id: string;
   origin?: SpanOrigin;
-  _metrics_summary?: Record<string, MetricSummary>;
 }
 
 // These are aligned with OpenTelemetry trace flags