Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/sdk-trace-node": "2.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/instrumentation-undici": "0.13.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import './instrument';

// Other imports below
import * as Sentry from '@sentry/node';
import { trace, type Span } from '@opentelemetry/api';
import express from 'express';

const app = express();
Expand DownExpand Up@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
});
});

app.get('/test-only-if-parent', function (req, res) {
// Remove the HTTP span from the context to simulate no parent span
Sentry.withActiveSpan(null, () => {
// This should NOT create a span because onlyIfParent is true and there's no parent
Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
// This custom OTel span SHOULD be created and exported
// This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
const customTracer = trace.getTracer('custom-tracer');
customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
span.end();
});
});

res.send({});
});
});

app.get('/test-error', async function (req, res) {
const exceptionId = Sentry.captureException(new Error('This is an error'));

Expand All@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
throw new Error(`This is an exception with id ${id}`);
});

app.get('/test-logs/:id', function (req, res) {
const id = req.params.id;

Sentry.startSpan({ name: `log-operation-${id}` }, () => {
Sentry.logger.info(`test-log-${id}`, { requestId: id });
});

res.send({ ok: true, id });
});

Sentry.setupExpressErrorHandler(app);

app.use(function onError(err: unknown, req: any, res: any, next: any) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ Sentry.init({
// Tracing is completely disabled
// Custom OTEL setup
skipOpenTelemetrySetup: true,
enableLogs: true,
});

// Create and configure NodeTracerProvider
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/test';
import { waitForEnvelopeItem } from '@sentry-internal/test-utils';

test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-1');
}
return false;
});

const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-2');
}
return false;
});

// Make two requests to different routes (each Express route is an isolation scope)
await fetch(`${baseURL}/test-logs/1`);
await fetch(`${baseURL}/test-logs/2`);

const logEnvelope1 = await logEnvelopePromise1;
const logEnvelope2 = await logEnvelopePromise2;

const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };

const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
const log2 = logPayload2.items.find(item => item.body === 'test-log-2');

const traceId1 = log1?.trace_id;
const traceId2 = log2?.trace_id;

expect(traceId1).toMatch(/[a-f0-9]{32}/);
expect(traceId2).toMatch(/[a-f0-9]{32}/);
expect(traceId1).not.toBe(traceId2);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Http server span & undici client spans are emitted,
// as well as the spans emitted via `Sentry.startSpan()`
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(3);
// Http server span & undici client spans are emitted.
// Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
// Our default node-fetch spans are also not emitted.
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const undiciScopes = scopeSpans?.filter(
Expand All@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

expect(httpScopes.length).toBe(1);

expect(startSpanScopes.length).toBe(1);
expect(startSpanScopes[0].spans.length).toBe(2);
expect(startSpanScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
parentSpanId: expect.any(String),
name: 'test-span',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'test-transaction',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
]);
// Sentry spans should not be exported when tracing is disabled
expect(startSpanScopes.length).toBe(0);

// Undici spans are emitted correctly
expect(undiciScopes.length).toBe(1);
Expand DownExpand Up@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
},
]);
});

test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
waitForTransaction('node-otel-without-tracing', transactionEvent => {
throw new Error('THIS SHOULD NEVER HAPPEN!');
});

// Ensure we send data to the OTLP endpoint
const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
const json = JSON.parse(data) as any;

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;

// Look for the custom span from our custom-tracer
const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
});

fetch(`${baseURL}/test-only-if-parent`);

const otelData = await otelPromise;

expect(otelData).toBeDefined();

const json = JSON.parse(otelData);
expect(json.resourceSpans.length).toBe(1);

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Should have HTTP instrumentation span but NO Sentry span
const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

// HTTP span exists (from the incoming request)
expect(httpScopes.length).toBe(1);

// Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
expect(sentryScopes.length).toBe(0);

// Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
expect(customScopes.length).toBe(1);
expect(customScopes[0].spans.length).toBe(1);
expect(customScopes[0].spans[0]).toMatchObject({
name: 'custom-span-with-only-if-parent',
kind: 1,
status: { code: 0 },
});

