From 0a7e8eee07b63983aba6fd00e62fb9a1cf700941 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 12 Aug 2024 11:37:54 +0200
Subject: [PATCH] fix(remix): Ensure `origin` is correctly set for remix server
 spans

---
 .../src/utils/integrations/opentelemetry.ts      | 16 ++++++++--------
 .../server/instrumentation-otel/loader.test.ts   |  6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/remix/src/utils/integrations/opentelemetry.ts b/packages/remix/src/utils/integrations/opentelemetry.ts
index 24648bb8db22..fa1d8fd1b749 100644
--- a/packages/remix/src/utils/integrations/opentelemetry.ts
+++ b/packages/remix/src/utils/integrations/opentelemetry.ts
@@ -1,7 +1,7 @@
 import { RemixInstrumentation } from 'opentelemetry-instrumentation-remix';
 
-import { defineIntegration } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_OP, generateInstrumentOnce, getClient, spanToJSON } from '@sentry/node';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
+import { generateInstrumentOnce, getClient, spanToJSON } from '@sentry/node';
 import type { Client, IntegrationFn, Span } from '@sentry/types';
 import type { RemixOptions } from '../remixOptions';
 
@@ -47,13 +47,13 @@ const addRemixSpanAttributes = (span: Span): void => {
   // `requestHandler` span from `opentelemetry-instrumentation-remix` is the main server span.
   // It should be marked as the `http.server` operation.
   // The incoming requests are skipped by the custom `RemixHttpIntegration` package.
-  if (type === 'requestHandler') {
-    span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'http.server');
-    return;
-  }
-
   // All other spans are marked as `remix` operations with their specific type [loader, action]
-  span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, `${type}.remix`);
+  const op = type === 'requestHandler' ? 'http.server' : `${type}.remix`;
+
+  span.setAttributes({
+    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.remix',
+    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: op,
+  });
 };
 
 /**
diff --git a/packages/remix/test/integration/test/server/instrumentation-otel/loader.test.ts b/packages/remix/test/integration/test/server/instrumentation-otel/loader.test.ts
index 49b0fa7665fd..dcf45ed617f1 100644
--- a/packages/remix/test/integration/test/server/instrumentation-otel/loader.test.ts
+++ b/packages/remix/test/integration/test/server/instrumentation-otel/loader.test.ts
@@ -103,15 +103,17 @@ describe('Remix API Loaders', () => {
           data: {
             'code.function': 'loader',
             'sentry.op': 'loader.remix',
+            'sentry.origin': 'auto.http.otel.remix',
           },
-          origin: 'manual',
+          origin: 'auto.http.otel.remix',
         },
         {
           data: {
             'code.function': 'loader',
             'sentry.op': 'loader.remix',
+            'sentry.origin': 'auto.http.otel.remix',
           },
-          origin: 'manual',
+          origin: 'auto.http.otel.remix',
         },
       ],
     });