From dd018ab70da6ca7d136a8349c23efb8dc3320faa Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Tue, 21 Jun 2022 14:48:58 +0200 Subject: [PATCH 1/5] Changelog --- CHANGELOG.md | 10 ++++++++++ RNSentry.podspec | 2 +- android/build.gradle | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25569d89fa..c35d4281e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## Unreleased + +- Bump Sentry Cocoa 7.18.0 ([#2300](https://github.com/getsentry/sentry-react-native/pull/2300)) + - [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 ([#2300](https://github.com/getsentry/sentry-react-native/pull/2300)) + - [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)) @@ -7,6 +16,7 @@ ## 4.0.0-beta.4 - Bump Sentry Cocoa 7.17.0 ([#2300](https://github.com/getsentry/sentry-react-native/pull/2300)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/7.17.0/CHANGELOG.md) - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.16.1...7.17.0) diff --git a/RNSentry.podspec b/RNSentry.podspec index 4fd3101efe..f812a317a0 100644 --- a/RNSentry.podspec +++ b/RNSentry.podspec @@ -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' diff --git a/android/build.gradle b/android/build.gradle index 4315f5c825..8be321c243 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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' } From 7dcf40dd4e78e967fbe9ceebd64552f601f16a57 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Tue, 21 Jun 2022 14:49:37 +0200 Subject: [PATCH 2/5] fix id --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c35d4281e3..95db5b0860 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,10 @@ ## Unreleased -- Bump Sentry Cocoa 7.18.0 ([#2300](https://github.com/getsentry/sentry-react-native/pull/2300)) +- 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 ([#2300](https://github.com/getsentry/sentry-react-native/pull/2300)) +- 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) From aab5729f95f7083e4222e8dafbba9b35814a5f41 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto <5731772+marandaneto@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:51:12 +0200 Subject: [PATCH 3/5] remove empty line --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95db5b0860..d018994b8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,6 @@ ## 4.0.0-beta.4 - Bump Sentry Cocoa 7.17.0 ([#2300](https://github.com/getsentry/sentry-react-native/pull/2300)) - - [changelog](https://github.com/getsentry/sentry-cocoa/blob/7.17.0/CHANGELOG.md) - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.16.1...7.17.0) From faa65e13d0e4cba0bc4081ef3bd56754df176e9d Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Tue, 21 Jun 2022 16:36:51 +0200 Subject: [PATCH 4/5] fix --- ios/RNSentry.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/RNSentry.m b/ios/RNSentry.m index eb9e8238b1..f83a6e2fcf 100644 --- a/ios/RNSentry.m +++ b/ios/RNSentry.m @@ -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]; From 874fcf5b49611a7bc383978bfe32e827a296b365 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Tue, 21 Jun 2022 17:00:56 +0200 Subject: [PATCH 5/5] use PrivateSentrySDKOnly --- ios/RNSentry.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/RNSentry.m b/ios/RNSentry.m index f83a6e2fcf..eb781a3b98 100644 --- a/ios/RNSentry.m +++ b/ios/RNSentry.m @@ -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);