// Verify the custom span is recording (not suppressed)
const customSpan = customScopes[0].spans[0];
expect(customSpan.spanId).not.toBe('0000000000000000');
expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
});
4 changes: 4 additions & 0 deletions dev-packages/node-integration-tests/suites/pino/test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('event')
.ignore('transaction')
.expect({
log: log => {
const traceId1 = log.items?.[0]?.trace_id;
Expand All@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-next.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-track.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
log: {
items: [
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/sdk-trace-node": "2.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/instrumentation-undici": "0.13.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import './instrument';

// Other imports below
import * as Sentry from '@sentry/node';
import { trace, type Span } from '@opentelemetry/api';
import express from 'express';

const app = express();
Expand DownExpand Up@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
});
});

app.get('/test-only-if-parent', function (req, res) {
// Remove the HTTP span from the context to simulate no parent span
Sentry.withActiveSpan(null, () => {
// This should NOT create a span because onlyIfParent is true and there's no parent
Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
// This custom OTel span SHOULD be created and exported
// This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
const customTracer = trace.getTracer('custom-tracer');
customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
span.end();
});
});

res.send({});
});
});

app.get('/test-error', async function (req, res) {
const exceptionId = Sentry.captureException(new Error('This is an error'));

Expand All@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
throw new Error(`This is an exception with id ${id}`);
});

app.get('/test-logs/:id', function (req, res) {
const id = req.params.id;

Sentry.startSpan({ name: `log-operation-${id}` }, () => {
Sentry.logger.info(`test-log-${id}`, { requestId: id });
});

res.send({ ok: true, id });
});

Sentry.setupExpressErrorHandler(app);

app.use(function onError(err: unknown, req: any, res: any, next: any) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ Sentry.init({
// Tracing is completely disabled
// Custom OTEL setup
skipOpenTelemetrySetup: true,
enableLogs: true,
});

// Create and configure NodeTracerProvider
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/test';
import { waitForEnvelopeItem } from '@sentry-internal/test-utils';

test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-1');
}
return false;
});

const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-2');
}
return false;
});

// Make two requests to different routes (each Express route is an isolation scope)
await fetch(`${baseURL}/test-logs/1`);
await fetch(`${baseURL}/test-logs/2`);

const logEnvelope1 = await logEnvelopePromise1;
const logEnvelope2 = await logEnvelopePromise2;

const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };

const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
const log2 = logPayload2.items.find(item => item.body === 'test-log-2');

const traceId1 = log1?.trace_id;
const traceId2 = log2?.trace_id;

expect(traceId1).toMatch(/[a-f0-9]{32}/);
expect(traceId2).toMatch(/[a-f0-9]{32}/);
expect(traceId1).not.toBe(traceId2);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Http server span & undici client spans are emitted,
// as well as the spans emitted via `Sentry.startSpan()`
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(3);
// Http server span & undici client spans are emitted.
// Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
// Our default node-fetch spans are also not emitted.
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const undiciScopes = scopeSpans?.filter(
Expand All@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

expect(httpScopes.length).toBe(1);

expect(startSpanScopes.length).toBe(1);
expect(startSpanScopes[0].spans.length).toBe(2);
expect(startSpanScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
parentSpanId: expect.any(String),
name: 'test-span',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'test-transaction',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
]);
// Sentry spans should not be exported when tracing is disabled
expect(startSpanScopes.length).toBe(0);

// Undici spans are emitted correctly
expect(undiciScopes.length).toBe(1);
Expand DownExpand Up@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
},
]);
});

test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
waitForTransaction('node-otel-without-tracing', transactionEvent => {
throw new Error('THIS SHOULD NEVER HAPPEN!');
});

// Ensure we send data to the OTLP endpoint
const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
const json = JSON.parse(data) as any;

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;

// Look for the custom span from our custom-tracer
const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
});

fetch(`${baseURL}/test-only-if-parent`);

const otelData = await otelPromise;

expect(otelData).toBeDefined();

const json = JSON.parse(otelData);
expect(json.resourceSpans.length).toBe(1);

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Should have HTTP instrumentation span but NO Sentry span
const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

// HTTP span exists (from the incoming request)
expect(httpScopes.length).toBe(1);

// Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
expect(sentryScopes.length).toBe(0);

// Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
expect(customScopes.length).toBe(1);
expect(customScopes[0].spans.length).toBe(1);
expect(customScopes[0].spans[0]).toMatchObject({
name: 'custom-span-with-only-if-parent',
kind: 1,
status: { code: 0 },
});

// Verify the custom span is recording (not suppressed)
const customSpan = customScopes[0].spans[0];
expect(customSpan.spanId).not.toBe('0000000000000000');
expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
});
4 changes: 4 additions & 0 deletions dev-packages/node-integration-tests/suites/pino/test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('event')
.ignore('transaction')
.expect({
log: log => {
const traceId1 = log.items?.[0]?.trace_id;
Expand All@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-next.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-track.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
log: {
items: [
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/sdk-trace-node": "2.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/instrumentation-undici": "0.13.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import './instrument';

// Other imports below
import * as Sentry from '@sentry/node';
import { trace, type Span } from '@opentelemetry/api';
import express from 'express';

const app = express();
Expand DownExpand Up@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
});
});

app.get('/test-only-if-parent', function (req, res) {
// Remove the HTTP span from the context to simulate no parent span
Sentry.withActiveSpan(null, () => {
// This should NOT create a span because onlyIfParent is true and there's no parent
Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
// This custom OTel span SHOULD be created and exported
// This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
const customTracer = trace.getTracer('custom-tracer');
customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
span.end();
});
});

res.send({});
});
});

