Merge 4af64f6 into 4da6c0b

getsentry · Nov 15, 2022 · 9f1fe4c · 9f1fe4c
2 parents 4da6c0b + 4af64f6
commit 9f1fe4c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Don't increase session's error count for dropped events (#2374)
+
 ## 7.31.0
 
 ### Features

diff --git a/Sources/Sentry/SentryClient.m b/Sources/Sentry/SentryClient.m
@@ -189,6 +189,11 @@ - (SentryId *)captureException:(NSException *)exception
 {
     SentryEvent *event = [self buildExceptionEvent:exception];
     event = [self prepareEvent:event withScope:scope alwaysAttachStacktrace:YES];
+
+    if (event != nil) {
+        session = [SentrySDK.currentHub incrementSessionErrors];
+    }
+
     return [self sendEvent:event withSession:session withScope:scope];
 }
 
@@ -220,6 +225,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) {
@@ -457,8 +457,7 @@ - (SentryId *)captureException:(NSException *)exception
 
 - (SentryId *)captureException:(NSException *)exception 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