adding origin

getsentry · Sep 18, 2024 · 22acec2 · 22acec2
1 parent 3c20530
commit 22acec2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts b/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
@@ -1,6 +1,6 @@
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
 
-// jest.setTimeout(600_000); //helpful when debugging
+// jest.setTimeout(600_000); // helpful when debugging
 
 const EXPECTED_MESSAGE_SPAN_PRODUCER = expect.objectContaining({
   op: 'message',
@@ -18,6 +18,7 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
     'messaging.system': 'rabbitmq',
     'otel.kind': 'CONSUMER',
     'sentry.op': 'message',
+    'sentry.origin': 'auto.amqplib.otel.consumer',
   }),
   status: 'ok',
 });

diff --git a/packages/node/src/integrations/tracing/amqplib.ts b/packages/node/src/integrations/tracing/amqplib.ts
@@ -1,10 +1,26 @@
-import { AmqplibInstrumentation } from '@opentelemetry/instrumentation-amqplib';
+import type { Span } from '@opentelemetry/api';
+import { AmqplibInstrumentation, type AmqplibInstrumentationConfig } from '@opentelemetry/instrumentation-amqplib';
 import { defineIntegration } from '@sentry/core';
 import type { IntegrationFn } from '@sentry/types';
 import { generateInstrumentOnce } from '../../otel/instrument';
+import { addOriginToSpan } from '../../utils/addOriginToSpan';
+
 const INTEGRATION_NAME = 'Amqplib';
 
-export const instrumentAmqplib = generateInstrumentOnce(INTEGRATION_NAME, () => new AmqplibInstrumentation());
+const config: AmqplibInstrumentationConfig = {
+  consumeEndHook: (span: Span) => {
+    addOriginToSpan(span, 'auto.amqplib.otel.consumer');
+  },
+  publishConfirmHook: (span: Span) => {
+    addOriginToSpan(span, 'auto.amqplib.otel.publisher');
+  }
+};
+
+export const instrumentAmqplib = generateInstrumentOnce(
+  INTEGRATION_NAME,
+  () =>
+    new AmqplibInstrumentation(config),
+);
 
 const _amqplibIntegration = (() => {
   return {