app.get('/test-error', async function (req, res) {
const exceptionId = Sentry.captureException(new Error('This is an error'));

Expand All@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
throw new Error(`This is an exception with id ${id}`);
});

app.get('/test-logs/:id', function (req, res) {
const id = req.params.id;

Sentry.startSpan({ name: `log-operation-${id}` }, () => {
Sentry.logger.info(`test-log-${id}`, { requestId: id });
});

res.send({ ok: true, id });
});

Sentry.setupExpressErrorHandler(app);

app.use(function onError(err: unknown, req: any, res: any, next: any) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ Sentry.init({
// Tracing is completely disabled
// Custom OTEL setup
skipOpenTelemetrySetup: true,
enableLogs: true,
});

// Create and configure NodeTracerProvider
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/test';
import { waitForEnvelopeItem } from '@sentry-internal/test-utils';

test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-1');
}
return false;
});

const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-2');
}
return false;
});

// Make two requests to different routes (each Express route is an isolation scope)
await fetch(`${baseURL}/test-logs/1`);
await fetch(`${baseURL}/test-logs/2`);

const logEnvelope1 = await logEnvelopePromise1;
const logEnvelope2 = await logEnvelopePromise2;

const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };

const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
const log2 = logPayload2.items.find(item => item.body === 'test-log-2');

const traceId1 = log1?.trace_id;
const traceId2 = log2?.trace_id;

expect(traceId1).toMatch(/[a-f0-9]{32}/);
expect(traceId2).toMatch(/[a-f0-9]{32}/);
expect(traceId1).not.toBe(traceId2);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Http server span & undici client spans are emitted,
// as well as the spans emitted via `Sentry.startSpan()`
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(3);
// Http server span & undici client spans are emitted.
// Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
// Our default node-fetch spans are also not emitted.
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const undiciScopes = scopeSpans?.filter(
Expand All@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

expect(httpScopes.length).toBe(1);

expect(startSpanScopes.length).toBe(1);
expect(startSpanScopes[0].spans.length).toBe(2);
expect(startSpanScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
parentSpanId: expect.any(String),
name: 'test-span',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'test-transaction',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
]);
// Sentry spans should not be exported when tracing is disabled
expect(startSpanScopes.length).toBe(0);

// Undici spans are emitted correctly
expect(undiciScopes.length).toBe(1);
Expand DownExpand Up@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
},
]);
});

test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
waitForTransaction('node-otel-without-tracing', transactionEvent => {
throw new Error('THIS SHOULD NEVER HAPPEN!');
});

// Ensure we send data to the OTLP endpoint
const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
const json = JSON.parse(data) as any;

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;

// Look for the custom span from our custom-tracer
const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
});

fetch(`${baseURL}/test-only-if-parent`);

const otelData = await otelPromise;

expect(otelData).toBeDefined();

const json = JSON.parse(otelData);
expect(json.resourceSpans.length).toBe(1);

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Should have HTTP instrumentation span but NO Sentry span
const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

// HTTP span exists (from the incoming request)
expect(httpScopes.length).toBe(1);

// Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
expect(sentryScopes.length).toBe(0);

// Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
expect(customScopes.length).toBe(1);
expect(customScopes[0].spans.length).toBe(1);
expect(customScopes[0].spans[0]).toMatchObject({
name: 'custom-span-with-only-if-parent',
kind: 1,
status: { code: 0 },
});

// Verify the custom span is recording (not suppressed)
const customSpan = customScopes[0].spans[0];
expect(customSpan.spanId).not.toBe('0000000000000000');
expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
});
4 changes: 4 additions & 0 deletions dev-packages/node-integration-tests/suites/pino/test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('event')
.ignore('transaction')
.expect({
log: log => {
const traceId1 = log.items?.[0]?.trace_id;
Expand All@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-next.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-track.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
log: {
items: [
Expand Down
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 \u003e 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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/sdk-trace-node": "2.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/instrumentation-undici": "0.13.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import './instrument';

// Other imports below
import * as Sentry from '@sentry/node';
import { trace, type Span } from '@opentelemetry/api';
import express from 'express';

const app = express();
Expand DownExpand Up@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
});
});

app.get('/test-only-if-parent', function (req, res) {
// Remove the HTTP span from the context to simulate no parent span
Sentry.withActiveSpan(null, () => {
// This should NOT create a span because onlyIfParent is true and there's no parent
Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
// This custom OTel span SHOULD be created and exported
// This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
const customTracer = trace.getTracer('custom-tracer');
customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
span.end();
});
});

res.send({});
});
});

