From d2b541efac61bbe558567bbe78dd929543fb8b30 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 27 Jan 2025 11:55:36 +0000 Subject: [PATCH 1/6] chore: update scripts/update-android.sh to 8.0.0 --- CHANGELOG.md | 6 +++--- packages/core/android/build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08b5890013..2ebfbebfad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,9 +35,9 @@ - Bump JavaScript SDK from v8.47.0 to v8.51.0 ([#4421](https://github.com/getsentry/sentry-react-native/pull/4421), [#4449](https://github.com/getsentry/sentry-react-native/pull/4449), [#4453](https://github.com/getsentry/sentry-react-native/pull/4453), [#4480](https://github.com/getsentry/sentry-react-native/pull/4480)) - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8510) - [diff](https://github.com/getsentry/sentry-javascript/compare/8.47.0...8.51.0) -- Bump Android SDK from v7.20.0 to v7.20.1 ([#4467](https://github.com/getsentry/sentry-react-native/pull/4467)) - - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7201) - - [diff](https://github.com/getsentry/sentry-java/compare/7.20.0...7.20.1) +- Bump Android SDK from v7.20.0 to v8.0.0 ([#4467](https://github.com/getsentry/sentry-react-native/pull/4467), [#4471](https://github.com/getsentry/sentry-react-native/pull/4471)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#800) + - [diff](https://github.com/getsentry/sentry-java/compare/7.20.0...8.0.0) ## 6.5.0 diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index f9fc318768..04404bf6ba 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -54,5 +54,5 @@ android { dependencies { implementation 'com.facebook.react:react-native:+' - api 'io.sentry:sentry-android:7.20.1' + api 'io.sentry:sentry-android:8.0.0' } From bcdad6668bbe2cbc9f002b25eca44d7621a856ad Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 28 Jan 2025 13:22:09 +0200 Subject: [PATCH 2/6] Remove user segment --- .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java index 486ae72c48..5bab628358 100644 --- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java @@ -655,10 +655,6 @@ public void setUser(final ReadableMap userKeys, final ReadableMap userDataKeys) if (userKeys.hasKey("ip_address")) { userInstance.setIpAddress(userKeys.getString("ip_address")); } - - if (userKeys.hasKey("segment")) { - userInstance.setSegment(userKeys.getString("segment")); - } } if (userDataKeys != null) { From fa6ffebac98e8f65e544aff8083f9b6a9b08144e Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 28 Jan 2025 13:22:57 +0200 Subject: [PATCH 3/6] Update AndroidProfiler constructor --- .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java index 5bab628358..eb2103ec99 100644 --- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java @@ -803,8 +803,7 @@ private void initializeAndroidProfiler() { (int) SECONDS.toMicros(1) / profilingTracesHz, new SentryFrameMetricsCollector(reactApplicationContext, logger, buildInfo), executorService, - logger, - buildInfo); + logger); } public WritableMap startProfiling(boolean platformProfilers) { From 40f4fab73af34e073e72a9be1c414fd1b6d8ab70 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 28 Jan 2025 13:23:41 +0200 Subject: [PATCH 4/6] Use getPackageSet instead of getPackages --- .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java index eb2103ec99..b0d5b63b0d 100644 --- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java @@ -85,6 +85,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.concurrent.CountDownLatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -996,7 +997,7 @@ private void addPackages(SentryEvent event, SdkVersion sdk) { if (eventSdk != null && "sentry.javascript.react-native".equals(eventSdk.getName()) && sdk != null) { - List sentryPackages = sdk.getPackages(); + Set sentryPackages = sdk.getPackageSet(); if (sentryPackages != null) { for (SentryPackage sentryPackage : sentryPackages) { eventSdk.addPackage(sentryPackage.getName(), sentryPackage.getVersion()); From 0828c2bf6ca0b3955c13b87e6d189ff33586bd67 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 28 Jan 2025 13:24:09 +0200 Subject: [PATCH 5/6] Use getIntegrationSet instead of getIntegrations --- .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java index b0d5b63b0d..53fca26524 100644 --- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java @@ -1004,7 +1004,7 @@ private void addPackages(SentryEvent event, SdkVersion sdk) { } } - List integrations = sdk.getIntegrations(); + Set integrations = sdk.getIntegrationSet(); if (integrations != null) { for (String integration : integrations) { eventSdk.addIntegration(integration); From 140ba2693aada1c1a551769be374248cbadd04f0 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 28 Jan 2025 13:56:45 +0200 Subject: [PATCH 6/6] Replace Hub with Scopes --- .../java/io/sentry/react/RNSentryModuleImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java index 53fca26524..0b626b3188 100644 --- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java @@ -29,12 +29,12 @@ import com.facebook.react.common.JavascriptException; import com.facebook.react.modules.core.DeviceEventManagerModule; import io.sentry.Breadcrumb; -import io.sentry.HubAdapter; import io.sentry.ILogger; import io.sentry.IScope; import io.sentry.ISentryExecutorService; import io.sentry.ISerializer; import io.sentry.Integration; +import io.sentry.ScopesAdapter; import io.sentry.Sentry; import io.sentry.SentryDate; import io.sentry.SentryDateProvider; @@ -506,7 +506,7 @@ public void fetchNativeFrames(Promise promise) { } public void captureReplay(boolean isHardCrash, Promise promise) { - Sentry.getCurrentHub().getOptions().getReplayController().captureReplay(isHardCrash); + Sentry.getCurrentScopes().getOptions().getReplayController().captureReplay(isHardCrash); promise.resolve(getCurrentReplayId()); } @@ -602,7 +602,7 @@ public void fetchViewHierarchy(Promise promise) { return; } - ISerializer serializer = HubAdapter.getInstance().getOptions().getSerializer(); + ISerializer serializer = ScopesAdapter.getInstance().getOptions().getSerializer(); final @Nullable byte[] bytes = JsonSerializationUtils.bytesFrom(serializer, logger, viewHierarchy); if (bytes == null) { @@ -828,7 +828,7 @@ public WritableMap startProfiling(boolean platformProfilers) { } public WritableMap stopProfiling() { - final boolean isDebug = HubAdapter.getInstance().getOptions().isDebug(); + final boolean isDebug = ScopesAdapter.getInstance().getOptions().isDebug(); final WritableMap result = new WritableNativeMap(); File output = null; try { @@ -914,7 +914,7 @@ private String readStringFromFile(File path) throws IOException { } public void fetchNativeDeviceContexts(Promise promise) { - final @NotNull SentryOptions options = HubAdapter.getInstance().getOptions(); + final @NotNull SentryOptions options = ScopesAdapter.getInstance().getOptions(); final @Nullable Context context = this.getReactApplicationContext().getApplicationContext(); final @Nullable IScope currentScope = InternalSentrySdk.getCurrentScope(); fetchNativeDeviceContexts(promise, options, context, currentScope); @@ -951,7 +951,8 @@ protected void fetchNativeDeviceContexts( } public void fetchNativeSdkInfo(Promise promise) { - final @Nullable SdkVersion sdkVersion = HubAdapter.getInstance().getOptions().getSdkVersion(); + final @Nullable SdkVersion sdkVersion = + ScopesAdapter.getInstance().getOptions().getSdkVersion(); if (sdkVersion == null) { promise.resolve(null); } else {