From 232d52c76c6a57255e83e2fa792f5861e729d979 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 27 Jul 2026 15:14:35 +0200 Subject: [PATCH] ref(opentelemetry): Remove orphaned code --- packages/opentelemetry/src/constants.ts | 10 --- .../opentelemetry/src/semanticAttributes.ts | 2 - .../src/utils/getRequestSpanData.ts | 43 ----------- .../test/utils/getRequestSpanData.test.ts | 74 ------------------- 4 files changed, 129 deletions(-) delete mode 100644 packages/opentelemetry/src/semanticAttributes.ts delete mode 100644 packages/opentelemetry/src/utils/getRequestSpanData.ts delete mode 100644 packages/opentelemetry/test/utils/getRequestSpanData.test.ts diff --git a/packages/opentelemetry/src/constants.ts b/packages/opentelemetry/src/constants.ts index 699868e3290a..5b2b6c4c5211 100644 --- a/packages/opentelemetry/src/constants.ts +++ b/packages/opentelemetry/src/constants.ts @@ -6,8 +6,6 @@ export const SENTRY_BAGGAGE_HEADER = 'baggage'; export const SENTRY_TRACE_STATE_DSC = 'sentry.dsc'; export const SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING = 'sentry.sampled_not_recording'; export const SENTRY_TRACE_STATE_URL = 'sentry.url'; -export const SENTRY_TRACE_STATE_SAMPLE_RAND = 'sentry.sample_rand'; -export const SENTRY_TRACE_STATE_SAMPLE_RATE = 'sentry.sample_rate'; /** * A flag marking a context as ignored because the span associated with the context @@ -15,14 +13,6 @@ export const SENTRY_TRACE_STATE_SAMPLE_RATE = 'sentry.sample_rate'; */ export const SENTRY_TRACE_STATE_CHILD_IGNORED = 'sentry.ignored'; -/** - * A flag marking a segment span as ignored because it matched the `ignoreSpans` filter. - * Unlike `SENTRY_TRACE_STATE_CHILD_IGNORED` (used for child spans), this flag is NOT consumed - * by the context manager for re-parenting. Instead, it propagates to child spans so they - * can record the correct client report outcome (`ignored` instead of `sample_rate`). - */ -export const SENTRY_TRACE_STATE_SEGMENT_IGNORED = 'sentry.segment_ignored'; - export const SENTRY_SCOPES_CONTEXT_KEY = createContextKey('sentry_scopes'); export const SENTRY_FORK_ISOLATION_SCOPE_CONTEXT_KEY = createContextKey('sentry_fork_isolation_scope'); diff --git a/packages/opentelemetry/src/semanticAttributes.ts b/packages/opentelemetry/src/semanticAttributes.ts deleted file mode 100644 index 80a80f87a666..000000000000 --- a/packages/opentelemetry/src/semanticAttributes.ts +++ /dev/null @@ -1,2 +0,0 @@ -/** If this attribute is true, it means that the parent is a remote span. */ -export const SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE = 'sentry.parentIsRemote'; diff --git a/packages/opentelemetry/src/utils/getRequestSpanData.ts b/packages/opentelemetry/src/utils/getRequestSpanData.ts deleted file mode 100644 index 256d39b90272..000000000000 --- a/packages/opentelemetry/src/utils/getRequestSpanData.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { HTTP_METHOD, HTTP_REQUEST_METHOD, HTTP_URL, URL_FULL } from '@sentry/conventions/attributes'; -import type { SanitizedRequestData, Span } from '@sentry/core'; -import { getSanitizedUrlString, parseUrl, spanToJSON } from '@sentry/core'; - -/** - * Get sanitized request data from a span. - */ -export function getRequestSpanData(span: Span): Partial { - const attributes = spanToJSON(span).data; - - // eslint-disable-next-line typescript/no-deprecated - const maybeUrlAttribute = (attributes[URL_FULL] || attributes[HTTP_URL]) as string | undefined; - - const data: Partial = { - url: maybeUrlAttribute, - // eslint-disable-next-line typescript/no-deprecated - 'http.method': (attributes[HTTP_REQUEST_METHOD] || attributes[HTTP_METHOD]) as string | undefined, - }; - - // Default to GET if URL is set but method is not - if (!data['http.method'] && data.url) { - data['http.method'] = 'GET'; - } - - try { - if (typeof maybeUrlAttribute === 'string') { - const url = parseUrl(maybeUrlAttribute); - - data.url = getSanitizedUrlString(url); - - if (url.search) { - data['http.query'] = url.search; - } - if (url.hash) { - data['http.fragment'] = url.hash; - } - } - } catch { - // ignore - } - - return data; -} diff --git a/packages/opentelemetry/test/utils/getRequestSpanData.test.ts b/packages/opentelemetry/test/utils/getRequestSpanData.test.ts deleted file mode 100644 index 94986a116f83..000000000000 --- a/packages/opentelemetry/test/utils/getRequestSpanData.test.ts +++ /dev/null @@ -1,74 +0,0 @@ -/* eslint-disable typescript/no-deprecated */ -import type { Span } from '@opentelemetry/api'; -import { trace } from '@opentelemetry/api'; -import { HTTP_METHOD, HTTP_URL } from '@sentry/conventions/attributes'; -import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import { getRequestSpanData } from '../../src/utils/getRequestSpanData'; -import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit'; - -describe('getRequestSpanData', () => { - beforeEach(() => { - mockSdkInit(); - }); - - afterEach(() => { - return cleanupOtel(); - }); - - function createSpan(name: string): Span { - return trace.getTracer('test').startSpan(name); - } - - it('works with basic span', () => { - const span = createSpan('test-span'); - const data = getRequestSpanData(span); - - expect(data).toEqual({}); - }); - - it('works with http span', () => { - const span = createSpan('test-span'); - span.setAttributes({ - [HTTP_URL]: 'http://example.com?foo=bar#baz', - [HTTP_METHOD]: 'GET', - }); - - const data = getRequestSpanData(span); - - expect(data).toEqual({ - url: 'http://example.com', - 'http.method': 'GET', - 'http.query': '?foo=bar', - 'http.fragment': '#baz', - }); - }); - - it('works without method', () => { - const span = createSpan('test-span'); - span.setAttributes({ - [HTTP_URL]: 'http://example.com', - }); - - const data = getRequestSpanData(span); - - expect(data).toEqual({ - url: 'http://example.com', - 'http.method': 'GET', - }); - }); - - it('works with incorrect URL', () => { - const span = createSpan('test-span'); - span.setAttributes({ - [HTTP_URL]: 'malformed-url-here', - [HTTP_METHOD]: 'GET', - }); - - const data = getRequestSpanData(span); - - expect(data).toEqual({ - url: 'malformed-url-here', - 'http.method': 'GET', - }); - }); -});