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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ test('Sends successful transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-success',
'url.full': 'http://localhost:3030/test-success',
'url.path': '/test-success',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -102,6 +104,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -192,6 +196,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -231,6 +237,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@ test('Sends a sampled API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/task',
'url.full': 'http://localhost:3030/task',
'url.path': '/task',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,8 @@ test('server pageload request span has nested request span for sub request', asy
'http.method': 'GET',
'http.route': '/api/users',
'http.url': 'http://localhost:3030/api/users',
'url.full': 'http://localhost:3030/api/users',
'url.path': '/api/users',
'sentry.op': 'http.server',
'sentry.origin': 'auto.http.sveltekit',
'sentry.source': 'route',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { createTestServer } from '@sentry-internal/test-utils';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';

Expand DownExpand Up@@ -130,6 +131,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
...getCommonHttpRequestHeaders(),
});
},
Expand DownExpand Up@@ -172,6 +175,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
'http.request.header.content_length': '9',
'http.request.header.content_type': 'text/plain;charset=UTF-8',
...getCommonHttpRequestHeaders(),
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/server/middleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import type { Span, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
Expand DownExpand Up@@ -218,6 +219,8 @@ async function instrumentRequestStartHttpServerSpan(
[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
// This is here for backwards compatibility, we used to set this here before
method,
[URL_FULL]: ctx.url.href,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Astro take-over omits URL attributes

Medium Severity

enhanceHttpServerSpan takes over an existing http.server span but never sets url.full or url.path, while the create path in the same file does. Sibling take-over paths in this PR (SvelteKit, Next.js edge, React Router) set these with a fallback from the request URL. When the prior span lacks them (relative URL, custom instrumentation), Astro streamed spans cannot infer descriptions.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 3b3b0dc. Configure here.

[URL_PATH]: ctx.url.pathname,
url: stripUrlQueryAndFragment(ctx.url.href),
...httpHeadersToSpanAttributes(
winterCGHeadersToDict(request.headers),
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ test('Sends successful transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-success',
'url.full': 'http://localhost:3030/test-success',
'url.path': '/test-success',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -102,6 +104,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -192,6 +196,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -231,6 +237,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@ test('Sends a sampled API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/task',
'url.full': 'http://localhost:3030/task',
'url.path': '/task',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,8 @@ test('server pageload request span has nested request span for sub request', asy
'http.method': 'GET',
'http.route': '/api/users',
'http.url': 'http://localhost:3030/api/users',
'url.full': 'http://localhost:3030/api/users',
'url.path': '/api/users',
'sentry.op': 'http.server',
'sentry.origin': 'auto.http.sveltekit',
'sentry.source': 'route',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { createTestServer } from '@sentry-internal/test-utils';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';

Expand DownExpand Up@@ -130,6 +131,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
...getCommonHttpRequestHeaders(),
});
},
Expand DownExpand Up@@ -172,6 +175,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
'http.request.header.content_length': '9',
'http.request.header.content_type': 'text/plain;charset=UTF-8',
...getCommonHttpRequestHeaders(),
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/server/middleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import type { Span, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
Expand DownExpand Up@@ -218,6 +219,8 @@ async function instrumentRequestStartHttpServerSpan(
[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
// This is here for backwards compatibility, we used to set this here before
method,
[URL_FULL]: ctx.url.href,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Astro take-over omits URL attributes

Medium Severity

enhanceHttpServerSpan takes over an existing http.server span but never sets url.full or url.path, while the create path in the same file does. Sibling take-over paths in this PR (SvelteKit, Next.js edge, React Router) set these with a fallback from the request URL. When the prior span lacks them (relative URL, custom instrumentation), Astro streamed spans cannot infer descriptions.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 3b3b0dc. Configure here.

[URL_PATH]: ctx.url.pathname,
url: stripUrlQueryAndFragment(ctx.url.href),
...httpHeadersToSpanAttributes(
winterCGHeadersToDict(request.headers),
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ test('Sends successful transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-success',
'url.full': 'http://localhost:3030/test-success',
'url.path': '/test-success',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -102,6 +104,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -192,6 +196,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -231,6 +237,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@ test('Sends a sampled API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/task',
'url.full': 'http://localhost:3030/task',
'url.path': '/task',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,8 @@ test('server pageload request span has nested request span for sub request', asy
'http.method': 'GET',
'http.route': '/api/users',
'http.url': 'http://localhost:3030/api/users',
'url.full': 'http://localhost:3030/api/users',
'url.path': '/api/users',
'sentry.op': 'http.server',
'sentry.origin': 'auto.http.sveltekit',
'sentry.source': 'route',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { createTestServer } from '@sentry-internal/test-utils';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';

Expand DownExpand Up@@ -130,6 +131,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
...getCommonHttpRequestHeaders(),
});
},
Expand DownExpand Up@@ -172,6 +175,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
'http.request.header.content_length': '9',
'http.request.header.content_type': 'text/plain;charset=UTF-8',
...getCommonHttpRequestHeaders(),
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/server/middleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import type { Span, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
Expand DownExpand Up@@ -218,6 +219,8 @@ async function instrumentRequestStartHttpServerSpan(
[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
// This is here for backwards compatibility, we used to set this here before
method,
[URL_FULL]: ctx.url.href,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Astro take-over omits URL attributes

Medium Severity

enhanceHttpServerSpan takes over an existing http.server span but never sets url.full or url.path, while the create path in the same file does. Sibling take-over paths in this PR (SvelteKit, Next.js edge, React Router) set these with a fallback from the request URL. When the prior span lacks them (relative URL, custom instrumentation), Astro streamed spans cannot infer descriptions.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 3b3b0dc. Configure here.

[URL_PATH]: ctx.url.pathname,
url: stripUrlQueryAndFragment(ctx.url.href),
...httpHeadersToSpanAttributes(
winterCGHeadersToDict(request.headers),
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ test('Sends successful transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-success',
'url.full': 'http://localhost:3030/test-success',
'url.path': '/test-success',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -102,6 +104,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -192,6 +196,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -231,6 +237,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@ test('Sends a sampled API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/task',
'url.full': 'http://localhost:3030/task',
'url.path': '/task',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,8 @@ test('server pageload request span has nested request span for sub request', asy
'http.method': 'GET',
'http.route': '/api/users',
'http.url': 'http://localhost:3030/api/users',
'url.full': 'http://localhost:3030/api/users',
'url.path': '/api/users',
'sentry.op': 'http.server',
'sentry.origin': 'auto.http.sveltekit',
'sentry.source': 'route',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { createTestServer } from '@sentry-internal/test-utils';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';

Expand DownExpand Up@@ -130,6 +131,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
...getCommonHttpRequestHeaders(),
});
},
Expand DownExpand Up@@ -172,6 +175,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
'http.request.header.content_length': '9',
'http.request.header.content_type': 'text/plain;charset=UTF-8',
...getCommonHttpRequestHeaders(),
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/server/middleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import type { Span, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
Expand DownExpand Up@@ -218,6 +219,8 @@ async function instrumentRequestStartHttpServerSpan(
[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
// This is here for backwards compatibility, we used to set this here before
method,
[URL_FULL]: ctx.url.href,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Astro take-over omits URL attributes

Medium Severity

enhanceHttpServerSpan takes over an existing http.server span but never sets url.full or url.path, while the create path in the same file does. Sibling take-over paths in this PR (SvelteKit, Next.js edge, React Router) set these with a fallback from the request URL. When the prior span lacks them (relative URL, custom instrumentation), Astro streamed spans cannot infer descriptions.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 3b3b0dc. Configure here.

[URL_PATH]: ctx.url.pathname,
url: stripUrlQueryAndFragment(ctx.url.href),
...httpHeadersToSpanAttributes(
winterCGHeadersToDict(request.headers),
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ test('Sends successful transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-success',
'url.full': 'http://localhost:3030/test-success',
'url.path': '/test-success',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -102,6 +104,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -192,6 +196,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -231,6 +237,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@ test('Sends a sampled API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/task',
'url.full': 'http://localhost:3030/task',
'url.path': '/task',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,8 @@ test('server pageload request span has nested request span for sub request', asy
'http.method': 'GET',
'http.route': '/api/users',
'http.url': 'http://localhost:3030/api/users',
'url.full': 'http://localhost:3030/api/users',
'url.path': '/api/users',
'sentry.op': 'http.server',
'sentry.origin': 'auto.http.sveltekit',
'sentry.source': 'route',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { createTestServer } from '@sentry-internal/test-utils';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';

Expand DownExpand Up@@ -130,6 +131,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
...getCommonHttpRequestHeaders(),
});
},
Expand DownExpand Up@@ -172,6 +175,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
'http.request.header.content_length': '9',
'http.request.header.content_type': 'text/plain;charset=UTF-8',
...getCommonHttpRequestHeaders(),
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/server/middleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import type { Span, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
Expand DownExpand Up@@ -218,6 +219,8 @@ async function instrumentRequestStartHttpServerSpan(
[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
// This is here for backwards compatibility, we used to set this here before
method,
[URL_FULL]: ctx.url.href,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Astro take-over omits URL attributes

Medium Severity

enhanceHttpServerSpan takes over an existing http.server span but never sets url.full or url.path, while the create path in the same file does. Sibling take-over paths in this PR (SvelteKit, Next.js edge, React Router) set these with a fallback from the request URL. When the prior span lacks them (relative URL, custom instrumentation), Astro streamed spans cannot infer descriptions.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 3b3b0dc. Configure here.

[URL_PATH]: ctx.url.pathname,
url: stripUrlQueryAndFragment(ctx.url.href),
...httpHeadersToSpanAttributes(
winterCGHeadersToDict(request.headers),
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ test('Sends successful transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-success',
'url.full': 'http://localhost:3030/test-success',
'url.path': '/test-success',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -102,6 +104,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -192,6 +196,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -231,6 +237,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@ test('Sends a sampled API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/task',
'url.full': 'http://localhost:3030/task',
'url.path': '/task',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,8 @@ test('server pageload request span has nested request span for sub request', asy
'http.method': 'GET',
'http.route': '/api/users',
'http.url': 'http://localhost:3030/api/users',
'url.full': 'http://localhost:3030/api/users',
'url.path': '/api/users',
'sentry.op': 'http.server',
'sentry.origin': 'auto.http.sveltekit',
'sentry.source': 'route',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { createTestServer } from '@sentry-internal/test-utils';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';

Expand DownExpand Up@@ -130,6 +131,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
...getCommonHttpRequestHeaders(),
});
},
Expand DownExpand Up@@ -172,6 +175,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
'http.request.header.content_length': '9',
'http.request.header.content_type': 'text/plain;charset=UTF-8',
...getCommonHttpRequestHeaders(),
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/server/middleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import type { Span, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
Expand DownExpand Up@@ -218,6 +219,8 @@ async function instrumentRequestStartHttpServerSpan(
[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
// This is here for backwards compatibility, we used to set this here before
method,
[URL_FULL]: ctx.url.href,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Astro take-over omits URL attributes

Medium Severity

enhanceHttpServerSpan takes over an existing http.server span but never sets url.full or url.path, while the create path in the same file does. Sibling take-over paths in this PR (SvelteKit, Next.js edge, React Router) set these with a fallback from the request URL. When the prior span lacks them (relative URL, custom instrumentation), Astro streamed spans cannot infer descriptions.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 3b3b0dc. Configure here.

[URL_PATH]: ctx.url.pathname,
url: stripUrlQueryAndFragment(ctx.url.href),
...httpHeadersToSpanAttributes(
winterCGHeadersToDict(request.headers),
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ test('Sends successful transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-success',
'url.full': 'http://localhost:3030/test-success',
'url.path': '/test-success',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -102,6 +104,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -192,6 +196,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -231,6 +237,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@ test('Sends a sampled API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/task',
'url.full': 'http://localhost:3030/task',
'url.path': '/task',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,8 @@ test('server pageload request span has nested request span for sub request', asy
'http.method': 'GET',
'http.route': '/api/users',
'http.url': 'http://localhost:3030/api/users',
'url.full': 'http://localhost:3030/api/users',
'url.path': '/api/users',
'sentry.op': 'http.server',
'sentry.origin': 'auto.http.sveltekit',
'sentry.source': 'route',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { createTestServer } from '@sentry-internal/test-utils';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';

Expand DownExpand Up@@ -130,6 +131,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
...getCommonHttpRequestHeaders(),
});
},
Expand DownExpand Up@@ -172,6 +175,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
'http.request.header.content_length': '9',
'http.request.header.content_type': 'text/plain;charset=UTF-8',
...getCommonHttpRequestHeaders(),
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/server/middleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import type { Span, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
Expand DownExpand Up@@ -218,6 +219,8 @@ async function instrumentRequestStartHttpServerSpan(
[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
// This is here for backwards compatibility, we used to set this here before
method,
[URL_FULL]: ctx.url.href,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Astro take-over omits URL attributes

Medium Severity

enhanceHttpServerSpan takes over an existing http.server span but never sets url.full or url.path, while the create path in the same file does. Sibling take-over paths in this PR (SvelteKit, Next.js edge, React Router) set these with a fallback from the request URL. When the prior span lacks them (relative URL, custom instrumentation), Astro streamed spans cannot infer descriptions.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 3b3b0dc. Configure here.

[URL_PATH]: ctx.url.pathname,
url: stripUrlQueryAndFragment(ctx.url.href),
...httpHeadersToSpanAttributes(
winterCGHeadersToDict(request.headers),
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/example-module/transaction',
'url.full': 'http://localhost:3030/example-module/transaction',
'url.path': '/example-module/transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -103,6 +105,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -193,6 +197,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -232,6 +238,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ test('Sends successful transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-success',
'url.full': 'http://localhost:3030/test-success',
'url.path': '/test-success',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-http/${id}`,
'url.full': `http://localhost:3030/test-outgoing-http/${id}`,
'url.path': `/test-outgoing-http/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -102,6 +104,8 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -192,6 +196,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.full': `http://localhost:3030/test-outgoing-fetch/${id}`,
'url.path': `/test-outgoing-fetch/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand DownExpand Up@@ -231,6 +237,8 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': `http://localhost:3030/test-inbound-headers/${id}`,
'url.full': `http://localhost:3030/test-inbound-headers/${id}`,
'url.path': `/test-inbound-headers/${id}`,
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@ test('Sends a sampled API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/task',
'url.full': 'http://localhost:3030/task',
'url.path': '/task',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,8 @@ test('server pageload request span has nested request span for sub request', asy
'http.method': 'GET',
'http.route': '/api/users',
'http.url': 'http://localhost:3030/api/users',
'url.full': 'http://localhost:3030/api/users',
'url.path': '/api/users',
'sentry.op': 'http.server',
'sentry.origin': 'auto.http.sveltekit',
'sentry.source': 'route',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'otel.kind': 'SERVER',
'http.response.status_code': 200,
'http.url': 'http://localhost:3030/test-transaction',
'url.full': 'http://localhost:3030/test-transaction',
'url.path': '/test-transaction',
'http.host': 'localhost:3030',
'net.host.name': 'localhost',
'http.method': 'GET',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { createTestServer } from '@sentry-internal/test-utils';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';

Expand DownExpand Up@@ -130,6 +131,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
...getCommonHttpRequestHeaders(),
});
},
Expand DownExpand Up@@ -172,6 +175,8 @@ describe('httpIntegration', () => {
'sentry.sample_rate': 1,
'sentry.source': 'route',
url: `http://localhost:${port}/test`,
[URL_FULL]: `http://localhost:${port}/test?a=1&b=2`,
[URL_PATH]: '/test',
'http.request.header.content_length': '9',
'http.request.header.content_type': 'text/plain;charset=UTF-8',
...getCommonHttpRequestHeaders(),
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/server/middleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import type { Span, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
Expand DownExpand Up@@ -218,6 +219,8 @@ async function instrumentRequestStartHttpServerSpan(
[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
// This is here for backwards compatibility, we used to set this here before
method,
[URL_FULL]: ctx.url.href,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Astro take-over omits URL attributes

Medium Severity

enhanceHttpServerSpan takes over an existing http.server span but never sets url.full or url.path, while the create path in the same file does. Sibling take-over paths in this PR (SvelteKit, Next.js edge, React Router) set these with a fallback from the request URL. When the prior span lacks them (relative URL, custom instrumentation), Astro streamed spans cannot infer descriptions.

Additional Locations (1)
Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit 3b3b0dc. Configure here.

[URL_PATH]: ctx.url.pathname,
url: stripUrlQueryAndFragment(ctx.url.href),
...httpHeadersToSpanAttributes(
winterCGHeadersToDict(request.headers),
Expand Down
Loading
Loading