From 6efe57c430ebcaf575ba0ec31fa4c270a42ee521 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 24 Jan 2024 11:26:23 +0100 Subject: [PATCH 1/2] fix(svelte): Make component tracking compatible with Svelte 5 --- packages/svelte/src/performance.ts | 4 ++-- packages/svelte/src/preprocessors.ts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/svelte/src/performance.ts b/packages/svelte/src/performance.ts index fb5f80d0ffaf..178c24c04334 100644 --- a/packages/svelte/src/performance.ts +++ b/packages/svelte/src/performance.ts @@ -1,7 +1,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan } from '@sentry/browser'; import type { Span } from '@sentry/types'; import { afterUpdate, beforeUpdate, onMount } from 'svelte'; -import { current_component } from 'svelte/internal'; import { getRootSpan, startInactiveSpan, withActiveSpan } from '@sentry/core'; import { DEFAULT_COMPONENT_NAME, UI_SVELTE_INIT, UI_SVELTE_UPDATE } from './constants'; @@ -32,7 +31,7 @@ export function trackComponent(options?: TrackComponentOptions): void { // current_component.ctor.name is likely to give us the component's name automatically // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - const componentName = `<${customComponentName || current_component.constructor.name || DEFAULT_COMPONENT_NAME}>`; + const componentName = `<${customComponentName || DEFAULT_COMPONENT_NAME}>`; let initSpan: Span | undefined = undefined; if (mergedOptions.trackInit) { @@ -53,6 +52,7 @@ function recordInitSpan(componentName: string): Span | undefined { }); onMount(() => { + console.log('END SPAN', componentName); initSpan.end(); }); diff --git a/packages/svelte/src/preprocessors.ts b/packages/svelte/src/preprocessors.ts index a258d4becff4..fee3a501ee41 100644 --- a/packages/svelte/src/preprocessors.ts +++ b/packages/svelte/src/preprocessors.ts @@ -18,6 +18,8 @@ export const FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID = 'FIRST_PASS_COMPONENT_TR export function componentTrackingPreprocessor(options?: ComponentTrackingInitOptions): PreprocessorGroup { const mergedOptions = { ...defaultComponentTrackingOptions, ...options }; + console.log('mergedOptions', mergedOptions); + const visitedFiles = new Set(); const visitedFilesMarkup = new Set(); From b6f7fa804344aff5f93452e22cd51f186f976eca Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 24 Jan 2024 11:42:39 +0100 Subject: [PATCH 2/2] rm console logs --- packages/svelte/src/performance.ts | 1 - packages/svelte/src/preprocessors.ts | 2 -- 2 files changed, 3 deletions(-) diff --git a/packages/svelte/src/performance.ts b/packages/svelte/src/performance.ts index 178c24c04334..b151492fe240 100644 --- a/packages/svelte/src/performance.ts +++ b/packages/svelte/src/performance.ts @@ -52,7 +52,6 @@ function recordInitSpan(componentName: string): Span | undefined { }); onMount(() => { - console.log('END SPAN', componentName); initSpan.end(); }); diff --git a/packages/svelte/src/preprocessors.ts b/packages/svelte/src/preprocessors.ts index fee3a501ee41..a258d4becff4 100644 --- a/packages/svelte/src/preprocessors.ts +++ b/packages/svelte/src/preprocessors.ts @@ -18,8 +18,6 @@ export const FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID = 'FIRST_PASS_COMPONENT_TR export function componentTrackingPreprocessor(options?: ComponentTrackingInitOptions): PreprocessorGroup { const mergedOptions = { ...defaultComponentTrackingOptions, ...options }; - console.log('mergedOptions', mergedOptions); - const visitedFiles = new Set(); const visitedFilesMarkup = new Set();