app.get('/test-error', async function (req, res) {
const exceptionId = Sentry.captureException(new Error('This is an error'));

Expand All@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
throw new Error(`This is an exception with id ${id}`);
});

app.get('/test-logs/:id', function (req, res) {
const id = req.params.id;

Sentry.startSpan({ name: `log-operation-${id}` }, () => {
Sentry.logger.info(`test-log-${id}`, { requestId: id });
});

res.send({ ok: true, id });
});

Sentry.setupExpressErrorHandler(app);

app.use(function onError(err: unknown, req: any, res: any, next: any) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ Sentry.init({
// Tracing is completely disabled
// Custom OTEL setup
skipOpenTelemetrySetup: true,
enableLogs: true,
});

// Create and configure NodeTracerProvider
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/test';
import { waitForEnvelopeItem } from '@sentry-internal/test-utils';

test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-1');
}
return false;
});

const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-2');
}
return false;
});

// Make two requests to different routes (each Express route is an isolation scope)
await fetch(`${baseURL}/test-logs/1`);
await fetch(`${baseURL}/test-logs/2`);

const logEnvelope1 = await logEnvelopePromise1;
const logEnvelope2 = await logEnvelopePromise2;

const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };

const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
const log2 = logPayload2.items.find(item => item.body === 'test-log-2');

const traceId1 = log1?.trace_id;
const traceId2 = log2?.trace_id;

expect(traceId1).toMatch(/[a-f0-9]{32}/);
expect(traceId2).toMatch(/[a-f0-9]{32}/);
expect(traceId1).not.toBe(traceId2);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Http server span & undici client spans are emitted,
// as well as the spans emitted via `Sentry.startSpan()`
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(3);
// Http server span & undici client spans are emitted.
// Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
// Our default node-fetch spans are also not emitted.
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const undiciScopes = scopeSpans?.filter(
Expand All@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

expect(httpScopes.length).toBe(1);

expect(startSpanScopes.length).toBe(1);
expect(startSpanScopes[0].spans.length).toBe(2);
expect(startSpanScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
parentSpanId: expect.any(String),
name: 'test-span',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'test-transaction',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
]);
// Sentry spans should not be exported when tracing is disabled
expect(startSpanScopes.length).toBe(0);

// Undici spans are emitted correctly
expect(undiciScopes.length).toBe(1);
Expand DownExpand Up@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
},
]);
});

test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
waitForTransaction('node-otel-without-tracing', transactionEvent => {
throw new Error('THIS SHOULD NEVER HAPPEN!');
});

// Ensure we send data to the OTLP endpoint
const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
const json = JSON.parse(data) as any;

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;

// Look for the custom span from our custom-tracer
const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
});

fetch(`${baseURL}/test-only-if-parent`);

const otelData = await otelPromise;

expect(otelData).toBeDefined();

const json = JSON.parse(otelData);
expect(json.resourceSpans.length).toBe(1);

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Should have HTTP instrumentation span but NO Sentry span
const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

// HTTP span exists (from the incoming request)
expect(httpScopes.length).toBe(1);

// Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
expect(sentryScopes.length).toBe(0);

// Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
expect(customScopes.length).toBe(1);
expect(customScopes[0].spans.length).toBe(1);
expect(customScopes[0].spans[0]).toMatchObject({
name: 'custom-span-with-only-if-parent',
kind: 1,
status: { code: 0 },
});

// Verify the custom span is recording (not suppressed)
const customSpan = customScopes[0].spans[0];
expect(customSpan.spanId).not.toBe('0000000000000000');
expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
});
4 changes: 4 additions & 0 deletions dev-packages/node-integration-tests/suites/pino/test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('event')
.ignore('transaction')
.expect({
log: log => {
const traceId1 = log.items?.[0]?.trace_id;
Expand All@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-next.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-track.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
log: {
items: [
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/sdk-trace-node": "2.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/instrumentation-undici": "0.13.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import './instrument';

// Other imports below
import * as Sentry from '@sentry/node';
import { trace, type Span } from '@opentelemetry/api';
import express from 'express';

const app = express();
Expand DownExpand Up@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
});
});

app.get('/test-only-if-parent', function (req, res) {
// Remove the HTTP span from the context to simulate no parent span
Sentry.withActiveSpan(null, () => {
// This should NOT create a span because onlyIfParent is true and there's no parent
Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
// This custom OTel span SHOULD be created and exported
// This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
const customTracer = trace.getTracer('custom-tracer');
customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
span.end();
});
});

res.send({});
});
});

