From 5f05517c1128a62c7afcd12cfc89692ba0fda266 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 4 Apr 2023 13:18:40 +0200 Subject: [PATCH] apply suggestions --- packages/sveltekit/src/client/load.ts | 22 ++++++++++--------- .../tracing-internal/src/browser/request.ts | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/sveltekit/src/client/load.ts b/packages/sveltekit/src/client/load.ts index 8c294a70ac2c..ac76eef050f3 100644 --- a/packages/sveltekit/src/client/load.ts +++ b/packages/sveltekit/src/client/load.ts @@ -108,7 +108,8 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch const browserTracingIntegration = client.getIntegrationById && (client.getIntegrationById('BrowserTracing') as BrowserTracing | undefined); - const breadcrumbsIntegration = client.getIntegrationById('Breadcrumbs') as Breadcrumbs | undefined; + const breadcrumbsIntegration = + client.getIntegrationById && (client.getIntegrationById('Breadcrumbs') as Breadcrumbs | undefined); const browserTracingOptions = browserTracingIntegration && browserTracingIntegration.options; @@ -133,14 +134,6 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch apply: (wrappingTarget, thisArg, args: Parameters) => { const [input, init] = args; const { url: rawUrl, method } = parseFetchArgs(args); - const urlObject = parseUrl(rawUrl); - - const requestData: SanitizedRequestData = { - url: getSanitizedUrlString(urlObject), - method, - 'http.query': urlObject.search, - 'http.fragment': urlObject.hash, - }; // TODO: extract this to a util function (and use it in breadcrumbs integration as well) if (rawUrl.match(/sentry_key/)) { @@ -148,7 +141,16 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch return wrappingTarget.apply(thisArg, args); } - const patchedInit: RequestInit = { ...init } || {}; + const urlObject = parseUrl(rawUrl); + + const requestData: SanitizedRequestData = { + url: getSanitizedUrlString(urlObject), + method, + ...(urlObject.search && { 'http.query': urlObject.search.substring(1) }), + ...(urlObject.hash && { 'http.hash': urlObject.hash.substring(1) }), + }; + + const patchedInit: RequestInit = { ...init }; const activeSpan = getCurrentHub().getScope().getSpan(); const activeTransaction = activeSpan && activeSpan.transaction; diff --git a/packages/tracing-internal/src/browser/request.ts b/packages/tracing-internal/src/browser/request.ts index f750d34ee0d2..040f52d97dea 100644 --- a/packages/tracing-internal/src/browser/request.ts +++ b/packages/tracing-internal/src/browser/request.ts @@ -250,7 +250,7 @@ export function addTracingHeadersToFetchRequest( newHeaders.append('sentry-trace', sentryTraceHeader); if (sentryBaggageHeader) { - // If the same header is appended miultiple times the browser will merge the values into a single request header. + // If the same header is appended multiple times the browser will merge the values into a single request header. // Its therefore safe to simply push a "baggage" entry, even though there might already be another baggage header. newHeaders.append(BAGGAGE_HEADER_NAME, sentryBaggageHeader); }