Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
494a619
Adds breadcrumb origin in RNSentryBreadcrumb dictionary parsing
antonis Sep 27, 2024
cc0b364
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 8, 2024
a636be5
Use 8.38.0-beta.1 Cocoa SDK that has the new origin field
antonis Oct 8, 2024
522897a
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 9, 2024
197f863
Adds changelog
antonis Oct 9, 2024
9bee5c9
Fixes sentry-java breaking changes
antonis Oct 9, 2024
6268a43
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 10, 2024
6095218
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 11, 2024
0e43c5d
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 15, 2024
8832cf9
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 15, 2024
7a108ee
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 16, 2024
aff18bf
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 23, 2024
611cd97
Adds origin native tests
antonis Oct 23, 2024
37553f2
Adds Capture exception with breadcrumb in the sample
antonis Oct 23, 2024
24a527b
Set react native as event origin
antonis Oct 28, 2024
fabf052
Filter out events with react-native origin from the native layer
antonis Oct 28, 2024
d0b1633
Merge event breadcrumbs with native context
antonis Oct 28, 2024
5d2711c
Lint: removes empty line
antonis Oct 28, 2024
fb0057d
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Oct 31, 2024
78c24f0
Use predicate to filter breadcrumbs
antonis Oct 31, 2024
6fcd93d
Respect max breadcrumbs limit
antonis Oct 31, 2024
80add4f
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Nov 1, 2024
44e02ec
Updates changelog
antonis Nov 1, 2024
a2d29de
Update test names
antonis Nov 1, 2024
52c9e54
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Nov 6, 2024
81a11c3
Fixes lint issue
antonis Nov 6, 2024
f828fc7
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Nov 6, 2024
67bd716
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Nov 7, 2024
c4246d7
Keep the last maxBreadcrumbs (default 100) when merging native and js…
antonis Nov 7, 2024
17e2201
Use client from function parameter
antonis Nov 11, 2024
fef2173
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Nov 11, 2024
76285fa
Refactor and test RNSentryModuleImpl.fetchNativeDeviceContexts (#4253)
antonis Nov 11, 2024
6ea1fe1
Merge branch 'main' into antonis/add-breadcrumb-origin
antonis Nov 18, 2024
af1ab5a
Move changelog to unreleased section
antonis Nov 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Filter out events with react-native origin from the native layer
  • Loading branch information
antonis committed Oct 28, 2024
commit fabf0526a8b9d70a75c703b2d29accbc09e4fe93
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import com.facebook.react.bridge.WritableNativeArray;
import com.facebook.react.bridge.WritableNativeMap;
import com.facebook.react.modules.core.DeviceEventManagerModule;

import io.sentry.Breadcrumb;
import io.sentry.HubAdapter;
import io.sentry.ILogger;
import io.sentry.IScope;
Expand Down Expand Up @@ -75,6 +77,7 @@
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
Expand Down Expand Up @@ -891,6 +894,17 @@ public void fetchNativeDeviceContexts(Promise promise) {
}

final @Nullable IScope currentScope = InternalSentrySdk.getCurrentScope();
if (currentScope != null) {
// Remove react-native breadcrumbs
Iterator<Breadcrumb> breadcrumbsIterator = currentScope.getBreadcrumbs().iterator();
while (breadcrumbsIterator.hasNext()) {
Breadcrumb breadcrumb = breadcrumbsIterator.next();
if ("react-native".equals(breadcrumb.getOrigin())) {
breadcrumbsIterator.remove();
}
}
}

final @NotNull Map<String, Object> serialized =
InternalSentrySdk.serializeScope(context, (SentryAndroidOptions) options, currentScope);
final @Nullable Object deviceContext = RNSentryMapConverter.convertToWritable(serialized);
Expand Down
11 changes: 11 additions & 0 deletions packages/core/ios/RNSentry.mm
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,17 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd

[serializedScope setValue:contexts forKey:@"contexts"];
[serializedScope removeObjectForKey:@"context"];

// Remove react-native breadcrumbs
NSMutableArray<NSDictionary<NSString *, id> *> *breadcrumbs = [serializedScope[@"breadcrumbs"] mutableCopy];
for (NSInteger i = breadcrumbs.count - 1; i >= 0; i--) {
NSDictionary<NSString *, id> *breadcrumb = breadcrumbs[i];
if ([breadcrumb[@"origin"] isEqualToString:@"react-native"]) {
[breadcrumbs removeObjectAtIndex:i];
}
}
[serializedScope setValue:breadcrumbs forKey:@"breadcrumbs"];

resolve(serializedScope);
}

Expand Down