app.get('/test-error', async function (req, res) {
const exceptionId = Sentry.captureException(new Error('This is an error'));

Expand All@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
throw new Error(`This is an exception with id ${id}`);
});

app.get('/test-logs/:id', function (req, res) {
const id = req.params.id;

Sentry.startSpan({ name: `log-operation-${id}` }, () => {
Sentry.logger.info(`test-log-${id}`, { requestId: id });
});

res.send({ ok: true, id });
});

Sentry.setupExpressErrorHandler(app);

app.use(function onError(err: unknown, req: any, res: any, next: any) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ Sentry.init({
// Tracing is completely disabled
// Custom OTEL setup
skipOpenTelemetrySetup: true,
enableLogs: true,
});

// Create and configure NodeTracerProvider
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/test';
import { waitForEnvelopeItem } from '@sentry-internal/test-utils';

test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-1');
}
return false;
});

const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-2');
}
return false;
});

// Make two requests to different routes (each Express route is an isolation scope)
await fetch(`${baseURL}/test-logs/1`);
await fetch(`${baseURL}/test-logs/2`);

const logEnvelope1 = await logEnvelopePromise1;
const logEnvelope2 = await logEnvelopePromise2;

const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };

const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
const log2 = logPayload2.items.find(item => item.body === 'test-log-2');

const traceId1 = log1?.trace_id;
const traceId2 = log2?.trace_id;

expect(traceId1).toMatch(/[a-f0-9]{32}/);
expect(traceId2).toMatch(/[a-f0-9]{32}/);
expect(traceId1).not.toBe(traceId2);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Http server span & undici client spans are emitted,
// as well as the spans emitted via `Sentry.startSpan()`
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(3);
// Http server span & undici client spans are emitted.
// Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
// Our default node-fetch spans are also not emitted.
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const undiciScopes = scopeSpans?.filter(
Expand All@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

expect(httpScopes.length).toBe(1);

expect(startSpanScopes.length).toBe(1);
expect(startSpanScopes[0].spans.length).toBe(2);
expect(startSpanScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
parentSpanId: expect.any(String),
name: 'test-span',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'test-transaction',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
]);
// Sentry spans should not be exported when tracing is disabled
expect(startSpanScopes.length).toBe(0);

// Undici spans are emitted correctly
expect(undiciScopes.length).toBe(1);
Expand DownExpand Up@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
},
]);
});

test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
waitForTransaction('node-otel-without-tracing', transactionEvent => {
throw new Error('THIS SHOULD NEVER HAPPEN!');
});

// Ensure we send data to the OTLP endpoint
const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
const json = JSON.parse(data) as any;

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;

// Look for the custom span from our custom-tracer
const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
});

fetch(`${baseURL}/test-only-if-parent`);

const otelData = await otelPromise;

expect(otelData).toBeDefined();

const json = JSON.parse(otelData);
expect(json.resourceSpans.length).toBe(1);

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Should have HTTP instrumentation span but NO Sentry span
const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

// HTTP span exists (from the incoming request)
expect(httpScopes.length).toBe(1);

// Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
expect(sentryScopes.length).toBe(0);

// Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
expect(customScopes.length).toBe(1);
expect(customScopes[0].spans.length).toBe(1);
expect(customScopes[0].spans[0]).toMatchObject({
name: 'custom-span-with-only-if-parent',
kind: 1,
status: { code: 0 },
});

// Verify the custom span is recording (not suppressed)
const customSpan = customScopes[0].spans[0];
expect(customSpan.spanId).not.toBe('0000000000000000');
expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
});
4 changes: 4 additions & 0 deletions dev-packages/node-integration-tests/suites/pino/test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('event')
.ignore('transaction')
.expect({
log: log => {
const traceId1 = log.items?.[0]?.trace_id;
Expand All@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-next.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-track.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
log: {
items: [
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/sdk-trace-node": "2.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/instrumentation-undici": "0.13.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import './instrument';

// Other imports below
import * as Sentry from '@sentry/node';
import { trace, type Span } from '@opentelemetry/api';
import express from 'express';

const app = express();
Expand DownExpand Up@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
});
});

app.get('/test-only-if-parent', function (req, res) {
// Remove the HTTP span from the context to simulate no parent span
Sentry.withActiveSpan(null, () => {
// This should NOT create a span because onlyIfParent is true and there's no parent
Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
// This custom OTel span SHOULD be created and exported
// This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
const customTracer = trace.getTracer('custom-tracer');
customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
span.end();
});
});

res.send({});
});
});

