Skip to content

ref: Pass optional span attributes directly instead of conditional spreads #25878

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
mydea merged 2 commits into from
Oct 30, 2026
Merged

ref: Pass optional span attributes directly instead of conditional spreads #25878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a5eea
ref: Pass optional span attributes directly instead of conditional sp…
sentry-junior[bot] Oct 29, 2026
7926dc6
fix: Keep omitting empty component names from span attributes
sentry-junior[bot] Oct 30, 2026
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
4 changes: 1 addition & 3 deletions packages/angular/src/tracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,7 @@ export class TraceService implements OnDestroy {
[SENTRY_OP]: ROUTER,
[SENTRY_ORIGIN]: 'auto.ui.angular',
[URL_FULL]: strippedUrl,
...(navigationEvent.navigationTrigger && {
navigationTrigger: navigationEvent.navigationTrigger,
}),
navigationTrigger: navigationEvent.navigationTrigger,
},
}),
) || null;
Expand Down
8 changes: 4 additions & 4 deletions packages/browser-utils/src/performance/interactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@ function registerInteractionListener(
[SENTRY_SEGMENT_NAME_SOURCE]: hasSpanStreaming ? streamedNameSource : latestRoute.source || 'url',
[SENTRY_ORIGIN]: 'auto.browser.interactions',
...(hasSpanStreaming && { [SENTRY_SEGMENT_NAME]: streamedName }),
...(latestRoute.routeId && { [ROUTER_NAVIGATION_ROUTE_ID]: latestRoute.routeId }),
...(latestRoute.urlTemplate && { [URL_TEMPLATE]: latestRoute.urlTemplate }),
...(latestRoute.httpRoute && { [HTTP_ROUTE]: latestRoute.httpRoute }),
...(latestRoute.urlPath && { [URL_PATH]: latestRoute.urlPath }),
[ROUTER_NAVIGATION_ROUTE_ID]: latestRoute.routeId,
[URL_TEMPLATE]: latestRoute.urlTemplate,
[HTTP_ROUTE]: latestRoute.httpRoute,
[URL_PATH]: latestRoute.urlPath,
...(latestRoute.urlFull && { [URL_FULL]: filterCollectedUrl(latestRoute.urlFull) }),
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/tracing/browserTracingIntegration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
[URL_PATH]: urlObject?.pathname,
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: filterCollectedUrl(urlObject.href) }),
...finalStartSpanOptions.attributes,
};
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/instrumentations/worker/instrumentQueueProducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function startPublishSpan<T>(
[MESSAGING_DESTINATION_NAME]: bindingName,
[MESSAGING_OPERATION_TYPE]: 'send',
[MESSAGING_OPERATION_NAME]: 'send',
...(messageCount !== undefined && { [MESSAGING_BATCH_MESSAGE_COUNT]: messageCount }),
[MESSAGING_BATCH_MESSAGE_COUNT]: messageCount,
[MESSAGING_MESSAGE_BODY_SIZE]: bodySize,
[SENTRY_OP]: QUEUE_PUBLISH,
[SENTRY_ORIGIN]: ORIGIN,
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/instrumentations/worker/instrumentR2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function createSpanOptions(bindingName: string, r2Op: R2OperationKey, key?: stri
attributes: {
[CLOUDFLARE_R2_OPERATION]: operation,
[CLOUDFLARE_R2_BUCKET]: bindingName,
...(requestKey !== undefined && { [CLOUDFLARE_R2_REQUEST_KEY]: requestKey }),
[CLOUDFLARE_R2_REQUEST_KEY]: requestKey,
...(isR2ListOptions(key) && key.prefix !== undefined && { [CLOUDFLARE_R2_REQUEST_PREFIX]: key.prefix }),
...(isR2ListOptions(key) && key.delimiter !== undefined && { [CLOUDFLARE_R2_REQUEST_DELIMITER]: key.delimiter }),
[SENTRY_OP]: op,
Expand Down
8 changes: 4 additions & 4 deletions packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export function appRouterInstrumentPageLoad(client: Client): void {
[SENTRY_SEGMENT_NAME_SOURCE]: parameterizedPathname ? 'route' : 'url',
[URL_PATH]: WINDOW.location.pathname,
[URL_FULL]: documentUrl,
...(parameterizedPathname && { [URL_TEMPLATE]: parameterizedPathname }),
[URL_TEMPLATE]: parameterizedPathname,
},
};

Expand Down Expand Up @@ -258,7 +258,7 @@ export function appRouterInstrumentNavigation(client: Client): void {
[SENTRY_SEGMENT_NAME_SOURCE]: parameterizedPathname ? 'route' : 'url',
// oxlint-disable-next-line typescript/no-deprecated -- Preserve the existing attribute name.
[NAVIGATION_TYPE]: `router.${navigationType}`,
...(parameterizedPathname && { [URL_TEMPLATE]: parameterizedPathname }),
[URL_TEMPLATE]: parameterizedPathname,
},
},
{ url: getAbsoluteUrl(normalizedHref) },
Expand Down Expand Up @@ -296,7 +296,7 @@ export function appRouterInstrumentNavigation(client: Client): void {
[SENTRY_SEGMENT_NAME_SOURCE]: parameterizedPathname ? 'route' : 'url',
// oxlint-disable-next-line typescript/no-deprecated -- Preserve the existing attribute name.
[NAVIGATION_TYPE]: traversal?.navigationType ?? 'browser.popstate',
...(parameterizedPathname && { [URL_TEMPLATE]: parameterizedPathname }),
[URL_TEMPLATE]: parameterizedPathname,
},
},
// The full location rather than just the pathname, so the span's `url.full` keeps the
Expand Down Expand Up @@ -394,7 +394,7 @@ function patchRouter(client: Client, router: NextRouter, currentNavigationSpanRe
[SENTRY_SEGMENT_NAME_SOURCE]: parameterizedPathname ? 'route' : 'url',
// oxlint-disable-next-line typescript/no-deprecated -- Preserve the existing attribute name.
[NAVIGATION_TYPE]: `router.${routerFunctionName}`,
...(parameterizedPathname && { [URL_TEMPLATE]: parameterizedPathname }),
[URL_TEMPLATE]: parameterizedPathname,
},
},
{ url: getAbsoluteUrl(normalizedHref) },
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export function pagesRouterInstrumentPageLoad(client: Client): void {
[SENTRY_OP]: PAGELOAD,
[SENTRY_ORIGIN]: 'auto.pageload.nextjs.pages_router_instrumentation',
[SENTRY_SEGMENT_NAME_SOURCE]: route ? 'route' : 'url',
...(route && { [URL_TEMPLATE]: route }),
[URL_TEMPLATE]: route,
...(params && { ...params }),
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router/src/server/createServerInstrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export function createSentryServerInstrumentation(
[SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
'react_router.route.id': routeId,
[HTTP_ROUTE]: routePattern,
...(middlewareName && { 'react_router.middleware.name': middlewareName }),
'react_router.middleware.name': middlewareName,
'react_router.middleware.index': middlewareIndex,
},
},
Expand Down
10 changes: 5 additions & 5 deletions packages/react/src/profiler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Profiler extends React.Component<ProfilerProps> {
attributes: {
[SENTRY_OP]: UI_MOUNT,
[SENTRY_ORIGIN]: 'auto.ui.react.profiler',
...(componentName && { [UI_COMPONENT_NAME]: componentName }),
[UI_COMPONENT_NAME]: componentName || undefined,
...(hasSpanStreaming && { [SENTRY_DESCRIPTION]: description }),
},
});
Expand Down Expand Up @@ -102,7 +102,7 @@ class Profiler extends React.Component<ProfilerProps> {
attributes: {
[SENTRY_OP]: UI_UPDATE,
[SENTRY_ORIGIN]: 'auto.ui.react.profiler',
...(componentName && { [UI_COMPONENT_NAME]: componentName }),
[UI_COMPONENT_NAME]: componentName || undefined,
'ui.react.changed_props': changedProps,
...(hasSpanStreaming && { [SENTRY_DESCRIPTION]: description }),
},
Expand Down Expand Up @@ -142,7 +142,7 @@ class Profiler extends React.Component<ProfilerProps> {
attributes: {
[SENTRY_OP]: UI_RENDER,
[SENTRY_ORIGIN]: 'auto.ui.react.profiler',
...(componentName && { [UI_COMPONENT_NAME]: componentName }),
[UI_COMPONENT_NAME]: componentName || undefined,
...(hasSpanStreaming && { [SENTRY_DESCRIPTION]: description }),
},
});
Expand Down Expand Up @@ -229,7 +229,7 @@ function useProfiler(
attributes: {
[SENTRY_OP]: UI_MOUNT,
[SENTRY_ORIGIN]: 'auto.ui.react.profiler',
...(componentName && { [UI_COMPONENT_NAME]: componentName }),
[UI_COMPONENT_NAME]: componentName || undefined,
...(hasSpanStreaming && { [SENTRY_DESCRIPTION]: description }),
},
});
Expand Down Expand Up @@ -257,7 +257,7 @@ function useProfiler(
attributes: {
[SENTRY_OP]: UI_RENDER,
[SENTRY_ORIGIN]: 'auto.ui.react.profiler',
...(componentName && { [UI_COMPONENT_NAME]: componentName }),
[UI_COMPONENT_NAME]: componentName || undefined,
...(hasSpanStreaming && { [SENTRY_DESCRIPTION]: description }),
},
});
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/tanstackrouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export function tanstackRouterBrowserTracingIntegration(
[SENTRY_OP]: PAGELOAD,
[SENTRY_ORIGIN]: 'auto.pageload.react.tanstack_router',
[SENTRY_SEGMENT_NAME_SOURCE]: routeMatch ? 'route' : 'url',
...(routeMatch && { [URL_TEMPLATE]: routeMatch.routeId }),
[URL_TEMPLATE]: routeMatch?.routeId,
...routeMatchToParamSpanAttributes(routeMatch),
},
});
Expand Down Expand Up @@ -163,7 +163,7 @@ export function tanstackRouterBrowserTracingIntegration(
[SENTRY_OP]: NAVIGATION,
[SENTRY_ORIGIN]: 'auto.navigation.react.tanstack_router',
[SENTRY_SEGMENT_NAME_SOURCE]: routeMatch ? 'route' : 'url',
...(routeMatch && { [URL_TEMPLATE]: routeMatch.routeId }),
[URL_TEMPLATE]: routeMatch?.routeId,
...routeMatchToParamSpanAttributes(routeMatch),
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/src/v3/client/browserTracingIntegration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function instrumentNavigationApi(client: Client): void {
name: route ?? (hasSpanStreamingEnabled(client) ? NAVIGATION_SPAN_NAME_FALLBACK : pathname),
attributes: {
[SENTRY_SEGMENT_NAME_SOURCE]: route ? 'route' : 'url',
...(route && { [URL_TEMPLATE]: route }),
[URL_TEMPLATE]: route,
[SENTRY_ORIGIN]: 'auto.navigation.remix_v3',
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/server-utils/src/ai/flue/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ export function createFlueInstrumentation(options: FlueOptions = {}): FlueInstru
attributes: {
[SENTRY_ORIGIN]: FLUE_ORIGIN,
[GEN_AI_OPERATION_NAME]: 'invoke_agent',
...(ctx.agentName ? { [GEN_AI_AGENT_NAME]: ctx.agentName } : {}),
...(ctx.conversationId ? { [GEN_AI_CONVERSATION_ID]: ctx.conversationId } : {}),
[GEN_AI_AGENT_NAME]: ctx.agentName,
[GEN_AI_CONVERSATION_ID]: ctx.conversationId,
},
},
async (span: Span) => {
Expand Down
8 changes: 4 additions & 4 deletions packages/server-utils/src/ai/flue/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ export function startTurnSpan(observation: FlueObservation, turnSpans: SpanTrack
attributes: {
[SENTRY_ORIGIN]: FLUE_ORIGIN,
[GEN_AI_OPERATION_NAME]: 'chat',
...(observation.conversationId ? { [GEN_AI_CONVERSATION_ID]: observation.conversationId } : {}),
[GEN_AI_CONVERSATION_ID]: observation.conversationId,
// No conventional attribute for this; it is the only way to tell a compaction turn from a
// user-facing one.
...(observation.purpose ? { 'flue.turn.purpose': observation.purpose } : {}),
'flue.turn.purpose': observation.purpose,

@msonnb msonnb Oct 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

unrelated, but i guess we should add this to conventions?

@mydea mydea Oct 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

yeah, worth looking into. may remove/change this here: #25869

},
}),
);
Expand Down Expand Up @@ -207,8 +207,8 @@ export function startToolSpan(observation: FlueObservation, toolSpans: SpanTrack
attributes: {
[SENTRY_ORIGIN]: FLUE_ORIGIN,
[GEN_AI_OPERATION_NAME]: 'execute_tool',
...(toolName ? { [GEN_AI_TOOL_NAME]: toolName } : {}),
...(observation.conversationId ? { [GEN_AI_CONVERSATION_ID]: observation.conversationId } : {}),
[GEN_AI_TOOL_NAME]: toolName,
[GEN_AI_CONVERSATION_ID]: observation.conversationId,
...(recordInputs && observation.args !== undefined
? { [GEN_AI_TOOL_CALL_ARGUMENTS]: stringify(observation.args) }
: {}),
Expand Down
12 changes: 6 additions & 6 deletions packages/server-utils/src/ai/pi-durable/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@ function traceModelRequest(
attributes: {
[SENTRY_ORIGIN]: PI_DURABLE_ORIGIN,
[GEN_AI_OPERATION_NAME]: 'chat',
...(model.provider ? { [GEN_AI_PROVIDER_NAME]: model.provider } : {}),
...(model.id ? { [GEN_AI_REQUEST_MODEL]: model.id } : {}),
...(conversationId ? { [GEN_AI_CONVERSATION_ID]: conversationId } : {}),
[GEN_AI_PROVIDER_NAME]: model.provider,
[GEN_AI_REQUEST_MODEL]: model.id,
[GEN_AI_CONVERSATION_ID]: conversationId,
...getServerAttributes(model),
...(streaming ? { [GEN_AI_RESPONSE_STREAMING]: true } : {}),
...(callOptions?.temperature !== undefined ? { [GEN_AI_REQUEST_TEMPERATURE]: callOptions.temperature } : {}),
...(callOptions?.maxTokens !== undefined ? { [GEN_AI_REQUEST_MAX_TOKENS]: callOptions.maxTokens } : {}),
...(callOptions?.reasoning ? { [GEN_AI_REQUEST_REASONING_LEVEL]: callOptions.reasoning } : {}),
[GEN_AI_REQUEST_TEMPERATURE]: callOptions?.temperature,
[GEN_AI_REQUEST_MAX_TOKENS]: callOptions?.maxTokens,
[GEN_AI_REQUEST_REASONING_LEVEL]: callOptions?.reasoning,
...(recordInputs && context ? getRequestContentAttributes(context) : {}),
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/server-utils/src/ai/pi-durable/tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ export function instrumentTool(tool: PiTool, runs: PiRuns, options: GenAiOptions
[SENTRY_ORIGIN]: PI_DURABLE_ORIGIN,
[GEN_AI_OPERATION_NAME]: 'execute_tool',
[GEN_AI_TOOL_NAME]: tool.name,
...(tool.description ? { [GEN_AI_TOOL_DESCRIPTION]: tool.description } : {}),
...(api?.callId ? { [GEN_AI_TOOL_CALL_ID_ATTRIBUTE]: api.callId } : {}),
[GEN_AI_TOOL_DESCRIPTION]: tool.description,
[GEN_AI_TOOL_CALL_ID_ATTRIBUTE]: api?.callId,
...(api?.conversationId !== undefined
? { [GEN_AI_CONVERSATION_ID]: toSentryConversationId(runs, api.conversationId) }
: {}),
Expand Down
2 changes: 1 addition & 1 deletion packages/server-utils/src/ai/typesafe/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function getRequestAttributes(
[SENTRY_ORIGIN]: TYPESAFE_ORIGIN,
[GEN_AI_OPERATION_NAME]: 'decide',
[GEN_AI_PROVIDER_NAME]: TYPESAFE_PROVIDER_NAME,
...(model ? { [GEN_AI_REQUEST_MODEL]: model } : {}),
[GEN_AI_REQUEST_MODEL]: model,
...(recordInputs ? { [GEN_AI_INPUT_MESSAGES]: getEvaluationInputMessages(request) } : {}),
};
}
Expand Down
2 changes: 1 addition & 1 deletion packages/server-utils/src/integrations/express/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ function getSpanForLayer(data: HandleChannelContext, options: ExpressIntegration
[SENTRY_OP]: EXPRESS_TYPE_TO_SPAN_OP[type],
[ATTR_EXPRESS_NAME]: name,
[ATTR_EXPRESS_TYPE]: type,
...(matchedRoute ? { [HTTP_ROUTE]: matchedRoute } : {}),
[HTTP_ROUTE]: matchedRoute,
},
});

Expand Down
6 changes: 3 additions & 3 deletions packages/server-utils/src/integrations/mysql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ function instrumentMysql(): void {
[SENTRY_ORIGIN]: 'auto.db.mysql',
// oxlint-disable-next-line typescript/no-deprecated -- Preserve the existing attribute name.
[DB_CONNECTION_STRING]: getJDBCString(host, portIsNumber ? portNumber : undefined, database),
...(database ? { [DB_NAMESPACE]: database } : {}),
...(user ? { [DB_USER]: user } : {}),
...(queryText ? { [DB_QUERY_TEXT]: queryText } : {}),
[DB_NAMESPACE]: database,
[DB_USER]: user,
[DB_QUERY_TEXT]: queryText,
[DB_QUERY_SUMMARY]: querySummary,
[SERVER_ADDRESS]: host,
[SERVER_PORT]: portIsNumber ? portNumber : undefined,
Expand Down
19 changes: 10 additions & 9 deletions packages/server-utils/src/integrations/vercel-ai/vercel-ai-dc-subscriber.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,11 @@ export function createSpanFromMessage(
const baseAttributes: SpanAttributes = {
[SENTRY_ORIGIN]: ORIGIN,
...telemetryMetadataAttributes(event.telemetryMetadata),
...(provider ? { [GEN_AI_PROVIDER_NAME]: provider, [VERCEL_AI_MODEL_PROVIDER_ATTRIBUTE]: provider } : {}),
...(modelId ? { [GEN_AI_REQUEST_MODEL]: modelId } : {}),
...(maxRetries !== undefined ? { [VERCEL_AI_SETTINGS_MAX_RETRIES_ATTRIBUTE]: maxRetries } : {}),
...(conversationId ? { [GEN_AI_CONVERSATION_ID]: conversationId } : {}),
[GEN_AI_PROVIDER_NAME]: provider,
[VERCEL_AI_MODEL_PROVIDER_ATTRIBUTE]: provider,
[GEN_AI_REQUEST_MODEL]: modelId,
[VERCEL_AI_SETTINGS_MAX_RETRIES_ATTRIBUTE]: maxRetries,
[GEN_AI_CONVERSATION_ID]: conversationId,
};

switch (type) {
Expand Down Expand Up @@ -547,7 +548,7 @@ function buildInvokeAgentSpan(
...baseAttributes,
[VERCEL_AI_OPERATION_ID_ATTRIBUTE]: operationId,
[GEN_AI_RESPONSE_STREAMING]: isStream,
...(functionId ? { [GEN_AI_FUNCTION_ID]: functionId } : {}),
[GEN_AI_FUNCTION_ID]: functionId,
...(recordInputs ? buildInputMessageAttributes(event) : {}),
});
if (isStream && callId) {
Expand Down Expand Up @@ -591,11 +592,11 @@ function buildToolSpan(
recordInputs && toolName ? resolveToolDescription(asString(event.callId), toolName, event.tools) : undefined;
return startGenAiSpan('execute_tool', toolName, {
[SENTRY_ORIGIN]: ORIGIN,
...(toolName ? { [GEN_AI_TOOL_NAME]: toolName } : {}),
...(toolCallId ? { [GEN_AI_TOOL_CALL_ID_ATTRIBUTE]: toolCallId } : {}),
...(description ? { [GEN_AI_TOOL_DESCRIPTION]: description } : {}),
[GEN_AI_TOOL_NAME]: toolName,
[GEN_AI_TOOL_CALL_ID_ATTRIBUTE]: toolCallId,
[GEN_AI_TOOL_DESCRIPTION]: description,
...(recordInputs && toolInput !== undefined ? { [GEN_AI_TOOL_CALL_ARGUMENTS]: stringify(toolInput) } : {}),
...(conversationId ? { [GEN_AI_CONVERSATION_ID]: conversationId } : {}),
[GEN_AI_CONVERSATION_ID]: conversationId,
});
}

Expand Down
4 changes: 2 additions & 2 deletions packages/solid/src/tanstackrouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export function tanstackRouterBrowserTracingIntegration<R extends AnyRouter>(
[SENTRY_OP]: PAGELOAD,
[SENTRY_ORIGIN]: 'auto.pageload.solid.tanstack_router',
[SENTRY_SEGMENT_NAME_SOURCE]: routeMatch ? 'route' : 'url',
...(routeMatch && { [URL_TEMPLATE]: routeMatch.routeId }),
[URL_TEMPLATE]: routeMatch?.routeId,
...routeMatchToParamSpanAttributes(routeMatch),
},
});
Expand Down Expand Up @@ -158,7 +158,7 @@ export function tanstackRouterBrowserTracingIntegration<R extends AnyRouter>(
[SENTRY_OP]: NAVIGATION,
[SENTRY_ORIGIN]: 'auto.navigation.solid.tanstack_router',
[SENTRY_SEGMENT_NAME_SOURCE]: routeMatch ? 'route' : 'url',
...(routeMatch && { [URL_TEMPLATE]: routeMatch.routeId }),
[URL_TEMPLATE]: routeMatch?.routeId,
...routeMatchToParamSpanAttributes(routeMatch),
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/src/performance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function recordInitSpan(componentName: string | undefined, description: string):
attributes: {
[SENTRY_OP]: UI_MOUNT,
[SENTRY_ORIGIN]: 'auto.ui.svelte',
...(componentName && { [UI_COMPONENT_NAME]: componentName }),
[UI_COMPONENT_NAME]: componentName || undefined,
...(hasSpanStreaming && { [SENTRY_DESCRIPTION]: description }),
},
});
Expand All @@ -87,7 +87,7 @@ function recordUpdateSpans(componentName: string | undefined, description: strin
attributes: {
[SENTRY_OP]: UI_UPDATE,
[SENTRY_ORIGIN]: 'auto.ui.svelte',
...(componentName && { [UI_COMPONENT_NAME]: componentName }),
[UI_COMPONENT_NAME]: componentName || undefined,
...(hasSpanStreaming && { [SENTRY_DESCRIPTION]: description }),
},
});
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/tanstackrouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export function tanstackRouterBrowserTracingIntegration<R extends AnyRouter>(
[SENTRY_OP]: PAGELOAD,
[SENTRY_ORIGIN]: 'auto.pageload.vue.tanstack_router',
[SENTRY_SEGMENT_NAME_SOURCE]: routeMatch ? 'route' : 'url',
...(routeMatch && { [URL_TEMPLATE]: routeMatch.routeId }),
[URL_TEMPLATE]: routeMatch?.routeId,
...routeMatchToParamSpanAttributes(routeMatch),
},
});
Expand Down Expand Up @@ -165,7 +165,7 @@ export function tanstackRouterBrowserTracingIntegration<R extends AnyRouter>(
[SENTRY_OP]: NAVIGATION,
[SENTRY_ORIGIN]: 'auto.navigation.vue.tanstack_router',
[SENTRY_SEGMENT_NAME_SOURCE]: routeMatch ? 'route' : 'url',
...(routeMatch && { [URL_TEMPLATE]: routeMatch.routeId }),
[URL_TEMPLATE]: routeMatch?.routeId,
...routeMatchToParamSpanAttributes(routeMatch),
},
},
Expand Down
Loading
Loading