From 5f08d1c0c0e9add4c05bc2ab2cc93c62ba61a441 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Thu, 13 Feb 2025 12:06:42 +0100 Subject: [PATCH 1/2] feat(loader): Make js loader v9 available --- src/sentry/loader/browsersdkversion.py | 2 +- src/sentry/projectoptions/defaults.py | 3 ++- .../devtoolbar/hooks/useSentryClientAndScope.tsx | 2 +- .../project/projectKeys/details/loaderSettings.tsx | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/sentry/loader/browsersdkversion.py b/src/sentry/loader/browsersdkversion.py index 7a6f06eb572448..683e8e644ca3af 100644 --- a/src/sentry/loader/browsersdkversion.py +++ b/src/sentry/loader/browsersdkversion.py @@ -37,7 +37,7 @@ def get_highest_browser_sdk_version(versions): def get_all_browser_sdk_version_versions(): - return ["latest", "8.x", "7.x", "6.x", "5.x", "4.x"] + return ["latest", "9.x", "8.x", "7.x", "6.x", "5.x", "4.x"] def get_all_browser_sdk_version_choices(): diff --git a/src/sentry/projectoptions/defaults.py b/src/sentry/projectoptions/defaults.py index 92335d82dbd5c4..caebaea21323dd 100644 --- a/src/sentry/projectoptions/defaults.py +++ b/src/sentry/projectoptions/defaults.py @@ -53,6 +53,7 @@ # version is set on a project's DSN. register( key="sentry:default_loader_version", + # TODO(lforst): Make v9 loader default epoch_defaults={1: "4.x", 2: "5.x", 7: "6.x", 8: "7.x", 13: "8.x"}, ) @@ -183,7 +184,7 @@ # The available loader SDK versions register( key="sentry:loader_available_sdk_versions", - epoch_defaults={1: ["8.x", "7.x", "6.x", "5.x", "4.x"], 11: ["8.x", "7.x"]}, + epoch_defaults={1: ["9.x", "8.x", "7.x", "6.x", "5.x", "4.x"], 11: ["9.x", "8.x", "7.x"]}, ) # Dynamic sampling rate in project-level "manual" configuration mode diff --git a/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx b/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx index 3c492995693b36..4566ff5aefa578 100644 --- a/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx +++ b/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx @@ -29,7 +29,7 @@ export function useScopeAndClient() { // using console log for now, will change this when moving to dev tool bar repo // eslint-disable-next-line no-console console.log( - "Couldn't find a Sentry SDK scope or client. Make sure you're using a Sentry SDK with version 7.x or 8.x" + "Couldn't find a Sentry SDK scope or client. Make sure you're using a Sentry SDK with version 7.x or above" ); } diff --git a/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx b/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx index 5e79acce6f7882..291ba2e790cfa7 100644 --- a/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx +++ b/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx @@ -283,5 +283,10 @@ export function LoaderSettings({keyId, orgSlug, project, data, updateData}: Prop } function sdkVersionSupportsPerformanceAndReplay(sdkVersion: string): boolean { - return sdkVersion === 'latest' || sdkVersion === '7.x' || sdkVersion === '8.x'; + return ( + sdkVersion === 'latest' || + sdkVersion === '7.x' || + sdkVersion === '8.x' || + sdkVersion === '9.x' + ); } From 291a5418f816ccc5a81bb35ab73362c913d2098a Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Thu, 13 Feb 2025 12:36:04 +0100 Subject: [PATCH 2/2] undo frontend changes --- .../devtoolbar/hooks/useSentryClientAndScope.tsx | 2 +- .../project/projectKeys/details/loaderSettings.tsx | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx b/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx index 4566ff5aefa578..3c492995693b36 100644 --- a/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx +++ b/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx @@ -29,7 +29,7 @@ export function useScopeAndClient() { // using console log for now, will change this when moving to dev tool bar repo // eslint-disable-next-line no-console console.log( - "Couldn't find a Sentry SDK scope or client. Make sure you're using a Sentry SDK with version 7.x or above" + "Couldn't find a Sentry SDK scope or client. Make sure you're using a Sentry SDK with version 7.x or 8.x" ); } diff --git a/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx b/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx index 291ba2e790cfa7..5e79acce6f7882 100644 --- a/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx +++ b/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx @@ -283,10 +283,5 @@ export function LoaderSettings({keyId, orgSlug, project, data, updateData}: Prop } function sdkVersionSupportsPerformanceAndReplay(sdkVersion: string): boolean { - return ( - sdkVersion === 'latest' || - sdkVersion === '7.x' || - sdkVersion === '8.x' || - sdkVersion === '9.x' - ); + return sdkVersion === 'latest' || sdkVersion === '7.x' || sdkVersion === '8.x'; }