From c163601cdd533252b9ac0785403750f9787538c9 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 20 Feb 2024 20:04:14 -0500
Subject: [PATCH] feat(v8): Remove span.origin

---
 packages/core/src/tracing/sentrySpan.ts        | 18 ------------------
 .../opentelemetry-node/src/utils/spanData.ts   |  4 ++--
 packages/types/src/span.ts                     |  7 -------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/packages/core/src/tracing/sentrySpan.ts b/packages/core/src/tracing/sentrySpan.ts
index 3faba55d8eab..b4566a55e399 100644
--- a/packages/core/src/tracing/sentrySpan.ts
+++ b/packages/core/src/tracing/sentrySpan.ts
@@ -315,24 +315,6 @@ export class SentrySpan implements SpanInterface {
     this.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, op);
   }
 
-  /**
-   * The origin of the span, giving context about what created the span.
-   *
-   * @deprecated Use `spanToJSON().origin` to read the origin instead.
-   */
-  public get origin(): SpanOrigin | undefined {
-    return this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] as SpanOrigin | undefined;
-  }
-
-  /**
-   * The origin of the span, giving context about what created the span.
-   *
-   * @deprecated Use `startSpan()` functions to set the origin instead.
-   */
-  public set origin(origin: SpanOrigin | undefined) {
-    this.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, origin);
-  }
-
   /* eslint-enable @typescript-eslint/member-ordering */
 
   /** @inheritdoc */
diff --git a/packages/opentelemetry-node/src/utils/spanData.ts b/packages/opentelemetry-node/src/utils/spanData.ts
index 5cec7ee0f93f..6556e5340b15 100644
--- a/packages/opentelemetry-node/src/utils/spanData.ts
+++ b/packages/opentelemetry-node/src/utils/spanData.ts
@@ -1,5 +1,5 @@
 /* eslint-disable deprecation/deprecation */
-import { Transaction } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, Transaction } from '@sentry/core';
 import type { Context, SpanOrigin } from '@sentry/types';
 
 import { getSentrySpan } from './spanMap';
@@ -46,7 +46,7 @@ export function addOtelSpanData(
   }
 
   if (origin) {
-    sentrySpan.origin = origin;
+    sentrySpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, origin);
   }
 
   if (sentrySpan instanceof Transaction) {
diff --git a/packages/types/src/span.ts b/packages/types/src/span.ts
index c6ab48e4ed7a..2e6e0b084900 100644
--- a/packages/types/src/span.ts
+++ b/packages/types/src/span.ts
@@ -260,13 +260,6 @@ export interface Span extends Omit<SpanContext, 'name' | 'op' | 'status' | 'orig
    */
   status?: string | undefined;
 
-  /**
-   * The origin of the span, giving context about what created the span.
-   *
-   * @deprecated Use `startSpan` function to set and `spanToJSON(span).origin` to read the origin instead.
-   */
-  origin?: SpanOrigin | undefined;
-
   /**
    * Get context data for this span.
    * This includes the spanId & the traceId.