ref: Remove usage of span tags

mydea · mydea · commit 060bcf8bb570 · 2024-02-26T12:19:40.000Z
Mostly, we rewrite this to just use attributes.
diff --git a/packages/angular/src/tracing.ts b/packages/angular/src/tracing.ts
@@ -144,8 +144,6 @@ export class TraceService implements OnDestroy {
             attributes: {
               [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular',
               [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-            },
-            tags: {
               url: strippedUrl,
               ...(navigationEvent.navigationTrigger && {
                 navigationTrigger: navigationEvent.navigationTrigger,
@@ -176,8 +174,7 @@ export class TraceService implements OnDestroy {
           name: `${navigationEvent.url}`,
           op: ANGULAR_ROUTING_OP,
           origin: 'auto.ui.angular',
-          tags: {
-            'routing.instrumentation': '@sentry/angular',
+          attributes: {
             url: strippedUrl,
             ...(navigationEvent.navigationTrigger && {
               navigationTrigger: navigationEvent.navigationTrigger,
diff --git a/packages/core/src/tracing/spanstatus.ts b/packages/core/src/tracing/spanstatus.ts
@@ -128,17 +128,7 @@ export function getSpanStatusFromHttpCode(httpStatus: number): SpanStatusType {
  * Additionally, the span's status is updated, depending on the http code.
  */
 export function setHttpStatus(span: Span, httpStatus: number): void {
-  // TODO (v8): Remove these calls
-  // Relay does not require us to send the status code as a tag
-  // For now, just because users might expect it to land as a tag we keep sending it.
-  // Same with data.
-  // In v8, we replace both, simply with
-  // span.setAttribute('http.response.status_code', httpStatus);
-
-  // eslint-disable-next-line deprecation/deprecation
-  span.setTag('http.status_code', String(httpStatus));
-  // eslint-disable-next-line deprecation/deprecation
-  span.setData('http.response.status_code', httpStatus);
+  span.setAttribute('http.response.status_code', httpStatus);
 
   const spanStatus = getSpanStatusFromHttpCode(httpStatus);
   if (spanStatus !== 'unknown_error') {
diff --git a/packages/core/test/lib/tracing/spanstatus.test.ts b/packages/core/test/lib/tracing/spanstatus.test.ts
@@ -20,22 +20,20 @@ describe('setHttpStatus', () => {
 
     setHttpStatus(span!, code);
 
-    const { status: spanStatus, data, tags } = spanToJSON(span!);
+    const { status: spanStatus, data } = spanToJSON(span!);
 
     expect(spanStatus).toBe(status);
     expect(data).toMatchObject({ 'http.response.status_code': code });
-    expect(tags).toMatchObject({ 'http.status_code': String(code) });
   });
 
   it("doesn't set the status for an unknown http status code", () => {
     const span = new SentrySpan({ name: 'test' });
 
     setHttpStatus(span!, 600);
 
-    const { status: spanStatus, data, tags } = spanToJSON(span!);
+    const { status: spanStatus, data } = spanToJSON(span!);
 
     expect(spanStatus).toBeUndefined();
     expect(data).toMatchObject({ 'http.response.status_code': 600 });
-    expect(tags).toMatchObject({ 'http.status_code': '600' });
   });
 });
diff --git a/packages/core/test/lib/utils/spanUtils.test.ts b/packages/core/test/lib/utils/spanUtils.test.ts
@@ -68,9 +68,6 @@ describe('spanToJSON', () => {
       parentSpanId: '1234',
       spanId: '5678',
       status: 'ok',
-      tags: {
-        foo: 'bar',
-      },
       traceId: 'abcd',
       origin: 'auto',
       startTimestamp: 123,
@@ -83,9 +80,6 @@ describe('spanToJSON', () => {
       parent_span_id: '1234',
       span_id: '5678',
       status: 'ok',
-      tags: {
-        foo: 'bar',
-      },
       trace_id: 'abcd',
       origin: 'auto',
       start_timestamp: 123,
diff --git a/packages/node/test/handlers.test.ts b/packages/node/test/handlers.test.ts
@@ -410,8 +410,6 @@ describe('tracingHandler', () => {
       // eslint-disable-next-line deprecation/deprecation
       expect(transaction.status).toBe('ok');
       expect(spanToJSON(transaction).status).toBe('ok');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.tags).toEqual(expect.objectContaining({ 'http.status_code': '200' }));
       expect(spanToJSON(transaction).data).toEqual(expect.objectContaining({ 'http.response.status_code': 200 }));
       done();
     });
diff --git a/packages/opentelemetry-node/src/index.ts b/packages/opentelemetry-node/src/index.ts
@@ -3,8 +3,3 @@ export { SentryPropagator } from './propagator';
 export { maybeCaptureExceptionForTimedEvent } from './utils/captureExceptionForTimedEvent';
 export { parseOtelSpanDescription } from './utils/parseOtelSpanDescription';
 export { mapOtelStatus } from './utils/mapOtelStatus';
-
-/* eslint-disable deprecation/deprecation */
-export { addOtelSpanData, getOtelSpanData, clearOtelSpanData } from './utils/spanData';
-export type { AdditionalOtelSpanData } from './utils/spanData';
-/* eslint-enable deprecation/deprecation */
diff --git a/packages/opentelemetry-node/src/utils/spanData.ts b/packages/opentelemetry-node/src/utils/spanData.ts
diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts
@@ -196,7 +196,7 @@ function makeWrappedDocumentRequestFunction(remixVersion?: number) {
           op: 'function.remix.document_request',
           origin: 'auto.function.remix',
           name: spanToJSON(activeTransaction).description,
-          tags: {
+          attributes: {
             method: request.method,
             url: request.url,
           },
@@ -253,7 +253,7 @@ function makeWrappedDataFunction(
         op: `function.remix.${name}`,
         origin: 'auto.ui.remix',
         name: id,
-        tags: {
+        attributes: {
           name,
         },
       });
@@ -412,8 +412,6 @@ export function startRequestHandlerTransaction(
     attributes: {
       [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.remix',
       [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
-    },
-    tags: {
       method: request.method,
     },
     ...traceparentData,
diff --git a/packages/tracing-internal/src/browser/metrics/index.ts b/packages/tracing-internal/src/browser/metrics/index.ts
@@ -448,15 +448,11 @@ function _trackNavigator(transaction: Transaction): void {
   const connection = navigator.connection;
   if (connection) {
     if (connection.effectiveType) {
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('effectiveConnectionType', connection.effectiveType);
+      transaction.setAttribute('effectiveConnectionType', connection.effectiveType);
     }
 
     if (connection.type) {
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('connectionType', connection.type);
+      transaction.setAttribute('connectionType', connection.type);
     }
 
     if (isMeasurementValue(connection.rtt)) {
@@ -465,15 +461,11 @@ function _trackNavigator(transaction: Transaction): void {
   }
 
   if (isMeasurementValue(navigator.deviceMemory)) {
-    // TODO: Can we rewrite this to an attribute?
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.setTag('deviceMemory', `${navigator.deviceMemory} GB`);
+    transaction.setAttribute('deviceMemory', `${navigator.deviceMemory} GB`);
   }
 
   if (isMeasurementValue(navigator.hardwareConcurrency)) {
-    // TODO: Can we rewrite this to an attribute?
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.setTag('hardwareConcurrency', String(navigator.hardwareConcurrency));
+    transaction.setAttribute('hardwareConcurrency', String(navigator.hardwareConcurrency));
   }
 }
 
@@ -485,36 +477,26 @@ function _tagMetricInfo(transaction: Transaction): void {
     // Capture Properties of the LCP element that contributes to the LCP.
 
     if (_lcpEntry.element) {
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('lcp.element', htmlTreeAsString(_lcpEntry.element));
+      transaction.setAttribute('lcp.element', htmlTreeAsString(_lcpEntry.element));
     }
 
     if (_lcpEntry.id) {
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('lcp.id', _lcpEntry.id);
+      transaction.setAttribute('lcp.id', _lcpEntry.id);
     }
 
     if (_lcpEntry.url) {
       // Trim URL to the first 200 characters.
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('lcp.url', _lcpEntry.url.trim().slice(0, 200));
+      transaction.setAttribute('lcp.url', _lcpEntry.url.trim().slice(0, 200));
     }
 
-    // TODO: Can we rewrite this to an attribute?
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.setTag('lcp.size', _lcpEntry.size);
+    transaction.setAttribute('lcp.size', _lcpEntry.size);
   }
 
   // See: https://developer.mozilla.org/en-US/docs/Web/API/LayoutShift
   if (_clsEntry && _clsEntry.sources) {
     DEBUG_BUILD && logger.log('[Measurements] Adding CLS Data');
     _clsEntry.sources.forEach((source, index) =>
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag(`cls.source.${index + 1}`, htmlTreeAsString(source.node)),
+      transaction.setAttribute(`cls.source.${index + 1}`, htmlTreeAsString(source.node)),
     );
   }
 }
