fix(node): Ensure node-fetch does not emit spans without tracing#13765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mydea merged 1 commit into from
Sep 24, 2024
Merged

fix(node): Ensure node-fetch does not emit spans without tracing #13765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -895,6 +895,7 @@ jobs:
'node-express-cjs-preload',
'node-otel-sdk-node',
'node-otel-custom-sampler',
'node-otel-without-tracing',
'ember-classic',
'ember-embroider',
'nextjs-app-dir',
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ local.log
.rpt2_cache

lint-results.json
trace.zip

# legacy
tmp.js
Expand Down
8 changes: 4 additions & 4 deletions dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/sdk-trace-node": "1.25.1",
"@opentelemetry/exporter-trace-otlp-http": "0.52.1",
"@opentelemetry/instrumentation-undici": "0.4.0",
"@opentelemetry/instrumentation": "0.52.1",
"@opentelemetry/sdk-trace-node": "1.26.0",
"@opentelemetry/exporter-trace-otlp-http": "0.53.0",
"@opentelemetry/instrumentation-undici": "0.6.0",
"@opentelemetry/instrumentation": "0.53.0",
"@sentry/core": "latest || *",
"@sentry/node": "latest || *",
"@sentry/opentelemetry": "latest || *",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const { SentrySpanProcessor, SentryPropagator } = require('@sentry/opentelemetry
const { UndiciInstrumentation } = require('@opentelemetry/instrumentation-undici');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');

const sentryClient = Sentry.init({
Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn:
process.env.E2E_TEST_DSN ||
Expand Down
158 changes: 57 additions & 101 deletions ...packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

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

const httpScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const httpScope = scopeSpans?.find(
scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
);

return (
httpScope &&
Expand All@@ -22,7 +24,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
);
});

await fetch(`${baseURL}/test-transaction`);
fetch(`${baseURL}/test-transaction`);

const otelData = await otelPromise;

Expand All@@ -38,7 +40,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
// But our default node-fetch spans are not emitted
expect(scopeSpans.length).toEqual(2);

const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
const httpScopes = scopeSpans?.filter(
scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
);
const undiciScopes = scopeSpans?.filter(
scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-undici',
);
Expand All@@ -49,6 +53,38 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
expect(undiciScopes.length).toBe(1);
expect(undiciScopes[0].spans.length).toBe(1);

expect(undiciScopes[0].spans).toEqual([
{
traceId: expect.any(String),
spanId: expect.any(String),
name: 'GET',
kind: 3,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: expect.arrayContaining([
{ key: 'http.request.method', value: { stringValue: 'GET' } },
{ key: 'http.request.method_original', value: { stringValue: 'GET' } },
{ key: 'url.full', value: { stringValue: 'http://localhost:3030/test-success' } },
{ key: 'url.path', value: { stringValue: '/test-success' } },
{ key: 'url.query', value: { stringValue: '' } },
{ key: 'url.scheme', value: { stringValue: 'http' } },
{ key: 'server.address', value: { stringValue: 'localhost' } },
{ key: 'server.port', value: { intValue: 3030 } },
{ key: 'user_agent.original', value: { stringValue: 'node' } },
{ key: 'network.peer.address', value: { stringValue: expect.any(String) } },
{ key: 'network.peer.port', value: { intValue: 3030 } },
{ key: 'http.response.status_code', value: { intValue: 200 } },
{ key: 'http.response.header.content-length', value: { intValue: 16 } },
]),
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
status: { code: 0 },
links: [],
droppedLinksCount: 0,
},
]);

// There may be another span from another request, we can ignore that
const httpSpans = httpScopes[0].spans.filter(span =>
span.attributes.some(attr => attr.key === 'http.target' && attr.value?.stringValue === '/test-transaction'),
Expand All@@ -62,104 +98,24 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
kind: 2,
startTimeUnixNano: expect.any(String),
endTimeUnixNano: expect.any(String),
attributes: [
{
key: 'http.url',
value: {
stringValue: 'http://localhost:3030/test-transaction',
},
},
{
key: 'http.host',
value: {
stringValue: 'localhost:3030',
},
},
{
key: 'net.host.name',
value: {
stringValue: 'localhost',
},
},
{
key: 'http.method',
value: {
stringValue: 'GET',
},
},
{
key: 'http.scheme',
value: {
stringValue: 'http',
},
},
{
key: 'http.target',
value: {
stringValue: '/test-transaction',
},
},
{
key: 'http.user_agent',
value: {
stringValue: 'node',
},
},
{
key: 'http.flavor',
value: {
stringValue: '1.1',
},
},
{
key: 'net.transport',
value: {
stringValue: 'ip_tcp',
},
},
{
key: 'sentry.origin',
value: {
stringValue: 'auto.http.otel.http',
},
},
{
key: 'net.host.ip',
value: {
stringValue: expect.any(String),
},
},
{
key: 'net.host.port',
value: {
intValue: 3030,
},
},
{
key: 'net.peer.ip',
value: {
stringValue: expect.any(String),
},
},
{
key: 'net.peer.port',
value: {
intValue: expect.any(Number),
},
},
{
key: 'http.status_code',
value: {
intValue: 200,
},
},
{
key: 'http.status_text',
value: {
stringValue: 'OK',
},
},
],
attributes: expect.arrayContaining([
{ key: 'http.url', value: { stringValue: 'http://localhost:3030/test-transaction' } },
{ key: 'http.host', value: { stringValue: 'localhost:3030' } },
{ key: 'net.host.name', value: { stringValue: 'localhost' } },
{ key: 'http.method', value: { stringValue: 'GET' } },
{ key: 'http.scheme', value: { stringValue: 'http' } },
{ key: 'http.target', value: { stringValue: '/test-transaction' } },
{ key: 'http.user_agent', value: { stringValue: 'node' } },
{ key: 'http.flavor', value: { stringValue: '1.1' } },
{ key: 'net.transport', value: { stringValue: 'ip_tcp' } },
{ key: 'net.host.ip', value: { stringValue: expect.any(String) } },
{ key: 'net.host.port', value: { intValue: 3030 } },
{ key: 'net.peer.ip', value: { stringValue: expect.any(String) } },
{ key: 'net.peer.port', value: { intValue: expect.any(Number) } },
{ key: 'http.status_code', value: { intValue: 200 } },
{ key: 'http.status_text', value: { stringValue: 'OK' } },
{ key: 'sentry.origin', value: { stringValue: 'auto.http.otel.http' } },
]),
droppedAttributesCount: 0,
events: [],
droppedEventsCount: 0,
Expand Down
15 changes: 14 additions & 1 deletion dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ async function run(): Promise<void> {
Sentry.addBreadcrumb({ message: 'manual breadcrumb' });

await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -46,3 +46,16 @@ function makeHttpRequest(url: string): Promise<void> {
.end();
});
}

function makeHttpGet(url: string): Promise<void> {
return new Promise<void>(resolve => {
http.get(url, httpRes => {
httpRes.on('data', () => {
// we don't care about data
});
httpRes.on('end', () => {
resolve();
});
});
});
}
15 changes: 14 additions & 1 deletion dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import * as http from 'http';

async function run(): Promise<void> {
await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -37,3 +37,16 @@ function makeHttpRequest(url: string): Promise<void> {
.end();
});
}

