Merge 8511692 into cd8dad3

getsentry · Nov 14, 2022 · db3535b · db3535b
2 parents cd8dad3 + 8511692
commit db3535b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 
 - Fix issue with invalid profiles uploading (#2358 and #2359)
 - Call UIDevice methods on the main thread (#2369)
+- Don't increase session's error count for dropped events (#2374)
 - Avoid sending profiles with 0 samples or incorrectly deduplicated backtrace elements (#2375)
 
 ## 7.30.0

diff --git a/Sources/Sentry/SentryClient.m b/Sources/Sentry/SentryClient.m
@@ -220,6 +220,11 @@ - (SentryId *)captureError:(NSError *)error
 {
     SentryEvent *event = [self buildErrorEvent:error];
     event = [self prepareEvent:event withScope:scope alwaysAttachStacktrace:YES];
+
+    if (event != nil) {
+        session = [SentrySDK.currentHub incrementSessionErrors];
+    }
+
     return [self sendEvent:event withSession:session withScope:scope];
 }
 

diff --git a/Sources/Sentry/SentryHub.m b/Sources/Sentry/SentryHub.m
@@ -438,7 +438,7 @@ - (SentryId *)captureError:(NSError *)error
 
 - (SentryId *)captureError:(NSError *)error withScope:(SentryScope *)scope
 {
-    SentrySession *currentSession = [self incrementSessionErrors];
+    SentrySession *currentSession = _session;
     SentryClient *client = _client;
     if (nil != client) {
         if (nil != currentSession) {

diff --git a/Sources/Sentry/include/SentryHub+Private.h b/Sources/Sentry/include/SentryHub+Private.h
@@ -53,6 +53,8 @@ SentryHub (Private)
                        withScope:(SentryScope *)scope
          additionalEnvelopeItems:(NSArray<SentryEnvelopeItem *> *)additionalEnvelopeItems;
 
+- (nullable SentrySession *)incrementSessionErrors;
+
 @end
 
 NS_ASSUME_NONNULL_END