2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,7 +400,7 @@ module.exports = [
import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '140 KB',
limit: '142 KB',
disablePlugins: ['@size-limit/esbuild'],
},
{
Expand Down
64 changes: 52 additions & 12 deletions dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. These blocks drive the SDK's default
// integrations, so when the generic orchestrion run is enabled (via INJECT_ORCHESTRION) the OTel
// `Amqplib` integration is swapped for the diagnostics-channel one, changing the origin.
const PUBLISHER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.publisher' : 'auto.amqplib.otel.publisher';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

const CONSUMER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.consumer' : 'auto.amqplib.otel.consumer';

// Each scenario uses its own queue name to keep them isolated on the shared broker, so the
// expected producer span is parameterized by the routing key (queue name) it publishes to.
// The scenarios all publish via `sendToQueue`, which delegates to `publish('', queue, ...)` — i.e. the
// default (empty) exchange with the queue name as the routing key.
const expectedProducerSpan = (routingKey: string) =>
expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': routingKey,
'messaging.url': 'amqp://sentry:***@localhost:5672/',
'messaging.protocol': 'AMQP',
'messaging.protocol_version': '0.9.1',
'net.peer.name': 'localhost',
'net.peer.port': 5672,
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration; the
// vendored OTel instrumentation never set them.
...(isOrchestrionEnabled()
? {
'messaging.operation.type': 'send',
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': routingKey,
'network.protocol.name': 'AMQP',
'network.protocol.version': '0.9.1',
'server.address': 'localhost',
'server.port': 5672,
'url.full': 'amqp://sentry:***@localhost:5672/',
}
: {}),
'otel.kind': 'PRODUCER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.publisher',
'sentry.origin': PUBLISHER_ORIGIN,
}),
status: 'ok',
});
Expand All@@ -21,10 +52,23 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations. The consumer
// reads the default exchange ('') off the delivered message and the queue name as the routing key.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': 'queue1',
'messaging.operation': 'process',
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration.
...(isOrchestrionEnabled()
? {
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': 'queue1',
'messaging.operation.type': 'process',
}
: {}),
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
status: 'ok',
});
Expand DownExpand Up@@ -65,10 +109,10 @@ describe('amqplib auto-instrumentation', () => {
// identify it by its origin rather than by transaction name. The consumer span is its
// own transaction, identified by the origin on its trace context.
const producer = receivedTransactions.find(t =>
t.spans?.some(s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher'),
t.spans?.some(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN),
);
const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(producer).toBeDefined();
Expand All@@ -77,9 +121,7 @@ describe('amqplib auto-instrumentation', () => {
expect(producer!.transaction).toBe('root span');
expect(consumer!.transaction).toBe('queue1 process');

const producerSpan = producer!.spans?.find(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpan = producer!.spans?.find(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);
expect(producerSpan).toMatchObject(expectedProducerSpan('queue1'));

expect(consumer!.contexts?.trace).toMatchObject(EXPECTED_MESSAGE_SPAN_CONSUMER);
Expand DownExpand Up@@ -116,7 +158,7 @@ describe('amqplib auto-instrumentation', () => {
receivedTransactions.push(transaction);

const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(consumer).toBeDefined();
Expand All@@ -129,7 +171,7 @@ describe('amqplib auto-instrumentation', () => {
'messaging.system': 'rabbitmq',
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
}),
);
Expand DownExpand Up@@ -159,9 +201,7 @@ describe('amqplib auto-instrumentation', () => {
transaction: (transaction: TransactionEvent) => {
expect(transaction.transaction).toBe('root span');

const producerSpans = transaction.spans?.filter(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpans = transaction.spans?.filter(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);

// The confirm channel internally calls the base publish; the instrumentation must not
// double-instrument, so we expect exactly one producer span.
Expand Down
1 change: 1 addition & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,7 @@ export { denoRedisIntegration } from './integrations/redis';
export type { DenoRedisIntegrationOptions } from './integrations/redis';
export { denoMysqlIntegration } from './integrations/mysql';
export { denoPostgresIntegration } from './integrations/postgres';
export { denoAmqplibIntegration } from './integrations/amqplib';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
34 changes: 34 additions & 0 deletions packages/deno/src/integrations/amqplib.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { amqplibChannelIntegration } from '@sentry/server-utils/orchestrion';
import type { Integration, IntegrationFn } from '@sentry/core';
import { defineIntegration, extendIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';

const INTEGRATION_NAME = 'DenoAmqplib' as const;

/**
* Create spans for `amqplib` publish/consume operations under Deno.
*
* `amqplib` channels are injected by the orchestrion runtime hook at load time.
* The `@sentry/deno/import` loader must be active for this integration to
* record anything.
*
* The channel-subscription logic is shared with the other server runtimes in
* `@sentry/server-utils`. This just installs Deno's `AsyncLocalStorage` context
* strategy (so spans nest under the active span and survive amqplib's internal
* callback dispatch) before delegating.
*/
const _denoAmqplibIntegration = (() => {
const inner = amqplibChannelIntegration();

return extendIntegration(inner, {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
},
});
}) satisfies IntegrationFn;

export const denoAmqplibIntegration = defineIntegration(_denoAmqplibIntegration) as () => Integration & {
name: 'DenoAmqplib';
setupOnce: () => void;
};
5 changes: 4 additions & 1 deletion packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
} from './denoVersion';
import { denoServeIntegration } from './integrations/deno-serve';
import { denoHttpIntegration } from './integrations/http';
import { denoAmqplibIntegration } from './integrations/amqplib';
import { denoMysqlIntegration } from './integrations/mysql';
import { denoPostgresIntegration } from './integrations/postgres';
import { denoRedisIntegration } from './integrations/redis';
Expand DownExpand Up@@ -60,7 +61,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// It's possible that the orchestrion channels will be injected AFTER
// (or in parallel to) loading the SDK, so we only gate on whether the
// feature is possible. If they're never loaded, it'll just be a no-op.
...(MODULE_REGISTER_HOOKS_SUPPORTED ? [denoMysqlIntegration(), denoPostgresIntegration()] : []),
...(MODULE_REGISTER_HOOKS_SUPPORTED
? [denoMysqlIntegration(), denoPostgresIntegration(), denoAmqplibIntegration()]
: []),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
4 changes: 4 additions & 0 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ snapshot[`captureException 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -194,6 +195,7 @@ snapshot[`captureMessage 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -278,6 +280,7 @@ snapshot[`captureMessage twice 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -369,6 +372,7 @@ snapshot[`captureMessage twice 2`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,7 +400,7 @@ module.exports = [
import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '140 KB',
limit: '142 KB',
disablePlugins: ['@size-limit/esbuild'],
},
{
Expand Down
64 changes: 52 additions & 12 deletions dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. These blocks drive the SDK's default
// integrations, so when the generic orchestrion run is enabled (via INJECT_ORCHESTRION) the OTel
// `Amqplib` integration is swapped for the diagnostics-channel one, changing the origin.
const PUBLISHER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.publisher' : 'auto.amqplib.otel.publisher';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

const CONSUMER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.consumer' : 'auto.amqplib.otel.consumer';

// Each scenario uses its own queue name to keep them isolated on the shared broker, so the
// expected producer span is parameterized by the routing key (queue name) it publishes to.
// The scenarios all publish via `sendToQueue`, which delegates to `publish('', queue, ...)` — i.e. the
// default (empty) exchange with the queue name as the routing key.
const expectedProducerSpan = (routingKey: string) =>
expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': routingKey,
'messaging.url': 'amqp://sentry:***@localhost:5672/',
'messaging.protocol': 'AMQP',
'messaging.protocol_version': '0.9.1',
'net.peer.name': 'localhost',
'net.peer.port': 5672,
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration; the
// vendored OTel instrumentation never set them.
...(isOrchestrionEnabled()
? {
'messaging.operation.type': 'send',
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': routingKey,
'network.protocol.name': 'AMQP',
'network.protocol.version': '0.9.1',
'server.address': 'localhost',
'server.port': 5672,
'url.full': 'amqp://sentry:***@localhost:5672/',
}
: {}),
'otel.kind': 'PRODUCER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.publisher',
'sentry.origin': PUBLISHER_ORIGIN,
}),
status: 'ok',
});
Expand All@@ -21,10 +52,23 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations. The consumer
// reads the default exchange ('') off the delivered message and the queue name as the routing key.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': 'queue1',
'messaging.operation': 'process',
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration.
...(isOrchestrionEnabled()
? {
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': 'queue1',
'messaging.operation.type': 'process',
}
: {}),
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
status: 'ok',
});
Expand DownExpand Up@@ -65,10 +109,10 @@ describe('amqplib auto-instrumentation', () => {
// identify it by its origin rather than by transaction name. The consumer span is its
// own transaction, identified by the origin on its trace context.
const producer = receivedTransactions.find(t =>
t.spans?.some(s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher'),
t.spans?.some(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN),
);
const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(producer).toBeDefined();
Expand All@@ -77,9 +121,7 @@ describe('amqplib auto-instrumentation', () => {
expect(producer!.transaction).toBe('root span');
expect(consumer!.transaction).toBe('queue1 process');

const producerSpan = producer!.spans?.find(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpan = producer!.spans?.find(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);
expect(producerSpan).toMatchObject(expectedProducerSpan('queue1'));

expect(consumer!.contexts?.trace).toMatchObject(EXPECTED_MESSAGE_SPAN_CONSUMER);
Expand DownExpand Up@@ -116,7 +158,7 @@ describe('amqplib auto-instrumentation', () => {
receivedTransactions.push(transaction);

const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(consumer).toBeDefined();
Expand All@@ -129,7 +171,7 @@ describe('amqplib auto-instrumentation', () => {
'messaging.system': 'rabbitmq',
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
}),
);
Expand DownExpand Up@@ -159,9 +201,7 @@ describe('amqplib auto-instrumentation', () => {
transaction: (transaction: TransactionEvent) => {
expect(transaction.transaction).toBe('root span');

const producerSpans = transaction.spans?.filter(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpans = transaction.spans?.filter(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);

// The confirm channel internally calls the base publish; the instrumentation must not
// double-instrument, so we expect exactly one producer span.
Expand Down
1 change: 1 addition & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,7 @@ export { denoRedisIntegration } from './integrations/redis';
export type { DenoRedisIntegrationOptions } from './integrations/redis';
export { denoMysqlIntegration } from './integrations/mysql';
export { denoPostgresIntegration } from './integrations/postgres';
export { denoAmqplibIntegration } from './integrations/amqplib';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
34 changes: 34 additions & 0 deletions packages/deno/src/integrations/amqplib.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { amqplibChannelIntegration } from '@sentry/server-utils/orchestrion';
import type { Integration, IntegrationFn } from '@sentry/core';
import { defineIntegration, extendIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';

const INTEGRATION_NAME = 'DenoAmqplib' as const;

/**
* Create spans for `amqplib` publish/consume operations under Deno.
*
* `amqplib` channels are injected by the orchestrion runtime hook at load time.
* The `@sentry/deno/import` loader must be active for this integration to
* record anything.
*
* The channel-subscription logic is shared with the other server runtimes in
* `@sentry/server-utils`. This just installs Deno's `AsyncLocalStorage` context
* strategy (so spans nest under the active span and survive amqplib's internal
* callback dispatch) before delegating.
*/
const _denoAmqplibIntegration = (() => {
const inner = amqplibChannelIntegration();

return extendIntegration(inner, {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
},
});
}) satisfies IntegrationFn;

export const denoAmqplibIntegration = defineIntegration(_denoAmqplibIntegration) as () => Integration & {
name: 'DenoAmqplib';
setupOnce: () => void;
};
5 changes: 4 additions & 1 deletion packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
} from './denoVersion';
import { denoServeIntegration } from './integrations/deno-serve';
import { denoHttpIntegration } from './integrations/http';
import { denoAmqplibIntegration } from './integrations/amqplib';
import { denoMysqlIntegration } from './integrations/mysql';
import { denoPostgresIntegration } from './integrations/postgres';
import { denoRedisIntegration } from './integrations/redis';
Expand DownExpand Up@@ -60,7 +61,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// It's possible that the orchestrion channels will be injected AFTER
// (or in parallel to) loading the SDK, so we only gate on whether the
// feature is possible. If they're never loaded, it'll just be a no-op.
...(MODULE_REGISTER_HOOKS_SUPPORTED ? [denoMysqlIntegration(), denoPostgresIntegration()] : []),
...(MODULE_REGISTER_HOOKS_SUPPORTED
? [denoMysqlIntegration(), denoPostgresIntegration(), denoAmqplibIntegration()]
: []),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
4 changes: 4 additions & 0 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ snapshot[`captureException 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -194,6 +195,7 @@ snapshot[`captureMessage 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -278,6 +280,7 @@ snapshot[`captureMessage twice 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -369,6 +372,7 @@ snapshot[`captureMessage twice 2`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,7 +400,7 @@ module.exports = [
import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '140 KB',
limit: '142 KB',
disablePlugins: ['@size-limit/esbuild'],
},
{
Expand Down
64 changes: 52 additions & 12 deletions dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. These blocks drive the SDK's default
// integrations, so when the generic orchestrion run is enabled (via INJECT_ORCHESTRION) the OTel
// `Amqplib` integration is swapped for the diagnostics-channel one, changing the origin.
const PUBLISHER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.publisher' : 'auto.amqplib.otel.publisher';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

const CONSUMER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.consumer' : 'auto.amqplib.otel.consumer';

// Each scenario uses its own queue name to keep them isolated on the shared broker, so the
// expected producer span is parameterized by the routing key (queue name) it publishes to.
// The scenarios all publish via `sendToQueue`, which delegates to `publish('', queue, ...)` — i.e. the
// default (empty) exchange with the queue name as the routing key.
const expectedProducerSpan = (routingKey: string) =>
expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': routingKey,
'messaging.url': 'amqp://sentry:***@localhost:5672/',
'messaging.protocol': 'AMQP',
'messaging.protocol_version': '0.9.1',
'net.peer.name': 'localhost',
'net.peer.port': 5672,
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration; the
// vendored OTel instrumentation never set them.
...(isOrchestrionEnabled()
? {
'messaging.operation.type': 'send',
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': routingKey,
'network.protocol.name': 'AMQP',
'network.protocol.version': '0.9.1',
'server.address': 'localhost',
'server.port': 5672,
'url.full': 'amqp://sentry:***@localhost:5672/',
}
: {}),
'otel.kind': 'PRODUCER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.publisher',
'sentry.origin': PUBLISHER_ORIGIN,
}),
status: 'ok',
});
Expand All@@ -21,10 +52,23 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations. The consumer
// reads the default exchange ('') off the delivered message and the queue name as the routing key.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': 'queue1',
'messaging.operation': 'process',
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration.
...(isOrchestrionEnabled()
? {
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': 'queue1',
'messaging.operation.type': 'process',
}
: {}),
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
status: 'ok',
});
Expand DownExpand Up@@ -65,10 +109,10 @@ describe('amqplib auto-instrumentation', () => {
// identify it by its origin rather than by transaction name. The consumer span is its
// own transaction, identified by the origin on its trace context.
const producer = receivedTransactions.find(t =>
t.spans?.some(s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher'),
t.spans?.some(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN),
);
const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(producer).toBeDefined();
Expand All@@ -77,9 +121,7 @@ describe('amqplib auto-instrumentation', () => {
expect(producer!.transaction).toBe('root span');
expect(consumer!.transaction).toBe('queue1 process');

const producerSpan = producer!.spans?.find(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpan = producer!.spans?.find(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);
expect(producerSpan).toMatchObject(expectedProducerSpan('queue1'));

expect(consumer!.contexts?.trace).toMatchObject(EXPECTED_MESSAGE_SPAN_CONSUMER);
Expand DownExpand Up@@ -116,7 +158,7 @@ describe('amqplib auto-instrumentation', () => {
receivedTransactions.push(transaction);

const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(consumer).toBeDefined();
Expand All@@ -129,7 +171,7 @@ describe('amqplib auto-instrumentation', () => {
'messaging.system': 'rabbitmq',
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
}),
);
Expand DownExpand Up@@ -159,9 +201,7 @@ describe('amqplib auto-instrumentation', () => {
transaction: (transaction: TransactionEvent) => {
expect(transaction.transaction).toBe('root span');

const producerSpans = transaction.spans?.filter(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpans = transaction.spans?.filter(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);

// The confirm channel internally calls the base publish; the instrumentation must not
// double-instrument, so we expect exactly one producer span.
Expand Down
1 change: 1 addition & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,7 @@ export { denoRedisIntegration } from './integrations/redis';
export type { DenoRedisIntegrationOptions } from './integrations/redis';
export { denoMysqlIntegration } from './integrations/mysql';
export { denoPostgresIntegration } from './integrations/postgres';
export { denoAmqplibIntegration } from './integrations/amqplib';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
34 changes: 34 additions & 0 deletions packages/deno/src/integrations/amqplib.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { amqplibChannelIntegration } from '@sentry/server-utils/orchestrion';
import type { Integration, IntegrationFn } from '@sentry/core';
import { defineIntegration, extendIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';

const INTEGRATION_NAME = 'DenoAmqplib' as const;

/**
* Create spans for `amqplib` publish/consume operations under Deno.
*
* `amqplib` channels are injected by the orchestrion runtime hook at load time.
* The `@sentry/deno/import` loader must be active for this integration to
* record anything.
*
* The channel-subscription logic is shared with the other server runtimes in
* `@sentry/server-utils`. This just installs Deno's `AsyncLocalStorage` context
* strategy (so spans nest under the active span and survive amqplib's internal
* callback dispatch) before delegating.
*/
const _denoAmqplibIntegration = (() => {
const inner = amqplibChannelIntegration();

return extendIntegration(inner, {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
},
});
}) satisfies IntegrationFn;

export const denoAmqplibIntegration = defineIntegration(_denoAmqplibIntegration) as () => Integration & {
name: 'DenoAmqplib';
setupOnce: () => void;
};
5 changes: 4 additions & 1 deletion packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
} from './denoVersion';
import { denoServeIntegration } from './integrations/deno-serve';
import { denoHttpIntegration } from './integrations/http';
import { denoAmqplibIntegration } from './integrations/amqplib';
import { denoMysqlIntegration } from './integrations/mysql';
import { denoPostgresIntegration } from './integrations/postgres';
import { denoRedisIntegration } from './integrations/redis';
Expand DownExpand Up@@ -60,7 +61,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// It's possible that the orchestrion channels will be injected AFTER
// (or in parallel to) loading the SDK, so we only gate on whether the
// feature is possible. If they're never loaded, it'll just be a no-op.
...(MODULE_REGISTER_HOOKS_SUPPORTED ? [denoMysqlIntegration(), denoPostgresIntegration()] : []),
...(MODULE_REGISTER_HOOKS_SUPPORTED
? [denoMysqlIntegration(), denoPostgresIntegration(), denoAmqplibIntegration()]
: []),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
4 changes: 4 additions & 0 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ snapshot[`captureException 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -194,6 +195,7 @@ snapshot[`captureMessage 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -278,6 +280,7 @@ snapshot[`captureMessage twice 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -369,6 +372,7 @@ snapshot[`captureMessage twice 2`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,7 +400,7 @@ module.exports = [
import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '140 KB',
limit: '142 KB',
disablePlugins: ['@size-limit/esbuild'],
},
{
Expand Down
64 changes: 52 additions & 12 deletions dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. These blocks drive the SDK's default
// integrations, so when the generic orchestrion run is enabled (via INJECT_ORCHESTRION) the OTel
// `Amqplib` integration is swapped for the diagnostics-channel one, changing the origin.
const PUBLISHER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.publisher' : 'auto.amqplib.otel.publisher';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

const CONSUMER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.consumer' : 'auto.amqplib.otel.consumer';

// Each scenario uses its own queue name to keep them isolated on the shared broker, so the
// expected producer span is parameterized by the routing key (queue name) it publishes to.
// The scenarios all publish via `sendToQueue`, which delegates to `publish('', queue, ...)` — i.e. the
// default (empty) exchange with the queue name as the routing key.
const expectedProducerSpan = (routingKey: string) =>
expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': routingKey,
'messaging.url': 'amqp://sentry:***@localhost:5672/',
'messaging.protocol': 'AMQP',
'messaging.protocol_version': '0.9.1',
'net.peer.name': 'localhost',
'net.peer.port': 5672,
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration; the
// vendored OTel instrumentation never set them.
...(isOrchestrionEnabled()
? {
'messaging.operation.type': 'send',
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': routingKey,
'network.protocol.name': 'AMQP',
'network.protocol.version': '0.9.1',
'server.address': 'localhost',
'server.port': 5672,
'url.full': 'amqp://sentry:***@localhost:5672/',
}
: {}),
'otel.kind': 'PRODUCER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.publisher',
'sentry.origin': PUBLISHER_ORIGIN,
}),
status: 'ok',
});
Expand All@@ -21,10 +52,23 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations. The consumer
// reads the default exchange ('') off the delivered message and the queue name as the routing key.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': 'queue1',
'messaging.operation': 'process',
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration.
...(isOrchestrionEnabled()
? {
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': 'queue1',
'messaging.operation.type': 'process',
}
: {}),
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
status: 'ok',
});
Expand DownExpand Up@@ -65,10 +109,10 @@ describe('amqplib auto-instrumentation', () => {
// identify it by its origin rather than by transaction name. The consumer span is its
// own transaction, identified by the origin on its trace context.
const producer = receivedTransactions.find(t =>
t.spans?.some(s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher'),
t.spans?.some(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN),
);
const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(producer).toBeDefined();
Expand All@@ -77,9 +121,7 @@ describe('amqplib auto-instrumentation', () => {
expect(producer!.transaction).toBe('root span');
expect(consumer!.transaction).toBe('queue1 process');

const producerSpan = producer!.spans?.find(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpan = producer!.spans?.find(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);
expect(producerSpan).toMatchObject(expectedProducerSpan('queue1'));

expect(consumer!.contexts?.trace).toMatchObject(EXPECTED_MESSAGE_SPAN_CONSUMER);
Expand DownExpand Up@@ -116,7 +158,7 @@ describe('amqplib auto-instrumentation', () => {
receivedTransactions.push(transaction);

const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(consumer).toBeDefined();
Expand All@@ -129,7 +171,7 @@ describe('amqplib auto-instrumentation', () => {
'messaging.system': 'rabbitmq',
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
}),
);
Expand DownExpand Up@@ -159,9 +201,7 @@ describe('amqplib auto-instrumentation', () => {
transaction: (transaction: TransactionEvent) => {
expect(transaction.transaction).toBe('root span');

const producerSpans = transaction.spans?.filter(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpans = transaction.spans?.filter(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);

// The confirm channel internally calls the base publish; the instrumentation must not
// double-instrument, so we expect exactly one producer span.
Expand Down
1 change: 1 addition & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,7 @@ export { denoRedisIntegration } from './integrations/redis';
export type { DenoRedisIntegrationOptions } from './integrations/redis';
export { denoMysqlIntegration } from './integrations/mysql';
export { denoPostgresIntegration } from './integrations/postgres';
export { denoAmqplibIntegration } from './integrations/amqplib';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
34 changes: 34 additions & 0 deletions packages/deno/src/integrations/amqplib.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { amqplibChannelIntegration } from '@sentry/server-utils/orchestrion';
import type { Integration, IntegrationFn } from '@sentry/core';
import { defineIntegration, extendIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';

const INTEGRATION_NAME = 'DenoAmqplib' as const;

/**
* Create spans for `amqplib` publish/consume operations under Deno.
*
* `amqplib` channels are injected by the orchestrion runtime hook at load time.
* The `@sentry/deno/import` loader must be active for this integration to
* record anything.
*
* The channel-subscription logic is shared with the other server runtimes in
* `@sentry/server-utils`. This just installs Deno's `AsyncLocalStorage` context
* strategy (so spans nest under the active span and survive amqplib's internal
* callback dispatch) before delegating.
*/
const _denoAmqplibIntegration = (() => {
const inner = amqplibChannelIntegration();

return extendIntegration(inner, {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
},
});
}) satisfies IntegrationFn;

export const denoAmqplibIntegration = defineIntegration(_denoAmqplibIntegration) as () => Integration & {
name: 'DenoAmqplib';
setupOnce: () => void;
};
5 changes: 4 additions & 1 deletion packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
} from './denoVersion';
import { denoServeIntegration } from './integrations/deno-serve';
import { denoHttpIntegration } from './integrations/http';
import { denoAmqplibIntegration } from './integrations/amqplib';
import { denoMysqlIntegration } from './integrations/mysql';
import { denoPostgresIntegration } from './integrations/postgres';
import { denoRedisIntegration } from './integrations/redis';
Expand DownExpand Up@@ -60,7 +61,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// It's possible that the orchestrion channels will be injected AFTER
// (or in parallel to) loading the SDK, so we only gate on whether the
// feature is possible. If they're never loaded, it'll just be a no-op.
...(MODULE_REGISTER_HOOKS_SUPPORTED ? [denoMysqlIntegration(), denoPostgresIntegration()] : []),
...(MODULE_REGISTER_HOOKS_SUPPORTED
? [denoMysqlIntegration(), denoPostgresIntegration(), denoAmqplibIntegration()]
: []),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
4 changes: 4 additions & 0 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ snapshot[`captureException 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -194,6 +195,7 @@ snapshot[`captureMessage 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -278,6 +280,7 @@ snapshot[`captureMessage twice 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -369,6 +372,7 @@ snapshot[`captureMessage twice 2`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,7 +400,7 @@ module.exports = [
import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '140 KB',
limit: '142 KB',
disablePlugins: ['@size-limit/esbuild'],
},
{
Expand Down
64 changes: 52 additions & 12 deletions dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. These blocks drive the SDK's default
// integrations, so when the generic orchestrion run is enabled (via INJECT_ORCHESTRION) the OTel
// `Amqplib` integration is swapped for the diagnostics-channel one, changing the origin.
const PUBLISHER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.publisher' : 'auto.amqplib.otel.publisher';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

const CONSUMER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.consumer' : 'auto.amqplib.otel.consumer';

// Each scenario uses its own queue name to keep them isolated on the shared broker, so the
// expected producer span is parameterized by the routing key (queue name) it publishes to.
// The scenarios all publish via `sendToQueue`, which delegates to `publish('', queue, ...)` — i.e. the
// default (empty) exchange with the queue name as the routing key.
const expectedProducerSpan = (routingKey: string) =>
expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': routingKey,
'messaging.url': 'amqp://sentry:***@localhost:5672/',
'messaging.protocol': 'AMQP',
'messaging.protocol_version': '0.9.1',
'net.peer.name': 'localhost',
'net.peer.port': 5672,
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration; the
// vendored OTel instrumentation never set them.
...(isOrchestrionEnabled()
? {
'messaging.operation.type': 'send',
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': routingKey,
'network.protocol.name': 'AMQP',
'network.protocol.version': '0.9.1',
'server.address': 'localhost',
'server.port': 5672,
'url.full': 'amqp://sentry:***@localhost:5672/',
}
: {}),
'otel.kind': 'PRODUCER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.publisher',
'sentry.origin': PUBLISHER_ORIGIN,
}),
status: 'ok',
});
Expand All@@ -21,10 +52,23 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations. The consumer
// reads the default exchange ('') off the delivered message and the queue name as the routing key.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': 'queue1',
'messaging.operation': 'process',
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration.
...(isOrchestrionEnabled()
? {
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': 'queue1',
'messaging.operation.type': 'process',
}
: {}),
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
status: 'ok',
});
Expand DownExpand Up@@ -65,10 +109,10 @@ describe('amqplib auto-instrumentation', () => {
// identify it by its origin rather than by transaction name. The consumer span is its
// own transaction, identified by the origin on its trace context.
const producer = receivedTransactions.find(t =>
t.spans?.some(s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher'),
t.spans?.some(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN),
);
const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(producer).toBeDefined();
Expand All@@ -77,9 +121,7 @@ describe('amqplib auto-instrumentation', () => {
expect(producer!.transaction).toBe('root span');
expect(consumer!.transaction).toBe('queue1 process');

const producerSpan = producer!.spans?.find(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpan = producer!.spans?.find(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);
expect(producerSpan).toMatchObject(expectedProducerSpan('queue1'));

expect(consumer!.contexts?.trace).toMatchObject(EXPECTED_MESSAGE_SPAN_CONSUMER);
Expand DownExpand Up@@ -116,7 +158,7 @@ describe('amqplib auto-instrumentation', () => {
receivedTransactions.push(transaction);

const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(consumer).toBeDefined();
Expand All@@ -129,7 +171,7 @@ describe('amqplib auto-instrumentation', () => {
'messaging.system': 'rabbitmq',
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
}),
);
Expand DownExpand Up@@ -159,9 +201,7 @@ describe('amqplib auto-instrumentation', () => {
transaction: (transaction: TransactionEvent) => {
expect(transaction.transaction).toBe('root span');

const producerSpans = transaction.spans?.filter(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpans = transaction.spans?.filter(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);

// The confirm channel internally calls the base publish; the instrumentation must not
// double-instrument, so we expect exactly one producer span.
Expand Down
1 change: 1 addition & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,7 @@ export { denoRedisIntegration } from './integrations/redis';
export type { DenoRedisIntegrationOptions } from './integrations/redis';
export { denoMysqlIntegration } from './integrations/mysql';
export { denoPostgresIntegration } from './integrations/postgres';
export { denoAmqplibIntegration } from './integrations/amqplib';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
34 changes: 34 additions & 0 deletions packages/deno/src/integrations/amqplib.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { amqplibChannelIntegration } from '@sentry/server-utils/orchestrion';
import type { Integration, IntegrationFn } from '@sentry/core';
import { defineIntegration, extendIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';

const INTEGRATION_NAME = 'DenoAmqplib' as const;

/**
* Create spans for `amqplib` publish/consume operations under Deno.
*
* `amqplib` channels are injected by the orchestrion runtime hook at load time.
* The `@sentry/deno/import` loader must be active for this integration to
* record anything.
*
* The channel-subscription logic is shared with the other server runtimes in
* `@sentry/server-utils`. This just installs Deno's `AsyncLocalStorage` context
* strategy (so spans nest under the active span and survive amqplib's internal
* callback dispatch) before delegating.
*/
const _denoAmqplibIntegration = (() => {
const inner = amqplibChannelIntegration();

return extendIntegration(inner, {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
},
});
}) satisfies IntegrationFn;

export const denoAmqplibIntegration = defineIntegration(_denoAmqplibIntegration) as () => Integration & {
name: 'DenoAmqplib';
setupOnce: () => void;
};
5 changes: 4 additions & 1 deletion packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
} from './denoVersion';
import { denoServeIntegration } from './integrations/deno-serve';
import { denoHttpIntegration } from './integrations/http';
import { denoAmqplibIntegration } from './integrations/amqplib';
import { denoMysqlIntegration } from './integrations/mysql';
import { denoPostgresIntegration } from './integrations/postgres';
import { denoRedisIntegration } from './integrations/redis';
Expand DownExpand Up@@ -60,7 +61,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// It's possible that the orchestrion channels will be injected AFTER
// (or in parallel to) loading the SDK, so we only gate on whether the
// feature is possible. If they're never loaded, it'll just be a no-op.
...(MODULE_REGISTER_HOOKS_SUPPORTED ? [denoMysqlIntegration(), denoPostgresIntegration()] : []),
...(MODULE_REGISTER_HOOKS_SUPPORTED
? [denoMysqlIntegration(), denoPostgresIntegration(), denoAmqplibIntegration()]
: []),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
4 changes: 4 additions & 0 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ snapshot[`captureException 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -194,6 +195,7 @@ snapshot[`captureMessage 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -278,6 +280,7 @@ snapshot[`captureMessage twice 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -369,6 +372,7 @@ snapshot[`captureMessage twice 2`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,7 +400,7 @@ module.exports = [
import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '140 KB',
limit: '142 KB',
disablePlugins: ['@size-limit/esbuild'],
},
{
Expand Down
64 changes: 52 additions & 12 deletions dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. These blocks drive the SDK's default
// integrations, so when the generic orchestrion run is enabled (via INJECT_ORCHESTRION) the OTel
// `Amqplib` integration is swapped for the diagnostics-channel one, changing the origin.
const PUBLISHER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.publisher' : 'auto.amqplib.otel.publisher';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

const CONSUMER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.consumer' : 'auto.amqplib.otel.consumer';

// Each scenario uses its own queue name to keep them isolated on the shared broker, so the
// expected producer span is parameterized by the routing key (queue name) it publishes to.
// The scenarios all publish via `sendToQueue`, which delegates to `publish('', queue, ...)` — i.e. the
// default (empty) exchange with the queue name as the routing key.
const expectedProducerSpan = (routingKey: string) =>
expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': routingKey,
'messaging.url': 'amqp://sentry:***@localhost:5672/',
'messaging.protocol': 'AMQP',
'messaging.protocol_version': '0.9.1',
'net.peer.name': 'localhost',
'net.peer.port': 5672,
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration; the
// vendored OTel instrumentation never set them.
...(isOrchestrionEnabled()
? {
'messaging.operation.type': 'send',
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': routingKey,
'network.protocol.name': 'AMQP',
'network.protocol.version': '0.9.1',
'server.address': 'localhost',
'server.port': 5672,
'url.full': 'amqp://sentry:***@localhost:5672/',
}
: {}),
'otel.kind': 'PRODUCER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.publisher',
'sentry.origin': PUBLISHER_ORIGIN,
}),
status: 'ok',
});
Expand All@@ -21,10 +52,23 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations. The consumer
// reads the default exchange ('') off the delivered message and the queue name as the routing key.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': 'queue1',
'messaging.operation': 'process',
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration.
...(isOrchestrionEnabled()
? {
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': 'queue1',
'messaging.operation.type': 'process',
}
: {}),
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
status: 'ok',
});
Expand DownExpand Up@@ -65,10 +109,10 @@ describe('amqplib auto-instrumentation', () => {
// identify it by its origin rather than by transaction name. The consumer span is its
// own transaction, identified by the origin on its trace context.
const producer = receivedTransactions.find(t =>
t.spans?.some(s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher'),
t.spans?.some(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN),
);
const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(producer).toBeDefined();
Expand All@@ -77,9 +121,7 @@ describe('amqplib auto-instrumentation', () => {
expect(producer!.transaction).toBe('root span');
expect(consumer!.transaction).toBe('queue1 process');

const producerSpan = producer!.spans?.find(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpan = producer!.spans?.find(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);
expect(producerSpan).toMatchObject(expectedProducerSpan('queue1'));

expect(consumer!.contexts?.trace).toMatchObject(EXPECTED_MESSAGE_SPAN_CONSUMER);
Expand DownExpand Up@@ -116,7 +158,7 @@ describe('amqplib auto-instrumentation', () => {
receivedTransactions.push(transaction);

const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(consumer).toBeDefined();
Expand All@@ -129,7 +171,7 @@ describe('amqplib auto-instrumentation', () => {
'messaging.system': 'rabbitmq',
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
}),
);
Expand DownExpand Up@@ -159,9 +201,7 @@ describe('amqplib auto-instrumentation', () => {
transaction: (transaction: TransactionEvent) => {
expect(transaction.transaction).toBe('root span');

const producerSpans = transaction.spans?.filter(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpans = transaction.spans?.filter(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);

// The confirm channel internally calls the base publish; the instrumentation must not
// double-instrument, so we expect exactly one producer span.
Expand Down
1 change: 1 addition & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,7 @@ export { denoRedisIntegration } from './integrations/redis';
export type { DenoRedisIntegrationOptions } from './integrations/redis';
export { denoMysqlIntegration } from './integrations/mysql';
export { denoPostgresIntegration } from './integrations/postgres';
export { denoAmqplibIntegration } from './integrations/amqplib';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
34 changes: 34 additions & 0 deletions packages/deno/src/integrations/amqplib.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { amqplibChannelIntegration } from '@sentry/server-utils/orchestrion';
import type { Integration, IntegrationFn } from '@sentry/core';
import { defineIntegration, extendIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';

const INTEGRATION_NAME = 'DenoAmqplib' as const;

/**
* Create spans for `amqplib` publish/consume operations under Deno.
*
* `amqplib` channels are injected by the orchestrion runtime hook at load time.
* The `@sentry/deno/import` loader must be active for this integration to
* record anything.
*
* The channel-subscription logic is shared with the other server runtimes in
* `@sentry/server-utils`. This just installs Deno's `AsyncLocalStorage` context
* strategy (so spans nest under the active span and survive amqplib's internal
* callback dispatch) before delegating.
*/
const _denoAmqplibIntegration = (() => {
const inner = amqplibChannelIntegration();

return extendIntegration(inner, {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
},
});
}) satisfies IntegrationFn;

export const denoAmqplibIntegration = defineIntegration(_denoAmqplibIntegration) as () => Integration & {
name: 'DenoAmqplib';
setupOnce: () => void;
};
5 changes: 4 additions & 1 deletion packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
} from './denoVersion';
import { denoServeIntegration } from './integrations/deno-serve';
import { denoHttpIntegration } from './integrations/http';
import { denoAmqplibIntegration } from './integrations/amqplib';
import { denoMysqlIntegration } from './integrations/mysql';
import { denoPostgresIntegration } from './integrations/postgres';
import { denoRedisIntegration } from './integrations/redis';
Expand DownExpand Up@@ -60,7 +61,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// It's possible that the orchestrion channels will be injected AFTER
// (or in parallel to) loading the SDK, so we only gate on whether the
// feature is possible. If they're never loaded, it'll just be a no-op.
...(MODULE_REGISTER_HOOKS_SUPPORTED ? [denoMysqlIntegration(), denoPostgresIntegration()] : []),
...(MODULE_REGISTER_HOOKS_SUPPORTED
? [denoMysqlIntegration(), denoPostgresIntegration(), denoAmqplibIntegration()]
: []),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
4 changes: 4 additions & 0 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ snapshot[`captureException 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -194,6 +195,7 @@ snapshot[`captureMessage 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -278,6 +280,7 @@ snapshot[`captureMessage twice 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -369,6 +372,7 @@ snapshot[`captureMessage twice 2`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,7 +400,7 @@ module.exports = [
import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '140 KB',
limit: '142 KB',
disablePlugins: ['@size-limit/esbuild'],
},
{
Expand Down
64 changes: 52 additions & 12 deletions dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. These blocks drive the SDK's default
// integrations, so when the generic orchestrion run is enabled (via INJECT_ORCHESTRION) the OTel
// `Amqplib` integration is swapped for the diagnostics-channel one, changing the origin.
const PUBLISHER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.publisher' : 'auto.amqplib.otel.publisher';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

const CONSUMER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.consumer' : 'auto.amqplib.otel.consumer';

// Each scenario uses its own queue name to keep them isolated on the shared broker, so the
// expected producer span is parameterized by the routing key (queue name) it publishes to.
// The scenarios all publish via `sendToQueue`, which delegates to `publish('', queue, ...)` — i.e. the
// default (empty) exchange with the queue name as the routing key.
const expectedProducerSpan = (routingKey: string) =>
expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': routingKey,
'messaging.url': 'amqp://sentry:***@localhost:5672/',
'messaging.protocol': 'AMQP',
'messaging.protocol_version': '0.9.1',
'net.peer.name': 'localhost',
'net.peer.port': 5672,
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration; the
// vendored OTel instrumentation never set them.
...(isOrchestrionEnabled()
? {
'messaging.operation.type': 'send',
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': routingKey,
'network.protocol.name': 'AMQP',
'network.protocol.version': '0.9.1',
'server.address': 'localhost',
'server.port': 5672,
'url.full': 'amqp://sentry:***@localhost:5672/',
}
: {}),
'otel.kind': 'PRODUCER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.publisher',
'sentry.origin': PUBLISHER_ORIGIN,
}),
status: 'ok',
});
Expand All@@ -21,10 +52,23 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations. The consumer
// reads the default exchange ('') off the delivered message and the queue name as the routing key.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': 'queue1',
'messaging.operation': 'process',
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration.
...(isOrchestrionEnabled()
? {
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': 'queue1',
'messaging.operation.type': 'process',
}
: {}),
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
status: 'ok',
});
Expand DownExpand Up@@ -65,10 +109,10 @@ describe('amqplib auto-instrumentation', () => {
// identify it by its origin rather than by transaction name. The consumer span is its
// own transaction, identified by the origin on its trace context.
const producer = receivedTransactions.find(t =>
t.spans?.some(s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher'),
t.spans?.some(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN),
);
const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(producer).toBeDefined();
Expand All@@ -77,9 +121,7 @@ describe('amqplib auto-instrumentation', () => {
expect(producer!.transaction).toBe('root span');
expect(consumer!.transaction).toBe('queue1 process');

const producerSpan = producer!.spans?.find(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpan = producer!.spans?.find(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);
expect(producerSpan).toMatchObject(expectedProducerSpan('queue1'));

expect(consumer!.contexts?.trace).toMatchObject(EXPECTED_MESSAGE_SPAN_CONSUMER);
Expand DownExpand Up@@ -116,7 +158,7 @@ describe('amqplib auto-instrumentation', () => {
receivedTransactions.push(transaction);

const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(consumer).toBeDefined();
Expand All@@ -129,7 +171,7 @@ describe('amqplib auto-instrumentation', () => {
'messaging.system': 'rabbitmq',
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
}),
);
Expand DownExpand Up@@ -159,9 +201,7 @@ describe('amqplib auto-instrumentation', () => {
transaction: (transaction: TransactionEvent) => {
expect(transaction.transaction).toBe('root span');

const producerSpans = transaction.spans?.filter(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpans = transaction.spans?.filter(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);

// The confirm channel internally calls the base publish; the instrumentation must not
// double-instrument, so we expect exactly one producer span.
Expand Down
1 change: 1 addition & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,7 @@ export { denoRedisIntegration } from './integrations/redis';
export type { DenoRedisIntegrationOptions } from './integrations/redis';
export { denoMysqlIntegration } from './integrations/mysql';
export { denoPostgresIntegration } from './integrations/postgres';
export { denoAmqplibIntegration } from './integrations/amqplib';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
34 changes: 34 additions & 0 deletions packages/deno/src/integrations/amqplib.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { amqplibChannelIntegration } from '@sentry/server-utils/orchestrion';
import type { Integration, IntegrationFn } from '@sentry/core';
import { defineIntegration, extendIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';

const INTEGRATION_NAME = 'DenoAmqplib' as const;

/**
* Create spans for `amqplib` publish/consume operations under Deno.
*
* `amqplib` channels are injected by the orchestrion runtime hook at load time.
* The `@sentry/deno/import` loader must be active for this integration to
* record anything.
*
* The channel-subscription logic is shared with the other server runtimes in
* `@sentry/server-utils`. This just installs Deno's `AsyncLocalStorage` context
* strategy (so spans nest under the active span and survive amqplib's internal
* callback dispatch) before delegating.
*/
const _denoAmqplibIntegration = (() => {
const inner = amqplibChannelIntegration();

return extendIntegration(inner, {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
},
});
}) satisfies IntegrationFn;

export const denoAmqplibIntegration = defineIntegration(_denoAmqplibIntegration) as () => Integration & {
name: 'DenoAmqplib';
setupOnce: () => void;
};
5 changes: 4 additions & 1 deletion packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
} from './denoVersion';
import { denoServeIntegration } from './integrations/deno-serve';
import { denoHttpIntegration } from './integrations/http';
import { denoAmqplibIntegration } from './integrations/amqplib';
import { denoMysqlIntegration } from './integrations/mysql';
import { denoPostgresIntegration } from './integrations/postgres';
import { denoRedisIntegration } from './integrations/redis';
Expand DownExpand Up@@ -60,7 +61,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// It's possible that the orchestrion channels will be injected AFTER
// (or in parallel to) loading the SDK, so we only gate on whether the
// feature is possible. If they're never loaded, it'll just be a no-op.
...(MODULE_REGISTER_HOOKS_SUPPORTED ? [denoMysqlIntegration(), denoPostgresIntegration()] : []),
...(MODULE_REGISTER_HOOKS_SUPPORTED
? [denoMysqlIntegration(), denoPostgresIntegration(), denoAmqplibIntegration()]
: []),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
4 changes: 4 additions & 0 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ snapshot[`captureException 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -194,6 +195,7 @@ snapshot[`captureMessage 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -278,6 +280,7 @@ snapshot[`captureMessage twice 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -369,6 +372,7 @@ snapshot[`captureMessage twice 2`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,7 +400,7 @@ module.exports = [
import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '140 KB',
limit: '142 KB',
disablePlugins: ['@size-limit/esbuild'],
},
{
Expand Down
64 changes: 52 additions & 12 deletions dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. These blocks drive the SDK's default
// integrations, so when the generic orchestrion run is enabled (via INJECT_ORCHESTRION) the OTel
// `Amqplib` integration is swapped for the diagnostics-channel one, changing the origin.
const PUBLISHER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.publisher' : 'auto.amqplib.otel.publisher';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

const CONSUMER_ORIGIN = isOrchestrionEnabled() ? 'auto.amqplib.orchestrion.consumer' : 'auto.amqplib.otel.consumer';

// Each scenario uses its own queue name to keep them isolated on the shared broker, so the
// expected producer span is parameterized by the routing key (queue name) it publishes to.
// The scenarios all publish via `sendToQueue`, which delegates to `publish('', queue, ...)` — i.e. the
// default (empty) exchange with the queue name as the routing key.
const expectedProducerSpan = (routingKey: string) =>
expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': routingKey,
'messaging.url': 'amqp://sentry:***@localhost:5672/',
'messaging.protocol': 'AMQP',
'messaging.protocol_version': '0.9.1',
'net.peer.name': 'localhost',
'net.peer.port': 5672,
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration; the
// vendored OTel instrumentation never set them.
...(isOrchestrionEnabled()
? {
'messaging.operation.type': 'send',
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': routingKey,
'network.protocol.name': 'AMQP',
'network.protocol.version': '0.9.1',
'server.address': 'localhost',
'server.port': 5672,
'url.full': 'amqp://sentry:***@localhost:5672/',
}
: {}),
'otel.kind': 'PRODUCER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.publisher',
'sentry.origin': PUBLISHER_ORIGIN,
}),
status: 'ok',
});
Expand All@@ -21,10 +52,23 @@ const EXPECTED_MESSAGE_SPAN_CONSUMER = expect.objectContaining({
op: 'message',
data: expect.objectContaining({
'messaging.system': 'rabbitmq',
// Legacy messaging attributes emitted by both the OTel and orchestrion integrations. The consumer
// reads the default exchange ('') off the delivered message and the queue name as the routing key.
'messaging.destination': '',
'messaging.destination_kind': 'topic',
'messaging.rabbitmq.routing_key': 'queue1',
'messaging.operation': 'process',
// Current `@sentry/conventions` attributes are only emitted by the orchestrion integration.
...(isOrchestrionEnabled()
? {
'messaging.destination.name': '',
'messaging.rabbitmq.destination.routing_key': 'queue1',
'messaging.operation.type': 'process',
}
: {}),
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
status: 'ok',
});
Expand DownExpand Up@@ -65,10 +109,10 @@ describe('amqplib auto-instrumentation', () => {
// identify it by its origin rather than by transaction name. The consumer span is its
// own transaction, identified by the origin on its trace context.
const producer = receivedTransactions.find(t =>
t.spans?.some(s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher'),
t.spans?.some(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN),
);
const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(producer).toBeDefined();
Expand All@@ -77,9 +121,7 @@ describe('amqplib auto-instrumentation', () => {
expect(producer!.transaction).toBe('root span');
expect(consumer!.transaction).toBe('queue1 process');

const producerSpan = producer!.spans?.find(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpan = producer!.spans?.find(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);
expect(producerSpan).toMatchObject(expectedProducerSpan('queue1'));

expect(consumer!.contexts?.trace).toMatchObject(EXPECTED_MESSAGE_SPAN_CONSUMER);
Expand DownExpand Up@@ -116,7 +158,7 @@ describe('amqplib auto-instrumentation', () => {
receivedTransactions.push(transaction);

const consumer = receivedTransactions.find(
t => t.contexts?.trace?.data?.['sentry.origin'] === 'auto.amqplib.otel.consumer',
t => t.contexts?.trace?.data?.['sentry.origin'] === CONSUMER_ORIGIN,
);

expect(consumer).toBeDefined();
Expand All@@ -129,7 +171,7 @@ describe('amqplib auto-instrumentation', () => {
'messaging.system': 'rabbitmq',
'otel.kind': 'CONSUMER',
'sentry.op': 'message',
'sentry.origin': 'auto.amqplib.otel.consumer',
'sentry.origin': CONSUMER_ORIGIN,
}),
}),
);
Expand DownExpand Up@@ -159,9 +201,7 @@ describe('amqplib auto-instrumentation', () => {
transaction: (transaction: TransactionEvent) => {
expect(transaction.transaction).toBe('root span');

const producerSpans = transaction.spans?.filter(
s => s.data?.['sentry.origin'] === 'auto.amqplib.otel.publisher',
);
const producerSpans = transaction.spans?.filter(s => s.data?.['sentry.origin'] === PUBLISHER_ORIGIN);

// The confirm channel internally calls the base publish; the instrumentation must not
// double-instrument, so we expect exactly one producer span.
Expand Down
1 change: 1 addition & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,7 @@ export { denoRedisIntegration } from './integrations/redis';
export type { DenoRedisIntegrationOptions } from './integrations/redis';
export { denoMysqlIntegration } from './integrations/mysql';
export { denoPostgresIntegration } from './integrations/postgres';
export { denoAmqplibIntegration } from './integrations/amqplib';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
34 changes: 34 additions & 0 deletions packages/deno/src/integrations/amqplib.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { amqplibChannelIntegration } from '@sentry/server-utils/orchestrion';
import type { Integration, IntegrationFn } from '@sentry/core';
import { defineIntegration, extendIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';

const INTEGRATION_NAME = 'DenoAmqplib' as const;

/**
* Create spans for `amqplib` publish/consume operations under Deno.
*
* `amqplib` channels are injected by the orchestrion runtime hook at load time.
* The `@sentry/deno/import` loader must be active for this integration to
* record anything.
*
* The channel-subscription logic is shared with the other server runtimes in
* `@sentry/server-utils`. This just installs Deno's `AsyncLocalStorage` context
* strategy (so spans nest under the active span and survive amqplib's internal
* callback dispatch) before delegating.
*/
const _denoAmqplibIntegration = (() => {
const inner = amqplibChannelIntegration();

return extendIntegration(inner, {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
},
});
}) satisfies IntegrationFn;

export const denoAmqplibIntegration = defineIntegration(_denoAmqplibIntegration) as () => Integration & {
name: 'DenoAmqplib';
setupOnce: () => void;
};
5 changes: 4 additions & 1 deletion packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
} from './denoVersion';
import { denoServeIntegration } from './integrations/deno-serve';
import { denoHttpIntegration } from './integrations/http';
import { denoAmqplibIntegration } from './integrations/amqplib';
import { denoMysqlIntegration } from './integrations/mysql';
import { denoPostgresIntegration } from './integrations/postgres';
import { denoRedisIntegration } from './integrations/redis';
Expand DownExpand Up@@ -60,7 +61,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// It's possible that the orchestrion channels will be injected AFTER
// (or in parallel to) loading the SDK, so we only gate on whether the
// feature is possible. If they're never loaded, it'll just be a no-op.
...(MODULE_REGISTER_HOOKS_SUPPORTED ? [denoMysqlIntegration(), denoPostgresIntegration()] : []),
...(MODULE_REGISTER_HOOKS_SUPPORTED
? [denoMysqlIntegration(), denoPostgresIntegration(), denoAmqplibIntegration()]
: []),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
4 changes: 4 additions & 0 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ snapshot[`captureException 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -194,6 +195,7 @@ snapshot[`captureMessage 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -278,6 +280,7 @@ snapshot[`captureMessage twice 1`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand DownExpand Up@@ -369,6 +372,7 @@ snapshot[`captureMessage twice 2`] = `
"DenoRedis",
"DenoMysql",
"DenoPostgres",
"DenoAmqplib",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
Expand Down
Loading
Loading