function makeHttpGet(url: string): Promise<void> {
return new Promise<void>(resolve => {
http.get(url, httpRes => {
httpRes.on('data', () => {
// we don't care about data
});
httpRes.on('end', () => {
resolve();
});
});
});
}
50 changes: 50 additions & 0 deletions dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,56 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
},
],
},
breadcrumbs: [
{
message: 'manual breadcrumb',
timestamp: expect.any(Number),
},
{
category: 'http',
data: {
'http.method': 'GET',
url: `${SERVER_URL}/api/v0`,
status_code: 404,
ADDED_PATH: '/api/v0',
},
timestamp: expect.any(Number),
type: 'http',
},
{
category: 'http',
data: {
'http.method': 'GET',
url: `${SERVER_URL}/api/v1`,
status_code: 404,
ADDED_PATH: '/api/v1',
},
timestamp: expect.any(Number),
type: 'http',
},
{
category: 'http',
data: {
'http.method': 'GET',
url: `${SERVER_URL}/api/v2`,
status_code: 404,
ADDED_PATH: '/api/v2',
},
timestamp: expect.any(Number),
type: 'http',
},
{
category: 'http',
data: {
'http.method': 'GET',
url: `${SERVER_URL}/api/v3`,
status_code: 404,
ADDED_PATH: '/api/v3',
},
timestamp: expect.any(Number),
type: 'http',
},
],
},
})
.start(closeTestServer);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(node): Ensure node-fetch does not emit spans without tracing#13765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Sep 24, 2024
 Merged


fix(node): Ensure node-fetch does not emit spans without tracing
#13765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -895,6 +895,7 @@ jobs:
 'node-express-cjs-preload',
 'node-otel-sdk-node',
 'node-otel-custom-sampler',
 'node-otel-without-tracing',
 'ember-classic',
 'ember-embroider',
 'nextjs-app-dir',
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ local.log
.rpt2_cache

lint-results.json
trace.zip