app.get('/test-error', async function (req, res) {
const exceptionId = Sentry.captureException(new Error('This is an error'));

Expand All@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
throw new Error(`This is an exception with id ${id}`);
});

app.get('/test-logs/:id', function (req, res) {
const id = req.params.id;

Sentry.startSpan({ name: `log-operation-${id}` }, () => {
Sentry.logger.info(`test-log-${id}`, { requestId: id });
});

res.send({ ok: true, id });
});

Sentry.setupExpressErrorHandler(app);

app.use(function onError(err: unknown, req: any, res: any, next: any) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ Sentry.init({
// Tracing is completely disabled
// Custom OTEL setup
skipOpenTelemetrySetup: true,
enableLogs: true,
});

// Create and configure NodeTracerProvider
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/test';
import { waitForEnvelopeItem } from '@sentry-internal/test-utils';

test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-1');
}
return false;
});

const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-2');
}
return false;
});

// Make two requests to different routes (each Express route is an isolation scope)
await fetch(`${baseURL}/test-logs/1`);
await fetch(`${baseURL}/test-logs/2`);

const logEnvelope1 = await logEnvelopePromise1;
const logEnvelope2 = await logEnvelopePromise2;

const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };

const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
const log2 = logPayload2.items.find(item => item.body === 'test-log-2');

const traceId1 = log1?.trace_id;
const traceId2 = log2?.trace_id;

expect(traceId1).toMatch(/[a-f0-9]{32}/);
expect(traceId2).toMatch(/[a-f0-9]{32}/);
expect(traceId1).not.toBe(traceId2);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Http server span & undici client spans are emitted,
// as well as the spans emitted via `Sentry.startSpan()`
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(3);
// Http server span & undici client spans are emitted.
// Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
// Our default node-fetch spans are also not emitted.
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const undiciScopes = scopeSpans?.filter(
Expand All@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

expect(httpScopes.length).toBe(1);

expect(startSpanScopes.length).toBe(1);
expect(startSpanScopes[0].spans.length).toBe(2);
expect(startSpanScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
parentSpanId: expect.any(String),
name: 'test-span',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'test-transaction',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
]);
// Sentry spans should not be exported when tracing is disabled
expect(startSpanScopes.length).toBe(0);

// Undici spans are emitted correctly
expect(undiciScopes.length).toBe(1);
Expand DownExpand Up@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
},
]);
});

test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
waitForTransaction('node-otel-without-tracing', transactionEvent => {
throw new Error('THIS SHOULD NEVER HAPPEN!');
});

// Ensure we send data to the OTLP endpoint
const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
const json = JSON.parse(data) as any;

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;

// Look for the custom span from our custom-tracer
const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
});

fetch(`${baseURL}/test-only-if-parent`);

const otelData = await otelPromise;

expect(otelData).toBeDefined();

const json = JSON.parse(otelData);
expect(json.resourceSpans.length).toBe(1);

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Should have HTTP instrumentation span but NO Sentry span
const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

// HTTP span exists (from the incoming request)
expect(httpScopes.length).toBe(1);

// Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
expect(sentryScopes.length).toBe(0);

// Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
expect(customScopes.length).toBe(1);
expect(customScopes[0].spans.length).toBe(1);
expect(customScopes[0].spans[0]).toMatchObject({
name: 'custom-span-with-only-if-parent',
kind: 1,
status: { code: 0 },
});

// Verify the custom span is recording (not suppressed)
const customSpan = customScopes[0].spans[0];
expect(customSpan.spanId).not.toBe('0000000000000000');
expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
});
4 changes: 4 additions & 0 deletions dev-packages/node-integration-tests/suites/pino/test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('event')
.ignore('transaction')
.expect({
log: log => {
const traceId1 = log.items?.[0]?.trace_id;
Expand All@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-next.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-track.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
log: {
items: [
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/sdk-trace-node": "2.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/instrumentation-undici": "0.13.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import './instrument';

// Other imports below
import * as Sentry from '@sentry/node';
import { trace, type Span } from '@opentelemetry/api';
import express from 'express';

const app = express();
Expand DownExpand Up@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
});
});

app.get('/test-only-if-parent', function (req, res) {
// Remove the HTTP span from the context to simulate no parent span
Sentry.withActiveSpan(null, () => {
// This should NOT create a span because onlyIfParent is true and there's no parent
Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
// This custom OTel span SHOULD be created and exported
// This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
const customTracer = trace.getTracer('custom-tracer');
customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
span.end();
});
});

res.send({});
});
});

