ref(opentelemetry): Remove parent span map

Also remove `parent sampled` attribute that we weren't really using anymore and we actually removed before sending.

Author: mydea

packages/opentelemetry/src/index.ts

@@ -7,7 +7,6 @@ export { wrapClientClass } from './custom/client';
 
 export { getSpanKind } from './utils/getSpanKind';
 export {
-  getSpanParent,
   getSpanScopes,
 } from './utils/spanData';
 

packages/opentelemetry/src/sampler.ts

@@ -9,7 +9,6 @@ import { isNaN, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
 import { getPropagationContextFromSpanContext } from './propagator';
-import { InternalSentrySemanticAttributes } from './semanticAttributes';
 import { setIsSetup } from './utils/setupCheck';
 
 /**
@@ -69,10 +68,6 @@ export class SentrySampler implements Sampler {
       [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: Number(sampleRate),
     };
 
-    if (typeof parentSampled === 'boolean') {
-      attributes[InternalSentrySemanticAttributes.PARENT_SAMPLED] = parentSampled;
-    }
-
     // Since this is coming from the user (or from a function provided by the user), who knows what we might get. (The
     // only valid values are booleans or numbers between 0 and 1.)
     if (!isValidSampleRate(sampleRate)) {

packages/opentelemetry/src/semanticAttributes.ts

@@ -1,7 +1,2 @@
-/**
- * These are internal and are not supposed to be used/depended on by external parties.
- * No guarantees apply to these attributes, and the may change/disappear at any time.
- */
-export const InternalSentrySemanticAttributes = {
-  PARENT_SAMPLED: 'sentry.parentSampled',
-} as const;
+/** If this attribute is true, it means that the parent is a remote span. */
+export const SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE = 'sentry.parentIsRemote';

packages/opentelemetry/src/spanExporter.ts

@@ -16,7 +16,7 @@ import type { SpanJSON, SpanOrigin, TraceContext, TransactionEvent, TransactionS
 import { dropUndefinedKeys, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
-import { InternalSentrySemanticAttributes } from './semanticAttributes';
+import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from './semanticAttributes';
 import { convertOtelTimeToSeconds } from './utils/convertOtelTimeToSeconds';
 import { getDynamicSamplingContextFromSpan } from './utils/dynamicSamplingContext';
 import { getRequestSpanData } from './utils/getRequestSpanData';
@@ -297,8 +297,8 @@ function removeSentryAttributes(data: Record<string, unknown>): Record<string, u
   const cleanedData = { ...data };
 
   /* eslint-disable @typescript-eslint/no-dynamic-delete */
-  delete cleanedData[InternalSentrySemanticAttributes.PARENT_SAMPLED];
   delete cleanedData[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE];
+  delete cleanedData[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE];
   /* eslint-enable @typescript-eslint/no-dynamic-delete */
 
   return cleanedData;

packages/opentelemetry/src/spanProcessor.ts

@@ -6,11 +6,12 @@ import { addChildSpanToSpan, getClient, getDefaultCurrentScope, getDefaultIsolat
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
+import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from './semanticAttributes';
 import { SentrySpanExporter } from './spanExporter';
 import { maybeCaptureExceptionForTimedEvent } from './utils/captureExceptionForTimedEvent';
 import { getScopesFromContext } from './utils/contextData';
 import { setIsSetup } from './utils/setupCheck';
-import { setSpanParent, setSpanScopes } from './utils/spanData';
+import { setSpanScopes } from './utils/spanData';
 
 function onSpanStart(span: Span, parentContext: Context): void {
   // This is a reliable way to get the parent span - because this is exactly how the parent is identified in the OTEL SDK
@@ -20,10 +21,14 @@ function onSpanStart(span: Span, parentContext: Context): void {
 
   // We need access to the parent span in order to be able to move up the span tree for breadcrumbs
   if (parentSpan) {
-    setSpanParent(span, parentSpan);
     addChildSpanToSpan(parentSpan, span);
   }
 
+  // We need this in the span exporter
+  if (parentSpan && parentSpan.spanContext().isRemote) {
+    span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE, true);
+  }
+
   // The root context does not have scopes stored, so we check for this specifically
   // As fallback we attach the global scopes
   if (parentContext === ROOT_CONTEXT) {

packages/opentelemetry/src/utils/groupSpansWithParents.ts

@@ -1,6 +1,5 @@
 import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
-
-import { getSpanParent } from './spanData';
+import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from '../semanticAttributes';
 
 export interface SpanNode {
   id: string;
@@ -28,8 +27,7 @@ export function groupSpansWithParents(spans: ReadableSpan[]): SpanNode[] {
 }
 
 function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
-  const parentSpan = getSpanParent(span);
-  const parentIsRemote = parentSpan ? !!parentSpan.spanContext().isRemote : false;
+  const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 
   const id = span.spanContext().spanId;
 

packages/opentelemetry/src/utils/spanData.ts

@@ -1,4 +1,3 @@
-import type { Span } from '@opentelemetry/api';
 import type { Scope } from '@sentry/types';
 
 import type { AbstractSpan } from '../types';
@@ -13,17 +12,6 @@ const SpanScopes = new WeakMap<
     isolationScope: Scope;
   }
 >();
-const SpanParent = new WeakMap<AbstractSpan, Span>();
-
-/** Set the parent OTEL span on an OTEL span. */
-export function setSpanParent(span: AbstractSpan, parentSpan: Span): void {
-  SpanParent.set(span, parentSpan);
-}
-
-/** Get the parent OTEL span of an OTEL span. */
-export function getSpanParent(span: AbstractSpan): Span | undefined {
-  return SpanParent.get(span);
-}
 
 /**
  * Set the Sentry scope to be used for finishing a given OTEL span.