# legacy
tmp.js
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.25.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/instrumentation-undici": "0.4.0",
 "@opentelemetry/instrumentation": "0.52.1",
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const { SentrySpanProcessor, SentryPropagator } = require('@sentry/opentelemetry
const { UndiciInstrumentation } = require('@opentelemetry/instrumentation-undici');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');

const sentryClient = Sentry.init({
Sentry.init({
 environment: 'qa', // dynamic sampling bias to keep transactions
 dsn:
 process.env.E2E_TEST_DSN ||
Expand Down

158 changes: 57 additions & 101 deletions
...packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

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

 const httpScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScope = scopeSpans?.find(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );

 return (
 httpScope &&
Expand All@@ -22,7 +24,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 );
 });

await fetch(`${baseURL}/test-transaction`);
 fetch(`${baseURL}/test-transaction`);

 const otelData = await otelPromise;

Expand All@@ -38,7 +40,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 // But our default node-fetch spans are not emitted
 expect(scopeSpans.length).toEqual(2);

 const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );
 const undiciScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-undici',
 );
Expand All@@ -49,6 +53,38 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 expect(undiciScopes.length).toBe(1);
 expect(undiciScopes[0].spans.length).toBe(1);

 expect(undiciScopes[0].spans).toEqual([
 {
 traceId: expect.any(String),
 spanId: expect.any(String),
 name: 'GET',
 kind: 3,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: expect.arrayContaining([
 { key: 'http.request.method', value: { stringValue: 'GET' } },
 { key: 'http.request.method_original', value: { stringValue: 'GET' } },
 { key: 'url.full', value: { stringValue: 'http://localhost:3030/test-success' } },
 { key: 'url.path', value: { stringValue: '/test-success' } },
 { key: 'url.query', value: { stringValue: '' } },
 { key: 'url.scheme', value: { stringValue: 'http' } },
 { key: 'server.address', value: { stringValue: 'localhost' } },
 { key: 'server.port', value: { intValue: 3030 } },
 { key: 'user_agent.original', value: { stringValue: 'node' } },
 { key: 'network.peer.address', value: { stringValue: expect.any(String) } },
 { key: 'network.peer.port', value: { intValue: 3030 } },
 { key: 'http.response.status_code', value: { intValue: 200 } },
 { key: 'http.response.header.content-length', value: { intValue: 16 } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
 status: { code: 0 },
 links: [],
 droppedLinksCount: 0,
 },
 ]);

 // There may be another span from another request, we can ignore that
 const httpSpans = httpScopes[0].spans.filter(span =>
 span.attributes.some(attr => attr.key === 'http.target' && attr.value?.stringValue === '/test-transaction'),
Expand All@@ -62,104 +98,24 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 kind: 2,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: [
 {
 key: 'http.url',
 value: {
 stringValue: 'http://localhost:3030/test-transaction',
 },
 },
 {
 key: 'http.host',
 value: {
 stringValue: 'localhost:3030',
 },
 },
 {
 key: 'net.host.name',
 value: {
 stringValue: 'localhost',
 },
 },
 {
 key: 'http.method',
 value: {
 stringValue: 'GET',
 },
 },
 {
 key: 'http.scheme',
 value: {
 stringValue: 'http',
 },
 },
 {
 key: 'http.target',
 value: {
 stringValue: '/test-transaction',
 },
 },
 {
 key: 'http.user_agent',
 value: {
 stringValue: 'node',
 },
 },
 {
 key: 'http.flavor',
 value: {
 stringValue: '1.1',
 },
 },
 {
 key: 'net.transport',
 value: {
 stringValue: 'ip_tcp',
 },
 },
 {
 key: 'sentry.origin',
 value: {
 stringValue: 'auto.http.otel.http',
 },
 },
 {
 key: 'net.host.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.host.port',
 value: {
 intValue: 3030,
 },
 },
 {
 key: 'net.peer.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.peer.port',
 value: {
 intValue: expect.any(Number),
 },
 },
 {
 key: 'http.status_code',
 value: {
 intValue: 200,
 },
 },
 {
 key: 'http.status_text',
 value: {
 stringValue: 'OK',
 },
 },
 ],
 attributes: expect.arrayContaining([
 { key: 'http.url', value: { stringValue: 'http://localhost:3030/test-transaction' } },
 { key: 'http.host', value: { stringValue: 'localhost:3030' } },
 { key: 'net.host.name', value: { stringValue: 'localhost' } },
 { key: 'http.method', value: { stringValue: 'GET' } },
 { key: 'http.scheme', value: { stringValue: 'http' } },
 { key: 'http.target', value: { stringValue: '/test-transaction' } },
 { key: 'http.user_agent', value: { stringValue: 'node' } },
 { key: 'http.flavor', value: { stringValue: '1.1' } },
 { key: 'net.transport', value: { stringValue: 'ip_tcp' } },
 { key: 'net.host.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.host.port', value: { intValue: 3030 } },
 { key: 'net.peer.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.peer.port', value: { intValue: expect.any(Number) } },
 { key: 'http.status_code', value: { intValue: 200 } },
 { key: 'http.status_text', value: { stringValue: 'OK' } },
 { key: 'sentry.origin', value: { stringValue: 'auto.http.otel.http' } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
Expand Down

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ async function run(): Promise<void> {
 Sentry.addBreadcrumb({ message: 'manual breadcrumb' });

 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -46,3 +46,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import * as http from 'http';

async function run(): Promise<void> {
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -37,3 +37,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

50 changes: 50 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,56 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
 },
 ],
 },
 breadcrumbs: [
 {
 message: 'manual breadcrumb',
 timestamp: expect.any(Number),
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v0`,
 status_code: 404,
 ADDED_PATH: '/api/v0',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v1`,
 status_code: 404,
 ADDED_PATH: '/api/v1',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v2`,
 status_code: 404,
 ADDED_PATH: '/api/v2',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v3`,
 status_code: 404,
 ADDED_PATH: '/api/v3',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 ],
 },
 })
 .start(closeTestServer);
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
fix(node): Ensure node-fetch does not emit spans without tracing#13765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Sep 24, 2024
 Merged


fix(node): Ensure node-fetch does not emit spans without tracing
#13765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -895,6 +895,7 @@ jobs:
 'node-express-cjs-preload',
 'node-otel-sdk-node',
 'node-otel-custom-sampler',
 'node-otel-without-tracing',
 'ember-classic',
 'ember-embroider',
 'nextjs-app-dir',
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ local.log
.rpt2_cache

lint-results.json
trace.zip

# legacy
tmp.js
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.25.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/instrumentation-undici": "0.4.0",
 "@opentelemetry/instrumentation": "0.52.1",
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const { SentrySpanProcessor, SentryPropagator } = require('@sentry/opentelemetry
const { UndiciInstrumentation } = require('@opentelemetry/instrumentation-undici');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');

const sentryClient = Sentry.init({
Sentry.init({
 environment: 'qa', // dynamic sampling bias to keep transactions
 dsn:
 process.env.E2E_TEST_DSN ||
Expand Down

158 changes: 57 additions & 101 deletions
...packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

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

 const httpScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScope = scopeSpans?.find(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );

 return (
 httpScope &&
Expand All@@ -22,7 +24,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 );
 });

await fetch(`${baseURL}/test-transaction`);
 fetch(`${baseURL}/test-transaction`);

 const otelData = await otelPromise;

Expand All@@ -38,7 +40,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 // But our default node-fetch spans are not emitted
 expect(scopeSpans.length).toEqual(2);

 const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );
 const undiciScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-undici',
 );
Expand All@@ -49,6 +53,38 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 expect(undiciScopes.length).toBe(1);
 expect(undiciScopes[0].spans.length).toBe(1);

 expect(undiciScopes[0].spans).toEqual([
 {
 traceId: expect.any(String),
 spanId: expect.any(String),
 name: 'GET',
 kind: 3,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: expect.arrayContaining([
 { key: 'http.request.method', value: { stringValue: 'GET' } },
 { key: 'http.request.method_original', value: { stringValue: 'GET' } },
 { key: 'url.full', value: { stringValue: 'http://localhost:3030/test-success' } },
 { key: 'url.path', value: { stringValue: '/test-success' } },
 { key: 'url.query', value: { stringValue: '' } },
 { key: 'url.scheme', value: { stringValue: 'http' } },
 { key: 'server.address', value: { stringValue: 'localhost' } },
 { key: 'server.port', value: { intValue: 3030 } },
 { key: 'user_agent.original', value: { stringValue: 'node' } },
 { key: 'network.peer.address', value: { stringValue: expect.any(String) } },
 { key: 'network.peer.port', value: { intValue: 3030 } },
 { key: 'http.response.status_code', value: { intValue: 200 } },
 { key: 'http.response.header.content-length', value: { intValue: 16 } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
 status: { code: 0 },
 links: [],
 droppedLinksCount: 0,
 },
 ]);

 // There may be another span from another request, we can ignore that
 const httpSpans = httpScopes[0].spans.filter(span =>
 span.attributes.some(attr => attr.key === 'http.target' && attr.value?.stringValue === '/test-transaction'),
Expand All@@ -62,104 +98,24 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 kind: 2,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: [
 {
 key: 'http.url',
 value: {
 stringValue: 'http://localhost:3030/test-transaction',
 },
 },
 {
 key: 'http.host',
 value: {
 stringValue: 'localhost:3030',
 },
 },
 {
 key: 'net.host.name',
 value: {
 stringValue: 'localhost',
 },
 },
 {
 key: 'http.method',
 value: {
 stringValue: 'GET',
 },
 },
 {
 key: 'http.scheme',
 value: {
 stringValue: 'http',
 },
 },
 {
 key: 'http.target',
 value: {
 stringValue: '/test-transaction',
 },
 },
 {
 key: 'http.user_agent',
 value: {
 stringValue: 'node',
 },
 },
 {
 key: 'http.flavor',
 value: {
 stringValue: '1.1',
 },
 },
 {
 key: 'net.transport',
 value: {
 stringValue: 'ip_tcp',
 },
 },
 {
 key: 'sentry.origin',
 value: {
 stringValue: 'auto.http.otel.http',
 },
 },
 {
 key: 'net.host.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.host.port',
 value: {
 intValue: 3030,
 },
 },
 {
 key: 'net.peer.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.peer.port',
 value: {
 intValue: expect.any(Number),
 },
 },
 {
 key: 'http.status_code',
 value: {
 intValue: 200,
 },
 },
 {
 key: 'http.status_text',
 value: {
 stringValue: 'OK',
 },
 },
 ],
 attributes: expect.arrayContaining([
 { key: 'http.url', value: { stringValue: 'http://localhost:3030/test-transaction' } },
 { key: 'http.host', value: { stringValue: 'localhost:3030' } },
 { key: 'net.host.name', value: { stringValue: 'localhost' } },
 { key: 'http.method', value: { stringValue: 'GET' } },
 { key: 'http.scheme', value: { stringValue: 'http' } },
 { key: 'http.target', value: { stringValue: '/test-transaction' } },
 { key: 'http.user_agent', value: { stringValue: 'node' } },
 { key: 'http.flavor', value: { stringValue: '1.1' } },
 { key: 'net.transport', value: { stringValue: 'ip_tcp' } },
 { key: 'net.host.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.host.port', value: { intValue: 3030 } },
 { key: 'net.peer.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.peer.port', value: { intValue: expect.any(Number) } },
 { key: 'http.status_code', value: { intValue: 200 } },
 { key: 'http.status_text', value: { stringValue: 'OK' } },
 { key: 'sentry.origin', value: { stringValue: 'auto.http.otel.http' } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
Expand Down

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ async function run(): Promise<void> {
 Sentry.addBreadcrumb({ message: 'manual breadcrumb' });

 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -46,3 +46,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import * as http from 'http';

async function run(): Promise<void> {
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -37,3 +37,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

50 changes: 50 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,56 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
 },
 ],
 },
 breadcrumbs: [
 {
 message: 'manual breadcrumb',
 timestamp: expect.any(Number),
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v0`,
 status_code: 404,
 ADDED_PATH: '/api/v0',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v1`,
 status_code: 404,
 ADDED_PATH: '/api/v1',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v2`,
 status_code: 404,
 ADDED_PATH: '/api/v2',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v3`,
 status_code: 404,
 ADDED_PATH: '/api/v3',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 ],
 },
 })
 .start(closeTestServer);
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 > 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
fix(node): Ensure node-fetch does not emit spans without tracing#13765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Sep 24, 2024
 Merged


fix(node): Ensure node-fetch does not emit spans without tracing
#13765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -895,6 +895,7 @@ jobs:
 'node-express-cjs-preload',
 'node-otel-sdk-node',
 'node-otel-custom-sampler',
 'node-otel-without-tracing',
 'ember-classic',
 'ember-embroider',
 'nextjs-app-dir',
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ local.log
.rpt2_cache

lint-results.json
trace.zip

# legacy
tmp.js
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.25.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/instrumentation-undici": "0.4.0",
 "@opentelemetry/instrumentation": "0.52.1",
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const { SentrySpanProcessor, SentryPropagator } = require('@sentry/opentelemetry
const { UndiciInstrumentation } = require('@opentelemetry/instrumentation-undici');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');

const sentryClient = Sentry.init({
Sentry.init({
 environment: 'qa', // dynamic sampling bias to keep transactions
 dsn:
 process.env.E2E_TEST_DSN ||
Expand Down

158 changes: 57 additions & 101 deletions
...packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

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

 const httpScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScope = scopeSpans?.find(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );

 return (
 httpScope &&
Expand All@@ -22,7 +24,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 );
 });

await fetch(`${baseURL}/test-transaction`);
 fetch(`${baseURL}/test-transaction`);

 const otelData = await otelPromise;

Expand All@@ -38,7 +40,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 // But our default node-fetch spans are not emitted
 expect(scopeSpans.length).toEqual(2);

 const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );
 const undiciScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-undici',
 );
Expand All@@ -49,6 +53,38 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 expect(undiciScopes.length).toBe(1);
 expect(undiciScopes[0].spans.length).toBe(1);

 expect(undiciScopes[0].spans).toEqual([
 {
 traceId: expect.any(String),
 spanId: expect.any(String),
 name: 'GET',
 kind: 3,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: expect.arrayContaining([
 { key: 'http.request.method', value: { stringValue: 'GET' } },
 { key: 'http.request.method_original', value: { stringValue: 'GET' } },
 { key: 'url.full', value: { stringValue: 'http://localhost:3030/test-success' } },
 { key: 'url.path', value: { stringValue: '/test-success' } },
 { key: 'url.query', value: { stringValue: '' } },
 { key: 'url.scheme', value: { stringValue: 'http' } },
 { key: 'server.address', value: { stringValue: 'localhost' } },
 { key: 'server.port', value: { intValue: 3030 } },
 { key: 'user_agent.original', value: { stringValue: 'node' } },
 { key: 'network.peer.address', value: { stringValue: expect.any(String) } },
 { key: 'network.peer.port', value: { intValue: 3030 } },
 { key: 'http.response.status_code', value: { intValue: 200 } },
 { key: 'http.response.header.content-length', value: { intValue: 16 } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
 status: { code: 0 },
 links: [],
 droppedLinksCount: 0,
 },
 ]);

 // There may be another span from another request, we can ignore that
 const httpSpans = httpScopes[0].spans.filter(span =>
 span.attributes.some(attr => attr.key === 'http.target' && attr.value?.stringValue === '/test-transaction'),
Expand All@@ -62,104 +98,24 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 kind: 2,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: [
 {
 key: 'http.url',
 value: {
 stringValue: 'http://localhost:3030/test-transaction',
 },
 },
 {
 key: 'http.host',
 value: {
 stringValue: 'localhost:3030',
 },
 },
 {
 key: 'net.host.name',
 value: {
 stringValue: 'localhost',
 },
 },
 {
 key: 'http.method',
 value: {
 stringValue: 'GET',
 },
 },
 {
 key: 'http.scheme',
 value: {
 stringValue: 'http',
 },
 },
 {
 key: 'http.target',
 value: {
 stringValue: '/test-transaction',
 },
 },
 {
 key: 'http.user_agent',
 value: {
 stringValue: 'node',
 },
 },
 {
 key: 'http.flavor',
 value: {
 stringValue: '1.1',
 },
 },
 {
 key: 'net.transport',
 value: {
 stringValue: 'ip_tcp',
 },
 },
 {
 key: 'sentry.origin',
 value: {
 stringValue: 'auto.http.otel.http',
 },
 },
 {
 key: 'net.host.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.host.port',
 value: {
 intValue: 3030,
 },
 },
 {
 key: 'net.peer.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.peer.port',
 value: {
 intValue: expect.any(Number),
 },
 },
 {
 key: 'http.status_code',
 value: {
 intValue: 200,
 },
 },
 {
 key: 'http.status_text',
 value: {
 stringValue: 'OK',
 },
 },
 ],
 attributes: expect.arrayContaining([
 { key: 'http.url', value: { stringValue: 'http://localhost:3030/test-transaction' } },
 { key: 'http.host', value: { stringValue: 'localhost:3030' } },
 { key: 'net.host.name', value: { stringValue: 'localhost' } },
 { key: 'http.method', value: { stringValue: 'GET' } },
 { key: 'http.scheme', value: { stringValue: 'http' } },
 { key: 'http.target', value: { stringValue: '/test-transaction' } },
 { key: 'http.user_agent', value: { stringValue: 'node' } },
 { key: 'http.flavor', value: { stringValue: '1.1' } },
 { key: 'net.transport', value: { stringValue: 'ip_tcp' } },
 { key: 'net.host.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.host.port', value: { intValue: 3030 } },
 { key: 'net.peer.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.peer.port', value: { intValue: expect.any(Number) } },
 { key: 'http.status_code', value: { intValue: 200 } },
 { key: 'http.status_text', value: { stringValue: 'OK' } },
 { key: 'sentry.origin', value: { stringValue: 'auto.http.otel.http' } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
Expand Down

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ async function run(): Promise<void> {
 Sentry.addBreadcrumb({ message: 'manual breadcrumb' });

 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -46,3 +46,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import * as http from 'http';

async function run(): Promise<void> {
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -37,3 +37,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

50 changes: 50 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,56 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
 },
 ],
 },
 breadcrumbs: [
 {
 message: 'manual breadcrumb',
 timestamp: expect.any(Number),
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v0`,
 status_code: 404,
 ADDED_PATH: '/api/v0',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v1`,
 status_code: 404,
 ADDED_PATH: '/api/v1',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v2`,
 status_code: 404,
 ADDED_PATH: '/api/v2',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v3`,
 status_code: 404,
 ADDED_PATH: '/api/v3',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 ],
 },
 })
 .start(closeTestServer);
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
fix(node): Ensure node-fetch does not emit spans without tracing#13765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Sep 24, 2024
 Merged


fix(node): Ensure node-fetch does not emit spans without tracing
#13765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -895,6 +895,7 @@ jobs:
 'node-express-cjs-preload',
 'node-otel-sdk-node',
 'node-otel-custom-sampler',
 'node-otel-without-tracing',
 'ember-classic',
 'ember-embroider',
 'nextjs-app-dir',
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ local.log
.rpt2_cache

lint-results.json
trace.zip

# legacy
tmp.js
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.25.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/instrumentation-undici": "0.4.0",
 "@opentelemetry/instrumentation": "0.52.1",
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const { SentrySpanProcessor, SentryPropagator } = require('@sentry/opentelemetry
const { UndiciInstrumentation } = require('@opentelemetry/instrumentation-undici');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');

const sentryClient = Sentry.init({
Sentry.init({
 environment: 'qa', // dynamic sampling bias to keep transactions
 dsn:
 process.env.E2E_TEST_DSN ||
Expand Down

158 changes: 57 additions & 101 deletions
...packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

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

 const httpScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScope = scopeSpans?.find(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );

 return (
 httpScope &&
Expand All@@ -22,7 +24,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 );
 });

await fetch(`${baseURL}/test-transaction`);
 fetch(`${baseURL}/test-transaction`);

 const otelData = await otelPromise;

Expand All@@ -38,7 +40,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 // But our default node-fetch spans are not emitted
 expect(scopeSpans.length).toEqual(2);

 const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );
 const undiciScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-undici',
 );
Expand All@@ -49,6 +53,38 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 expect(undiciScopes.length).toBe(1);
 expect(undiciScopes[0].spans.length).toBe(1);

 expect(undiciScopes[0].spans).toEqual([
 {
 traceId: expect.any(String),
 spanId: expect.any(String),
 name: 'GET',
 kind: 3,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: expect.arrayContaining([
 { key: 'http.request.method', value: { stringValue: 'GET' } },
 { key: 'http.request.method_original', value: { stringValue: 'GET' } },
 { key: 'url.full', value: { stringValue: 'http://localhost:3030/test-success' } },
 { key: 'url.path', value: { stringValue: '/test-success' } },
 { key: 'url.query', value: { stringValue: '' } },
 { key: 'url.scheme', value: { stringValue: 'http' } },
 { key: 'server.address', value: { stringValue: 'localhost' } },
 { key: 'server.port', value: { intValue: 3030 } },
 { key: 'user_agent.original', value: { stringValue: 'node' } },
 { key: 'network.peer.address', value: { stringValue: expect.any(String) } },
 { key: 'network.peer.port', value: { intValue: 3030 } },
 { key: 'http.response.status_code', value: { intValue: 200 } },
 { key: 'http.response.header.content-length', value: { intValue: 16 } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
 status: { code: 0 },
 links: [],
 droppedLinksCount: 0,
 },
 ]);

 // There may be another span from another request, we can ignore that
 const httpSpans = httpScopes[0].spans.filter(span =>
 span.attributes.some(attr => attr.key === 'http.target' && attr.value?.stringValue === '/test-transaction'),
Expand All@@ -62,104 +98,24 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 kind: 2,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: [
 {
 key: 'http.url',
 value: {
 stringValue: 'http://localhost:3030/test-transaction',
 },
 },
 {
 key: 'http.host',
 value: {
 stringValue: 'localhost:3030',
 },
 },
 {
 key: 'net.host.name',
 value: {
 stringValue: 'localhost',
 },
 },
 {
 key: 'http.method',
 value: {
 stringValue: 'GET',
 },
 },
 {
 key: 'http.scheme',
 value: {
 stringValue: 'http',
 },
 },
 {
 key: 'http.target',
 value: {
 stringValue: '/test-transaction',
 },
 },
 {
 key: 'http.user_agent',
 value: {
 stringValue: 'node',
 },
 },
 {
 key: 'http.flavor',
 value: {
 stringValue: '1.1',
 },
 },
 {
 key: 'net.transport',
 value: {
 stringValue: 'ip_tcp',
 },
 },
 {
 key: 'sentry.origin',
 value: {
 stringValue: 'auto.http.otel.http',
 },
 },
 {
 key: 'net.host.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.host.port',
 value: {
 intValue: 3030,
 },
 },
 {
 key: 'net.peer.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.peer.port',
 value: {
 intValue: expect.any(Number),
 },
 },
 {
 key: 'http.status_code',
 value: {
 intValue: 200,
 },
 },
 {
 key: 'http.status_text',
 value: {
 stringValue: 'OK',
 },
 },
 ],
 attributes: expect.arrayContaining([
 { key: 'http.url', value: { stringValue: 'http://localhost:3030/test-transaction' } },
 { key: 'http.host', value: { stringValue: 'localhost:3030' } },
 { key: 'net.host.name', value: { stringValue: 'localhost' } },
 { key: 'http.method', value: { stringValue: 'GET' } },
 { key: 'http.scheme', value: { stringValue: 'http' } },
 { key: 'http.target', value: { stringValue: '/test-transaction' } },
 { key: 'http.user_agent', value: { stringValue: 'node' } },
 { key: 'http.flavor', value: { stringValue: '1.1' } },
 { key: 'net.transport', value: { stringValue: 'ip_tcp' } },
 { key: 'net.host.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.host.port', value: { intValue: 3030 } },
 { key: 'net.peer.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.peer.port', value: { intValue: expect.any(Number) } },
 { key: 'http.status_code', value: { intValue: 200 } },
 { key: 'http.status_text', value: { stringValue: 'OK' } },
 { key: 'sentry.origin', value: { stringValue: 'auto.http.otel.http' } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
Expand Down

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ async function run(): Promise<void> {
 Sentry.addBreadcrumb({ message: 'manual breadcrumb' });

 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -46,3 +46,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import * as http from 'http';

async function run(): Promise<void> {
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -37,3 +37,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

50 changes: 50 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,56 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
 },
 ],
 },
 breadcrumbs: [
 {
 message: 'manual breadcrumb',
 timestamp: expect.any(Number),
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v0`,
 status_code: 404,
 ADDED_PATH: '/api/v0',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v1`,
 status_code: 404,
 ADDED_PATH: '/api/v1',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v2`,
 status_code: 404,
 ADDED_PATH: '/api/v2',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v3`,
 status_code: 404,
 ADDED_PATH: '/api/v3',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 ],
 },
 })
 .start(closeTestServer);
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
fix(node): Ensure node-fetch does not emit spans without tracing#13765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Sep 24, 2024
 Merged


fix(node): Ensure node-fetch does not emit spans without tracing
#13765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -895,6 +895,7 @@ jobs:
 'node-express-cjs-preload',
 'node-otel-sdk-node',
 'node-otel-custom-sampler',
 'node-otel-without-tracing',
 'ember-classic',
 'ember-embroider',
 'nextjs-app-dir',
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ local.log
.rpt2_cache

lint-results.json
trace.zip

# legacy
tmp.js
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.25.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/instrumentation-undici": "0.4.0",
 "@opentelemetry/instrumentation": "0.52.1",
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const { SentrySpanProcessor, SentryPropagator } = require('@sentry/opentelemetry
const { UndiciInstrumentation } = require('@opentelemetry/instrumentation-undici');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');

const sentryClient = Sentry.init({
Sentry.init({
 environment: 'qa', // dynamic sampling bias to keep transactions
 dsn:
 process.env.E2E_TEST_DSN ||
Expand Down

158 changes: 57 additions & 101 deletions
...packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

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

 const httpScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScope = scopeSpans?.find(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );

 return (
 httpScope &&
Expand All@@ -22,7 +24,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 );
 });

await fetch(`${baseURL}/test-transaction`);
 fetch(`${baseURL}/test-transaction`);

 const otelData = await otelPromise;

Expand All@@ -38,7 +40,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 // But our default node-fetch spans are not emitted
 expect(scopeSpans.length).toEqual(2);

 const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );
 const undiciScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-undici',
 );
Expand All@@ -49,6 +53,38 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 expect(undiciScopes.length).toBe(1);
 expect(undiciScopes[0].spans.length).toBe(1);

 expect(undiciScopes[0].spans).toEqual([
 {
 traceId: expect.any(String),
 spanId: expect.any(String),
 name: 'GET',
 kind: 3,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: expect.arrayContaining([
 { key: 'http.request.method', value: { stringValue: 'GET' } },
 { key: 'http.request.method_original', value: { stringValue: 'GET' } },
 { key: 'url.full', value: { stringValue: 'http://localhost:3030/test-success' } },
 { key: 'url.path', value: { stringValue: '/test-success' } },
 { key: 'url.query', value: { stringValue: '' } },
 { key: 'url.scheme', value: { stringValue: 'http' } },
 { key: 'server.address', value: { stringValue: 'localhost' } },
 { key: 'server.port', value: { intValue: 3030 } },
 { key: 'user_agent.original', value: { stringValue: 'node' } },
 { key: 'network.peer.address', value: { stringValue: expect.any(String) } },
 { key: 'network.peer.port', value: { intValue: 3030 } },
 { key: 'http.response.status_code', value: { intValue: 200 } },
 { key: 'http.response.header.content-length', value: { intValue: 16 } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
 status: { code: 0 },
 links: [],
 droppedLinksCount: 0,
 },
 ]);

 // There may be another span from another request, we can ignore that
 const httpSpans = httpScopes[0].spans.filter(span =>
 span.attributes.some(attr => attr.key === 'http.target' && attr.value?.stringValue === '/test-transaction'),
Expand All@@ -62,104 +98,24 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 kind: 2,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: [
 {
 key: 'http.url',
 value: {
 stringValue: 'http://localhost:3030/test-transaction',
 },
 },
 {
 key: 'http.host',
 value: {
 stringValue: 'localhost:3030',
 },
 },
 {
 key: 'net.host.name',
 value: {
 stringValue: 'localhost',
 },
 },
 {
 key: 'http.method',
 value: {
 stringValue: 'GET',
 },
 },
 {
 key: 'http.scheme',
 value: {
 stringValue: 'http',
 },
 },
 {
 key: 'http.target',
 value: {
 stringValue: '/test-transaction',
 },
 },
 {
 key: 'http.user_agent',
 value: {
 stringValue: 'node',
 },
 },
 {
 key: 'http.flavor',
 value: {
 stringValue: '1.1',
 },
 },
 {
 key: 'net.transport',
 value: {
 stringValue: 'ip_tcp',
 },
 },
 {
 key: 'sentry.origin',
 value: {
 stringValue: 'auto.http.otel.http',
 },
 },
 {
 key: 'net.host.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.host.port',
 value: {
 intValue: 3030,
 },
 },
 {
 key: 'net.peer.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.peer.port',
 value: {
 intValue: expect.any(Number),
 },
 },
 {
 key: 'http.status_code',
 value: {
 intValue: 200,
 },
 },
 {
 key: 'http.status_text',
 value: {
 stringValue: 'OK',
 },
 },
 ],
 attributes: expect.arrayContaining([
 { key: 'http.url', value: { stringValue: 'http://localhost:3030/test-transaction' } },
 { key: 'http.host', value: { stringValue: 'localhost:3030' } },
 { key: 'net.host.name', value: { stringValue: 'localhost' } },
 { key: 'http.method', value: { stringValue: 'GET' } },
 { key: 'http.scheme', value: { stringValue: 'http' } },
 { key: 'http.target', value: { stringValue: '/test-transaction' } },
 { key: 'http.user_agent', value: { stringValue: 'node' } },
 { key: 'http.flavor', value: { stringValue: '1.1' } },
 { key: 'net.transport', value: { stringValue: 'ip_tcp' } },
 { key: 'net.host.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.host.port', value: { intValue: 3030 } },
 { key: 'net.peer.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.peer.port', value: { intValue: expect.any(Number) } },
 { key: 'http.status_code', value: { intValue: 200 } },
 { key: 'http.status_text', value: { stringValue: 'OK' } },
 { key: 'sentry.origin', value: { stringValue: 'auto.http.otel.http' } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
Expand Down

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ async function run(): Promise<void> {
 Sentry.addBreadcrumb({ message: 'manual breadcrumb' });

 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -46,3 +46,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import * as http from 'http';

async function run(): Promise<void> {
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -37,3 +37,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

50 changes: 50 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,56 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
 },
 ],
 },
 breadcrumbs: [
 {
 message: 'manual breadcrumb',
 timestamp: expect.any(Number),
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v0`,
 status_code: 404,
 ADDED_PATH: '/api/v0',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v1`,
 status_code: 404,
 ADDED_PATH: '/api/v1',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v2`,
 status_code: 404,
 ADDED_PATH: '/api/v2',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v3`,
 status_code: 404,
 ADDED_PATH: '/api/v3',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 ],
 },
 })
 .start(closeTestServer);
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
fix(node): Ensure node-fetch does not emit spans without tracing#13765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Sep 24, 2024
 Merged


fix(node): Ensure node-fetch does not emit spans without tracing
#13765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -895,6 +895,7 @@ jobs:
 'node-express-cjs-preload',
 'node-otel-sdk-node',
 'node-otel-custom-sampler',
 'node-otel-without-tracing',
 'ember-classic',
 'ember-embroider',
 'nextjs-app-dir',
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ local.log
.rpt2_cache

lint-results.json
trace.zip

# legacy
tmp.js
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.25.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/instrumentation-undici": "0.4.0",
 "@opentelemetry/instrumentation": "0.52.1",
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const { SentrySpanProcessor, SentryPropagator } = require('@sentry/opentelemetry
const { UndiciInstrumentation } = require('@opentelemetry/instrumentation-undici');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');

const sentryClient = Sentry.init({
Sentry.init({
 environment: 'qa', // dynamic sampling bias to keep transactions
 dsn:
 process.env.E2E_TEST_DSN ||
Expand Down

158 changes: 57 additions & 101 deletions
...packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

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

 const httpScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScope = scopeSpans?.find(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );

 return (
 httpScope &&
Expand All@@ -22,7 +24,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 );
 });

await fetch(`${baseURL}/test-transaction`);
 fetch(`${baseURL}/test-transaction`);

 const otelData = await otelPromise;

Expand All@@ -38,7 +40,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 // But our default node-fetch spans are not emitted
 expect(scopeSpans.length).toEqual(2);

 const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );
 const undiciScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-undici',
 );
Expand All@@ -49,6 +53,38 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 expect(undiciScopes.length).toBe(1);
 expect(undiciScopes[0].spans.length).toBe(1);

 expect(undiciScopes[0].spans).toEqual([
 {
 traceId: expect.any(String),
 spanId: expect.any(String),
 name: 'GET',
 kind: 3,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: expect.arrayContaining([
 { key: 'http.request.method', value: { stringValue: 'GET' } },
 { key: 'http.request.method_original', value: { stringValue: 'GET' } },
 { key: 'url.full', value: { stringValue: 'http://localhost:3030/test-success' } },
 { key: 'url.path', value: { stringValue: '/test-success' } },
 { key: 'url.query', value: { stringValue: '' } },
 { key: 'url.scheme', value: { stringValue: 'http' } },
 { key: 'server.address', value: { stringValue: 'localhost' } },
 { key: 'server.port', value: { intValue: 3030 } },
 { key: 'user_agent.original', value: { stringValue: 'node' } },
 { key: 'network.peer.address', value: { stringValue: expect.any(String) } },
 { key: 'network.peer.port', value: { intValue: 3030 } },
 { key: 'http.response.status_code', value: { intValue: 200 } },
 { key: 'http.response.header.content-length', value: { intValue: 16 } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
 status: { code: 0 },
 links: [],
 droppedLinksCount: 0,
 },
 ]);

 // There may be another span from another request, we can ignore that
 const httpSpans = httpScopes[0].spans.filter(span =>
 span.attributes.some(attr => attr.key === 'http.target' && attr.value?.stringValue === '/test-transaction'),
Expand All@@ -62,104 +98,24 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 kind: 2,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: [
 {
 key: 'http.url',
 value: {
 stringValue: 'http://localhost:3030/test-transaction',
 },
 },
 {
 key: 'http.host',
 value: {
 stringValue: 'localhost:3030',
 },
 },
 {
 key: 'net.host.name',
 value: {
 stringValue: 'localhost',
 },
 },
 {
 key: 'http.method',
 value: {
 stringValue: 'GET',
 },
 },
 {
 key: 'http.scheme',
 value: {
 stringValue: 'http',
 },
 },
 {
 key: 'http.target',
 value: {
 stringValue: '/test-transaction',
 },
 },
 {
 key: 'http.user_agent',
 value: {
 stringValue: 'node',
 },
 },
 {
 key: 'http.flavor',
 value: {
 stringValue: '1.1',
 },
 },
 {
 key: 'net.transport',
 value: {
 stringValue: 'ip_tcp',
 },
 },
 {
 key: 'sentry.origin',
 value: {
 stringValue: 'auto.http.otel.http',
 },
 },
 {
 key: 'net.host.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.host.port',
 value: {
 intValue: 3030,
 },
 },
 {
 key: 'net.peer.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.peer.port',
 value: {
 intValue: expect.any(Number),
 },
 },
 {
 key: 'http.status_code',
 value: {
 intValue: 200,
 },
 },
 {
 key: 'http.status_text',
 value: {
 stringValue: 'OK',
 },
 },
 ],
 attributes: expect.arrayContaining([
 { key: 'http.url', value: { stringValue: 'http://localhost:3030/test-transaction' } },
 { key: 'http.host', value: { stringValue: 'localhost:3030' } },
 { key: 'net.host.name', value: { stringValue: 'localhost' } },
 { key: 'http.method', value: { stringValue: 'GET' } },
 { key: 'http.scheme', value: { stringValue: 'http' } },
 { key: 'http.target', value: { stringValue: '/test-transaction' } },
 { key: 'http.user_agent', value: { stringValue: 'node' } },
 { key: 'http.flavor', value: { stringValue: '1.1' } },
 { key: 'net.transport', value: { stringValue: 'ip_tcp' } },
 { key: 'net.host.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.host.port', value: { intValue: 3030 } },
 { key: 'net.peer.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.peer.port', value: { intValue: expect.any(Number) } },
 { key: 'http.status_code', value: { intValue: 200 } },
 { key: 'http.status_text', value: { stringValue: 'OK' } },
 { key: 'sentry.origin', value: { stringValue: 'auto.http.otel.http' } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
Expand Down

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ async function run(): Promise<void> {
 Sentry.addBreadcrumb({ message: 'manual breadcrumb' });

 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -46,3 +46,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import * as http from 'http';

async function run(): Promise<void> {
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -37,3 +37,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

50 changes: 50 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,56 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
 },
 ],
 },
 breadcrumbs: [
 {
 message: 'manual breadcrumb',
 timestamp: expect.any(Number),
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v0`,
 status_code: 404,
 ADDED_PATH: '/api/v0',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v1`,
 status_code: 404,
 ADDED_PATH: '/api/v1',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v2`,
 status_code: 404,
 ADDED_PATH: '/api/v2',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v3`,
 status_code: 404,
 ADDED_PATH: '/api/v3',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 ],
 },
 })
 .start(closeTestServer);
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
fix(node): Ensure node-fetch does not emit spans without tracing#13765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Sep 24, 2024
 Merged


fix(node): Ensure node-fetch does not emit spans without tracing
#13765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -895,6 +895,7 @@ jobs:
 'node-express-cjs-preload',
 'node-otel-sdk-node',
 'node-otel-custom-sampler',
 'node-otel-without-tracing',
 'ember-classic',
 'ember-embroider',
 'nextjs-app-dir',
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ local.log
.rpt2_cache

lint-results.json
trace.zip

# legacy
tmp.js
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.25.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/instrumentation-undici": "0.4.0",
 "@opentelemetry/instrumentation": "0.52.1",
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const { SentrySpanProcessor, SentryPropagator } = require('@sentry/opentelemetry
const { UndiciInstrumentation } = require('@opentelemetry/instrumentation-undici');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');

const sentryClient = Sentry.init({
Sentry.init({
 environment: 'qa', // dynamic sampling bias to keep transactions
 dsn:
 process.env.E2E_TEST_DSN ||
Expand Down

158 changes: 57 additions & 101 deletions
...packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {

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

 const httpScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScope = scopeSpans?.find(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );

 return (
 httpScope &&
Expand All@@ -22,7 +24,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 );
 });

await fetch(`${baseURL}/test-transaction`);
 fetch(`${baseURL}/test-transaction`);

 const otelData = await otelPromise;

Expand All@@ -38,7 +40,9 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 // But our default node-fetch spans are not emitted
 expect(scopeSpans.length).toEqual(2);

 const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
 const httpScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry_sentry-patched/instrumentation-http',
 );
 const undiciScopes = scopeSpans?.filter(
 scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-undici',
 );
Expand All@@ -49,6 +53,38 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 expect(undiciScopes.length).toBe(1);
 expect(undiciScopes[0].spans.length).toBe(1);

 expect(undiciScopes[0].spans).toEqual([
 {
 traceId: expect.any(String),
 spanId: expect.any(String),
 name: 'GET',
 kind: 3,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: expect.arrayContaining([
 { key: 'http.request.method', value: { stringValue: 'GET' } },
 { key: 'http.request.method_original', value: { stringValue: 'GET' } },
 { key: 'url.full', value: { stringValue: 'http://localhost:3030/test-success' } },
 { key: 'url.path', value: { stringValue: '/test-success' } },
 { key: 'url.query', value: { stringValue: '' } },
 { key: 'url.scheme', value: { stringValue: 'http' } },
 { key: 'server.address', value: { stringValue: 'localhost' } },
 { key: 'server.port', value: { intValue: 3030 } },
 { key: 'user_agent.original', value: { stringValue: 'node' } },
 { key: 'network.peer.address', value: { stringValue: expect.any(String) } },
 { key: 'network.peer.port', value: { intValue: 3030 } },
 { key: 'http.response.status_code', value: { intValue: 200 } },
 { key: 'http.response.header.content-length', value: { intValue: 16 } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
 status: { code: 0 },
 links: [],
 droppedLinksCount: 0,
 },
 ]);

 // There may be another span from another request, we can ignore that
 const httpSpans = httpScopes[0].spans.filter(span =>
 span.attributes.some(attr => attr.key === 'http.target' && attr.value?.stringValue === '/test-transaction'),
Expand All@@ -62,104 +98,24 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 kind: 2,
 startTimeUnixNano: expect.any(String),
 endTimeUnixNano: expect.any(String),
 attributes: [
 {
 key: 'http.url',
 value: {
 stringValue: 'http://localhost:3030/test-transaction',
 },
 },
 {
 key: 'http.host',
 value: {
 stringValue: 'localhost:3030',
 },
 },
 {
 key: 'net.host.name',
 value: {
 stringValue: 'localhost',
 },
 },
 {
 key: 'http.method',
 value: {
 stringValue: 'GET',
 },
 },
 {
 key: 'http.scheme',
 value: {
 stringValue: 'http',
 },
 },
 {
 key: 'http.target',
 value: {
 stringValue: '/test-transaction',
 },
 },
 {
 key: 'http.user_agent',
 value: {
 stringValue: 'node',
 },
 },
 {
 key: 'http.flavor',
 value: {
 stringValue: '1.1',
 },
 },
 {
 key: 'net.transport',
 value: {
 stringValue: 'ip_tcp',
 },
 },
 {
 key: 'sentry.origin',
 value: {
 stringValue: 'auto.http.otel.http',
 },
 },
 {
 key: 'net.host.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.host.port',
 value: {
 intValue: 3030,
 },
 },
 {
 key: 'net.peer.ip',
 value: {
 stringValue: expect.any(String),
 },
 },
 {
 key: 'net.peer.port',
 value: {
 intValue: expect.any(Number),
 },
 },
 {
 key: 'http.status_code',
 value: {
 intValue: 200,
 },
 },
 {
 key: 'http.status_text',
 value: {
 stringValue: 'OK',
 },
 },
 ],
 attributes: expect.arrayContaining([
 { key: 'http.url', value: { stringValue: 'http://localhost:3030/test-transaction' } },
 { key: 'http.host', value: { stringValue: 'localhost:3030' } },
 { key: 'net.host.name', value: { stringValue: 'localhost' } },
 { key: 'http.method', value: { stringValue: 'GET' } },
 { key: 'http.scheme', value: { stringValue: 'http' } },
 { key: 'http.target', value: { stringValue: '/test-transaction' } },
 { key: 'http.user_agent', value: { stringValue: 'node' } },
 { key: 'http.flavor', value: { stringValue: '1.1' } },
 { key: 'net.transport', value: { stringValue: 'ip_tcp' } },
 { key: 'net.host.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.host.port', value: { intValue: 3030 } },
 { key: 'net.peer.ip', value: { stringValue: expect.any(String) } },
 { key: 'net.peer.port', value: { intValue: expect.any(Number) } },
 { key: 'http.status_code', value: { intValue: 200 } },
 { key: 'http.status_text', value: { stringValue: 'OK' } },
 { key: 'sentry.origin', value: { stringValue: 'auto.http.otel.http' } },
 ]),
 droppedAttributesCount: 0,
 events: [],
 droppedEventsCount: 0,
Expand Down

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ async function run(): Promise<void> {
 Sentry.addBreadcrumb({ message: 'manual breadcrumb' });

 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -46,3 +46,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

15 changes: 14 additions & 1 deletion
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import * as http from 'http';

async function run(): Promise<void> {
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
 await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);

Expand All@@ -37,3 +37,16 @@ function makeHttpRequest(url: string): Promise<void> {
 .end();
 });
}

function makeHttpGet(url: string): Promise<void> {
 return new Promise<void>(resolve => {
 http.get(url, httpRes => {
 httpRes.on('data', () => {
 // we don't care about data
 });
 httpRes.on('end', () => {
 resolve();
 });
 });
 });
}

50 changes: 50 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,56 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
 },
 ],
 },
 breadcrumbs: [
 {
 message: 'manual breadcrumb',
 timestamp: expect.any(Number),
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v0`,
 status_code: 404,
 ADDED_PATH: '/api/v0',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v1`,
 status_code: 404,
 ADDED_PATH: '/api/v1',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v2`,
 status_code: 404,
 ADDED_PATH: '/api/v2',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 {
 category: 'http',
 data: {
 'http.method': 'GET',
 url: `${SERVER_URL}/api/v3`,
 status_code: 404,
 ADDED_PATH: '/api/v3',
 },
 timestamp: expect.any(Number),
 type: 'http',
 },
 ],
 },
 })
 .start(closeTestServer);
Expand Down
Loading