app.get('/test-error', async function (req, res) {
const exceptionId = Sentry.captureException(new Error('This is an error'));

Expand All@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
throw new Error(`This is an exception with id ${id}`);
});

app.get('/test-logs/:id', function (req, res) {
const id = req.params.id;

Sentry.startSpan({ name: `log-operation-${id}` }, () => {
Sentry.logger.info(`test-log-${id}`, { requestId: id });
});

res.send({ ok: true, id });
});

Sentry.setupExpressErrorHandler(app);

app.use(function onError(err: unknown, req: any, res: any, next: any) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ Sentry.init({
// Tracing is completely disabled
// Custom OTEL setup
skipOpenTelemetrySetup: true,
enableLogs: true,
});

// Create and configure NodeTracerProvider
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/test';
import { waitForEnvelopeItem } from '@sentry-internal/test-utils';

test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-1');
}
return false;
});

const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-2');
}
return false;
});

// Make two requests to different routes (each Express route is an isolation scope)
await fetch(`${baseURL}/test-logs/1`);
await fetch(`${baseURL}/test-logs/2`);

const logEnvelope1 = await logEnvelopePromise1;
const logEnvelope2 = await logEnvelopePromise2;

const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };

const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
const log2 = logPayload2.items.find(item => item.body === 'test-log-2');

const traceId1 = log1?.trace_id;
const traceId2 = log2?.trace_id;

expect(traceId1).toMatch(/[a-f0-9]{32}/);
expect(traceId2).toMatch(/[a-f0-9]{32}/);
expect(traceId1).not.toBe(traceId2);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Http server span & undici client spans are emitted,
// as well as the spans emitted via `Sentry.startSpan()`
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(3);
// Http server span & undici client spans are emitted.
// Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
// Our default node-fetch spans are also not emitted.
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const undiciScopes = scopeSpans?.filter(
Expand All@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

expect(httpScopes.length).toBe(1);

expect(startSpanScopes.length).toBe(1);
expect(startSpanScopes[0].spans.length).toBe(2);
expect(startSpanScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
parentSpanId: expect.any(String),
name: 'test-span',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'test-transaction',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
]);
// Sentry spans should not be exported when tracing is disabled
expect(startSpanScopes.length).toBe(0);

// Undici spans are emitted correctly
expect(undiciScopes.length).toBe(1);
Expand DownExpand Up@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
},
]);
});

test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
waitForTransaction('node-otel-without-tracing', transactionEvent => {
throw new Error('THIS SHOULD NEVER HAPPEN!');
});

// Ensure we send data to the OTLP endpoint
const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
const json = JSON.parse(data) as any;

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;

// Look for the custom span from our custom-tracer
const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
});

fetch(`${baseURL}/test-only-if-parent`);

const otelData = await otelPromise;

expect(otelData).toBeDefined();

const json = JSON.parse(otelData);
expect(json.resourceSpans.length).toBe(1);

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Should have HTTP instrumentation span but NO Sentry span
const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

// HTTP span exists (from the incoming request)
expect(httpScopes.length).toBe(1);

// Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
expect(sentryScopes.length).toBe(0);

// Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
expect(customScopes.length).toBe(1);
expect(customScopes[0].spans.length).toBe(1);
expect(customScopes[0].spans[0]).toMatchObject({
name: 'custom-span-with-only-if-parent',
kind: 1,
status: { code: 0 },
});

// Verify the custom span is recording (not suppressed)
const customSpan = customScopes[0].spans[0];
expect(customSpan.spanId).not.toBe('0000000000000000');
expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
});
4 changes: 4 additions & 0 deletions dev-packages/node-integration-tests/suites/pino/test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('event')
.ignore('transaction')
.expect({
log: log => {
const traceId1 = log.items?.[0]?.trace_id;
Expand All@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-next.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-track.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
log: {
items: [
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/sdk-trace-node": "2.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/instrumentation-undici": "0.13.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import './instrument';

// Other imports below
import * as Sentry from '@sentry/node';
import { trace, type Span } from '@opentelemetry/api';
import express from 'express';

const app = express();
Expand DownExpand Up@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
});
});

app.get('/test-only-if-parent', function (req, res) {
// Remove the HTTP span from the context to simulate no parent span
Sentry.withActiveSpan(null, () => {
// This should NOT create a span because onlyIfParent is true and there's no parent
Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
// This custom OTel span SHOULD be created and exported
// This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
const customTracer = trace.getTracer('custom-tracer');
customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
span.end();
});
});

res.send({});
});
});

