-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
feat(astro): Add distributed tracing via <meta>
tags
#9483
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
import type { Hub } from '@sentry/core'; | ||
import { getDynamicSamplingContextFromClient } from '@sentry/core'; | ||
import type { Span } from '@sentry/types'; | ||
import { dynamicSamplingContextToSentryBaggageHeader, generateSentryTraceHeader } from '@sentry/utils'; | ||
|
||
/** | ||
* Extracts the tracing data from the current span or from the client's scope | ||
* (via transaction or propagation context) and renders the data to <meta> tags. | ||
* | ||
* This function creates two serialized <meta> tags: | ||
* - `<meta name="sentry-trace" content="..."/>` | ||
* - `<meta name="baggage" content="..."/>` | ||
* | ||
* TODO: Extract this later on and export it from the Core or Node SDK | ||
* | ||
* @param span the currently active span | ||
* @param client the SDK's client | ||
* | ||
* @returns an object with the two serialized <meta> tags | ||
*/ | ||
export function getTracingMetaTags(span: Span | undefined, hub: Hub): { sentryTrace: string; baggage?: string } { | ||
const scope = hub.getScope(); | ||
const client = hub.getClient(); | ||
const { dsc, sampled, traceId } = scope.getPropagationContext(); | ||
const transaction = span?.transaction; | ||
|
||
const sentryTrace = span ? span.toTraceparent() : generateSentryTraceHeader(traceId, undefined, sampled); | ||
|
||
const dynamicSamplingContext = transaction | ||
? transaction.getDynamicSamplingContext() | ||
: dsc | ||
? dsc | ||
: client | ||
? getDynamicSamplingContextFromClient(traceId, client, scope) | ||
: undefined; | ||
|
||
const baggage = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext); | ||
|
||
return { | ||
sentryTrace: `<meta name="sentry-trace" content="${sentryTrace}"/>`, | ||
baggage: baggage ? `<meta name="baggage" content="${baggage}"/>` : undefined, | ||
Lms24 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
import { captureException, configureScope, startSpan } from '@sentry/node'; | ||
import { captureException, configureScope, getCurrentHub, startSpan } from '@sentry/node'; | ||
import { addExceptionMechanism, objectify, stripUrlQueryAndFragment, tracingContextFromHeaders } from '@sentry/utils'; | ||
import type { APIContext, MiddlewareResponseHandler } from 'astro'; | ||
|
||
import { getTracingMetaTags } from './meta'; | ||
|
||
type MiddlewareOptions = { | ||
/** | ||
* If true, the client IP will be attached to the event by calling `setUser`. | ||
|
@@ -93,11 +95,30 @@ export const handleRequest: (options?: MiddlewareOptions) => MiddlewareResponseH | |
}, | ||
}, | ||
async span => { | ||
const res = await next(); | ||
if (span && res.status) { | ||
span.setHttpStatus(res.status); | ||
const originalResponse = await next(); | ||
if (span && originalResponse.status) { | ||
span.setHttpStatus(originalResponse.status); | ||
} | ||
|
||
const hub = getCurrentHub(); | ||
const client = hub.getClient(); | ||
const contentType = originalResponse.headers.get('content-type'); | ||
|
||
const isPageloadRequest = contentType && contentType.startsWith('text/html'); | ||
if (!isPageloadRequest || !client) { | ||
return originalResponse; | ||
} | ||
return res; | ||
|
||
const html = await originalResponse.text(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. m: Honestly I am a little worried here for multiple reasons:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
It's a good point. Astro uses streaming but they also show a similar example for modifying HTML in their middleware docs. I'm gonna ask the Astro folks if there are performance concerns with doing this.
Agreed, it's super basic but we use the identical approach in SvelteKit and so far it worked decently well. Using a parser is for sure a performance concern. My pragmatic take would be to go with this and improve the lookup logic once we discover problems here.
Generally, I agree but I'm not entirely sure about the XSS vector. I guess for something malicious to end up in here, the SDK's options (release, environment) or the transaction data (name, ids) would need to be somehow modified beforehand. Do you see any obvious ways how this could happen?
I think this would work decently well for There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Alright if Astro is recommending this it's probably fine.
Sounds good to me.
No obvious ways, but if we can come up with a simple way to ensure the string cant be escaped it would be great. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
if (typeof html !== 'string' || !html.includes('<head>')) { | ||
return originalResponse; | ||
} | ||
|
||
const { sentryTrace, baggage } = getTracingMetaTags(span, hub); | ||
const content = `<head>\n${sentryTrace}\n${baggage}\n`; | ||
const modifiedHtml = html.replace('<head>', content); | ||
|
||
return new Response(modifiedHtml, originalResponse); | ||
}, | ||
); | ||
return res; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
import * as SentryCore from '@sentry/core'; | ||
import { vi } from 'vitest'; | ||
|
||
import { getTracingMetaTags } from '../../src/server/meta'; | ||
|
||
const mockedSpan = { | ||
toTraceparent: () => '123', | ||
transaction: { | ||
getDynamicSamplingContext: () => ({ | ||
environment: 'production', | ||
}), | ||
}, | ||
}; | ||
|
||
const mockedHub = { | ||
getScope: () => ({ | ||
getPropagationContext: () => ({ | ||
traceId: '123', | ||
}), | ||
}), | ||
getClient: () => ({}), | ||
}; | ||
|
||
describe('getTracingMetaTags', () => { | ||
it('returns the tracing tags from the span, if it is provided', () => { | ||
{ | ||
// @ts-expect-error - only passing a partial span object | ||
const tags = getTracingMetaTags(mockedSpan, mockedHub); | ||
|
||
expect(tags).toEqual({ | ||
sentryTrace: '<meta name="sentry-trace" content="123"/>', | ||
baggage: '<meta name="baggage" content="sentry-environment=production"/>', | ||
}); | ||
} | ||
}); | ||
|
||
it('returns propagationContext DSC data if no span is available', () => { | ||
const tags = getTracingMetaTags(undefined, { | ||
...mockedHub, | ||
// @ts-expect-error - only passing a partial scope object | ||
getScope: () => ({ | ||
getPropagationContext: () => ({ | ||
traceId: 'abc', | ||
sampled: true, | ||
spanId: '456', | ||
dsc: { | ||
environment: 'staging', | ||
public_key: 'key', | ||
trace_id: 'abc', | ||
}, | ||
}), | ||
}), | ||
}); | ||
|
||
expect(tags).toEqual({ | ||
sentryTrace: expect.stringMatching(/<meta name="sentry-trace" content="abc-.+-1"/), | ||
baggage: '<meta name="baggage" content="sentry-environment=staging,sentry-public_key=key,sentry-trace_id=abc"/>', | ||
}); | ||
}); | ||
|
||
it('returns only the `sentry-trace` tag if no DSC is available', () => { | ||
vi.spyOn(SentryCore, 'getDynamicSamplingContextFromClient').mockReturnValueOnce({ | ||
trace_id: '', | ||
public_key: undefined, | ||
}); | ||
|
||
const tags = getTracingMetaTags( | ||
// @ts-expect-error - only passing a partial span object | ||
{ | ||
toTraceparent: () => '123', | ||
transaction: undefined, | ||
}, | ||
mockedHub, | ||
); | ||
|
||
expect(tags).toEqual({ | ||
sentryTrace: '<meta name="sentry-trace" content="123"/>', | ||
}); | ||
}); | ||
|
||
it('returns only the `sentry-trace` tag if no DSC is available', () => { | ||
vi.spyOn(SentryCore, 'getDynamicSamplingContextFromClient').mockReturnValueOnce({ | ||
trace_id: '', | ||
public_key: undefined, | ||
}); | ||
|
||
const tags = getTracingMetaTags( | ||
// @ts-expect-error - only passing a partial span object | ||
{ | ||
toTraceparent: () => '123', | ||
transaction: undefined, | ||
}, | ||
{ | ||
...mockedHub, | ||
getClient: () => undefined, | ||
}, | ||
); | ||
|
||
expect(tags).toEqual({ | ||
sentryTrace: '<meta name="sentry-trace" content="123"/>', | ||
}); | ||
}); | ||
}); |
Uh oh!
There was an error while loading. Please reload this page.