Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Sentry Android 6.1.2 and Cocoa 7.18.0 #2303

Merged
merged 8 commits into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## Unreleased

- Bump Sentry Cocoa 7.18.0 ([#2303](https://github.com/getsentry/sentry-react-native/pull/2303))
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/7.18.0/CHANGELOG.md)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.17.0...7.18.0)
- Bump Sentry Android 6.1.2 ([#2303](https://github.com/getsentry/sentry-react-native/pull/2303))
- [changelog](https://github.com/getsentry/sentry-java/blob/6.1.2/CHANGELOG.md)
- [diff](https://github.com/getsentry/sentry-java/compare/6.1.1...6.1.2)

## 4.0.0-beta.5

- Fix warning missing DSN on BrowserClient. ([#2294](https://github.com/getsentry/sentry-react-native/pull/2294))
Expand Down
2 changes: 1 addition & 1 deletion RNSentry.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Pod::Spec.new do |s|
s.preserve_paths = '*.js'

s.dependency 'React-Core'
s.dependency 'Sentry', '7.17.0'
s.dependency 'Sentry', '7.18.0'

s.source_files = 'ios/RNSentry.{h,m}'
s.public_header_files = 'ios/RNSentry.h'
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ android {

dependencies {
implementation 'com.facebook.react:react-native:+'
api 'io.sentry:sentry-android:6.1.1'
api 'io.sentry:sentry-android:6.1.2'
}
8 changes: 4 additions & 4 deletions ios/RNSentry.m
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
if ([NSJSONSerialization isValidJSONObject:envelopeDict]) {
SentrySdkInfo *sdkInfo = [[SentrySdkInfo alloc] initWithDict:envelopeDict[@"header"]];
SentryId *eventId = [[SentryId alloc] initWithUUIDString:envelopeDict[@"header"][@"event_id"]];
SentryEnvelopeHeader *envelopeHeader = [[SentryEnvelopeHeader alloc] initWithId:eventId sdkInfo:sdkInfo traceState:nil];
SentryEnvelopeHeader *envelopeHeader = [[SentryEnvelopeHeader alloc] initWithId:eventId sdkInfo:sdkInfo traceContext:nil];

NSError *error;
NSData *envelopeItemData = [NSJSONSerialization dataWithJSONObject:envelopeDict[@"payload"] options:0 error:&error];
Expand All @@ -293,13 +293,13 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
SentryEnvelope *envelope = [[SentryEnvelope alloc] initWithHeader:envelopeHeader singleItem:envelopeItem];

#if DEBUG
[SentrySDK captureEnvelope:envelope];
[PrivateSentrySDKOnly captureEnvelope:envelope];
#else
if ([envelopeDict[@"payload"][@"level"] isEqualToString:@"fatal"]) {
// Storing to disk happens asynchronously with captureEnvelope
[SentrySDK storeEnvelope:envelope];
[PrivateSentrySDKOnly storeEnvelope:envelope];
} else {
[SentrySDK captureEnvelope:envelope];
[PrivateSentrySDKOnly captureEnvelope:envelope];
}
#endif
resolve(@YES);
Expand Down