app.get('/test-error', async function (req, res) {
const exceptionId = Sentry.captureException(new Error('This is an error'));

Expand All@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
throw new Error(`This is an exception with id ${id}`);
});

app.get('/test-logs/:id', function (req, res) {
const id = req.params.id;

Sentry.startSpan({ name: `log-operation-${id}` }, () => {
Sentry.logger.info(`test-log-${id}`, { requestId: id });
});

res.send({ ok: true, id });
});

Sentry.setupExpressErrorHandler(app);

app.use(function onError(err: unknown, req: any, res: any, next: any) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ Sentry.init({
// Tracing is completely disabled
// Custom OTEL setup
skipOpenTelemetrySetup: true,
enableLogs: true,
});

// Create and configure NodeTracerProvider
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/test';
import { waitForEnvelopeItem } from '@sentry-internal/test-utils';

test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-1');
}
return false;
});

const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
const [itemHeader, itemPayload] = envelopeItem;
if (itemHeader.type === 'log') {
const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
return logItems.items.some(item => item.body === 'test-log-2');
}
return false;
});

// Make two requests to different routes (each Express route is an isolation scope)
await fetch(`${baseURL}/test-logs/1`);
await fetch(`${baseURL}/test-logs/2`);

const logEnvelope1 = await logEnvelopePromise1;
const logEnvelope2 = await logEnvelopePromise2;

const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };

const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
const log2 = logPayload2.items.find(item => item.body === 'test-log-2');

const traceId1 = log1?.trace_id;
const traceId2 = log2?.trace_id;

expect(traceId1).toMatch(/[a-f0-9]{32}/);
expect(traceId2).toMatch(/[a-f0-9]{32}/);
expect(traceId1).not.toBe(traceId2);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Http server span & undici client spans are emitted,
// as well as the spans emitted via `Sentry.startSpan()`
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(3);
// Http server span & undici client spans are emitted.
// Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
// Our default node-fetch spans are also not emitted.
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const undiciScopes = scopeSpans?.filter(
Expand All@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

expect(httpScopes.length).toBe(1);

expect(startSpanScopes.length).toBe(1);
expect(startSpanScopes[0].spans.length).toBe(2);
expect(startSpanScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
parentSpanId: expect.any(String),
name: 'test-span',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'test-transaction',
kind: 1,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
flags: expect.any(Number),
},
]);
// Sentry spans should not be exported when tracing is disabled
expect(startSpanScopes.length).toBe(0);

// Undici spans are emitted correctly
expect(undiciScopes.length).toBe(1);
Expand DownExpand Up@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
},
]);
});

test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
waitForTransaction('node-otel-without-tracing', transactionEvent => {
throw new Error('THIS SHOULD NEVER HAPPEN!');
});

// Ensure we send data to the OTLP endpoint
const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
const json = JSON.parse(data) as any;

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;

// Look for the custom span from our custom-tracer
const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
});

fetch(`${baseURL}/test-only-if-parent`);

const otelData = await otelPromise;

expect(otelData).toBeDefined();

const json = JSON.parse(otelData);
expect(json.resourceSpans.length).toBe(1);

const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
expect(scopeSpans).toBeDefined();

// Should have HTTP instrumentation span but NO Sentry span
const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');

// HTTP span exists (from the incoming request)
expect(httpScopes.length).toBe(1);

// Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
expect(sentryScopes.length).toBe(0);

// Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
expect(customScopes.length).toBe(1);
expect(customScopes[0].spans.length).toBe(1);
expect(customScopes[0].spans[0]).toMatchObject({
name: 'custom-span-with-only-if-parent',
kind: 1,
status: { code: 0 },
});

// Verify the custom span is recording (not suppressed)
const customSpan = customScopes[0].spans[0];
expect(customSpan.spanId).not.toBe('0000000000000000');
expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: '1.0',
tracesSampleRate: 1.0,
enableLogs: true,
integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
});
4 changes: 4 additions & 0 deletions dev-packages/node-integration-tests/suites/pino/test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('event')
.ignore('transaction')
.expect({
log: log => {
const traceId1 = log.items?.[0]?.trace_id;
Expand All@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-next.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
event: {
exception: {
Expand DownExpand Up@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
await createRunner(__dirname, 'scenario-track.mjs')
.withMockSentryServer()
.withInstrument(instrumentPath)
.ignore('transaction')
.expect({
log: {
items: [
Expand Down
Loading