From 092f466ff065539eb1b94a7bc035caab168bf38e Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 11 Mar 2024 10:35:47 +0000
Subject: [PATCH 1/2] ref(opentelemetry): Remove parent span map

Also remove `parent sampled` attribute that we weren't really using anymore and we actually removed before sending.
---
 packages/opentelemetry/src/index.ts                  |  1 -
 packages/opentelemetry/src/sampler.ts                |  5 -----
 packages/opentelemetry/src/semanticAttributes.ts     |  9 ++-------
 packages/opentelemetry/src/spanExporter.ts           |  4 ++--
 packages/opentelemetry/src/spanProcessor.ts          |  9 +++++++--
 .../opentelemetry/src/utils/groupSpansWithParents.ts |  6 ++----
 packages/opentelemetry/src/utils/spanData.ts         | 12 ------------
 7 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/packages/opentelemetry/src/index.ts b/packages/opentelemetry/src/index.ts
index 635bfab9852f..649667b7255c 100644
--- a/packages/opentelemetry/src/index.ts
+++ b/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';
 
diff --git a/packages/opentelemetry/src/sampler.ts b/packages/opentelemetry/src/sampler.ts
index 805824834add..2b715eedd705 100644
--- a/packages/opentelemetry/src/sampler.ts
+++ b/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)) {
diff --git a/packages/opentelemetry/src/semanticAttributes.ts b/packages/opentelemetry/src/semanticAttributes.ts
index 8f61318a3ecc..80a80f87a666 100644
--- a/packages/opentelemetry/src/semanticAttributes.ts
+++ b/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';
diff --git a/packages/opentelemetry/src/spanExporter.ts b/packages/opentelemetry/src/spanExporter.ts
index 3917e2b91629..58f6ba53303e 100644
--- a/packages/opentelemetry/src/spanExporter.ts
+++ b/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;
diff --git a/packages/opentelemetry/src/spanProcessor.ts b/packages/opentelemetry/src/spanProcessor.ts
index 8592ffd900ab..c0a0accf4b3c 100644
--- a/packages/opentelemetry/src/spanProcessor.ts
+++ b/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) {
diff --git a/packages/opentelemetry/src/utils/groupSpansWithParents.ts b/packages/opentelemetry/src/utils/groupSpansWithParents.ts
index 6e5fb9e57c3a..2a6c667ac1cc 100644
--- a/packages/opentelemetry/src/utils/groupSpansWithParents.ts
+++ b/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;
 
diff --git a/packages/opentelemetry/src/utils/spanData.ts b/packages/opentelemetry/src/utils/spanData.ts
index 7c6dc7037222..8b0ea37bdcd5 100644
--- a/packages/opentelemetry/src/utils/spanData.ts
+++ b/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.

From 4ae06400673ca8f76ab5e7c8ae6308aadbb2abd4 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 11 Mar 2024 14:29:25 +0000
Subject: [PATCH 2/2] fix linting

---
 packages/opentelemetry/src/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/opentelemetry/src/index.ts b/packages/opentelemetry/src/index.ts
index 649667b7255c..4419d814b139 100644
--- a/packages/opentelemetry/src/index.ts
+++ b/packages/opentelemetry/src/index.ts
@@ -6,9 +6,7 @@ export type { OpenTelemetryClient } from './types';
 export { wrapClientClass } from './custom/client';
 
 export { getSpanKind } from './utils/getSpanKind';
-export {
-  getSpanScopes,
-} from './utils/spanData';
+export { getSpanScopes } from './utils/spanData';
 
 export { getScopesFromContext } from './utils/contextData';