Skip to content

Commit d8dfaa8

Browse files
antonisclaude
andcommitted
refactor(android): Pass logger to RNSentryBreadcrumb.fromMap instead of fetching from scopes
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 3c1fc9d commit d8dfaa8

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
package io.sentry.rnsentryandroidtester
22

33
import com.facebook.react.bridge.JavaOnlyMap
4+
import io.sentry.ILogger
45
import io.sentry.SentryLevel
56
import io.sentry.react.RNSentryBreadcrumb
67
import junit.framework.TestCase.assertEquals
78
import junit.framework.TestCase.assertNotNull
89
import org.junit.Test
910
import org.junit.runner.RunWith
1011
import org.junit.runners.JUnit4
12+
import org.mockito.Mockito
1113

1214
@RunWith(JUnit4::class)
1315
class RNSentryBreadcrumbTest {
16+
private val logger = Mockito.mock(ILogger::class.java)
17+
1418
@Test
1519
fun generatesSentryBreadcrumbFromMap() {
1620
val testData =
@@ -33,7 +37,7 @@ class RNSentryBreadcrumbTest {
3337
"data",
3438
testData,
3539
)
36-
val actual = RNSentryBreadcrumb.fromMap(map)
40+
val actual = RNSentryBreadcrumb.fromMap(map, logger)
3741
assertEquals(SentryLevel.ERROR, actual.level)
3842
assertEquals("testCategory", actual.category)
3943
assertEquals("testOrigin", actual.origin)
@@ -49,7 +53,7 @@ class RNSentryBreadcrumbTest {
4953
"message",
5054
"testMessage",
5155
)
52-
val actual = RNSentryBreadcrumb.fromMap(map)
56+
val actual = RNSentryBreadcrumb.fromMap(map, logger)
5357
assertEquals(SentryLevel.INFO, actual.level)
5458
}
5559

@@ -60,7 +64,7 @@ class RNSentryBreadcrumbTest {
6064
"message",
6165
"testMessage",
6266
)
63-
val actual = RNSentryBreadcrumb.fromMap(map)
67+
val actual = RNSentryBreadcrumb.fromMap(map, logger)
6468
assertNotNull(actual.timestamp)
6569
}
6670

@@ -71,7 +75,7 @@ class RNSentryBreadcrumbTest {
7175
"message",
7276
"testMessage",
7377
)
74-
val actual = RNSentryBreadcrumb.fromMap(map)
78+
val actual = RNSentryBreadcrumb.fromMap(map, logger)
7579
assertEquals("testMessage", actual.message)
7680
assertEquals("react-native", actual.origin)
7781
}

packages/core/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.facebook.react.bridge.ReadableType;
66
import io.sentry.Breadcrumb;
77
import io.sentry.ILogger;
8-
import io.sentry.Sentry;
98
import io.sentry.SentryLevel;
109
import io.sentry.util.MapObjectReader;
1110
import java.util.Map;
@@ -41,8 +40,7 @@ public static String getCurrentScreenFrom(ReadableMap from) {
4140
}
4241

4342
@NotNull
44-
public static Breadcrumb fromMap(ReadableMap from) {
45-
final @NotNull ILogger logger = Sentry.getCurrentScopes().getOptions().getLogger();
43+
public static Breadcrumb fromMap(ReadableMap from, @NotNull ILogger logger) {
4644
try {
4745
final @NotNull MapObjectReader reader = new MapObjectReader(toDeepHashMap(from));
4846
final @NotNull Breadcrumb breadcrumb =

packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ public void setUser(final ReadableMap userKeys, final ReadableMap userDataKeys)
611611
public void addBreadcrumb(final ReadableMap breadcrumb) {
612612
Sentry.configureScope(
613613
scope -> {
614-
scope.addBreadcrumb(RNSentryBreadcrumb.fromMap(breadcrumb));
614+
scope.addBreadcrumb(RNSentryBreadcrumb.fromMap(breadcrumb, logger));
615615

616616
final @Nullable String screen = RNSentryBreadcrumb.getCurrentScreenFrom(breadcrumb);
617617
if (screen != null) {

0 commit comments

Comments
 (0)