Only send session update for dropped events if state changed

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## Unreleased
 
 * Fix: Allow disabling sending of client reports via Android Manifest and external options (#2007)
+* Fix: Change order of event filtering mechanisms (#2001)
+* Fix: Only send session update for dropped events if state changed (#2002)
 
 ## 6.0.0-alpha.6
 

sentry/src/main/java/io/sentry/SentryClient.java

@@ -81,6 +81,22 @@ private boolean shouldApplyScopeData(
 
     options.getLogger().log(SentryLevel.DEBUG, "Capturing event: %s", event.getEventId());
 
+    if (event != null) {
+      Throwable eventThrowable = event.getThrowable();
+      if (eventThrowable != null && options.containsIgnoredExceptionForType(eventThrowable)) {
+        options
+            .getLogger()
+            .log(
+                SentryLevel.DEBUG,
+                "Event was dropped as the exception %s is ignored",
+                eventThrowable.getClass());
+        options
+            .getClientReportRecorder()
+            .recordLostEvent(DiscardReason.EVENT_PROCESSOR, DataCategory.Error);
+        return SentryId.EMPTY_ID;
+      }
+    }
+
     if (shouldApplyScopeData(event, hint)) {
       // Event has already passed through here before it was cached
       // Going through again could be reading data that is no longer relevant
@@ -95,7 +111,25 @@ private boolean shouldApplyScopeData(
 
     event = processEvent(event, hint, options.getEventProcessors());
 
-    Session session = null;
+    if (event != null) {
+      event = executeBeforeSend(event, hint);
+
+      if (event == null) {
+        options.getLogger().log(SentryLevel.DEBUG, "Event was dropped by beforeSend");
+        options
+            .getClientReportRecorder()
+            .recordLostEvent(DiscardReason.BEFORE_SEND, DataCategory.Error);
+      }
+    }
+
+    if (event == null) {
+      return SentryId.EMPTY_ID;
+    }
+
+    @Nullable
+    Session oldSession =
+        scope != null ? scope.withSession((@Nullable Session session) -> {}) : null;
+    @Nullable Session session = null;
 
     if (event != null) {
       session = updateSessionData(event, hint, scope);
@@ -115,28 +149,10 @@ private boolean shouldApplyScopeData(
       }
     }
 
-    if (event != null) {
-      if (event.getThrowable() != null
-          && options.containsIgnoredExceptionForType(event.getThrowable())) {
-        options
-            .getLogger()
-            .log(
-                SentryLevel.DEBUG,
-                "Event was dropped as the exception %s is ignored",
-                event.getThrowable().getClass());
-        options
-            .getClientReportRecorder()
-            .recordLostEvent(DiscardReason.EVENT_PROCESSOR, DataCategory.Error);
-        return SentryId.EMPTY_ID;
-      }
-      event = executeBeforeSend(event, hint);
+    boolean shouldSendSessionUpdate = shouldSendSessionUpdateForDroppedEvent(oldSession, session);
 
-      if (event == null) {
-        options.getLogger().log(SentryLevel.DEBUG, "Event was dropped by beforeSend");
-        options
-            .getClientReportRecorder()
-            .recordLostEvent(DiscardReason.BEFORE_SEND, DataCategory.Error);
-      }
+    if (event == null && !shouldSendSessionUpdate) {
+      return SentryId.EMPTY_ID;
     }
 
     SentryId sentryId = SentryId.EMPTY_ID;
@@ -149,8 +165,9 @@ private boolean shouldApplyScopeData(
           scope != null && scope.getTransaction() != null
               ? scope.getTransaction().traceState()
               : null;
-      final SentryEnvelope envelope =
-          buildEnvelope(event, getAttachments(scope, hint), session, traceState, null);
+      boolean shouldSendAttachments = event != null;
+      List<Attachment> attachments = shouldSendAttachments ? getAttachments(scope, hint) : null;
+      final SentryEnvelope envelope = buildEnvelope(event, attachments, session, traceState, null);
 
       if (envelope != null) {
         transport.send(envelope, hint);
@@ -165,6 +182,28 @@ private boolean shouldApplyScopeData(
     return sentryId;
   }
 
+  private boolean shouldSendSessionUpdateForDroppedEvent(
+      @Nullable Session oldSession, @Nullable Session newSession) {
+    if (newSession == null) {
+      return false;
+    }
+
+    if (oldSession == null) {
+      return true;
+    }
+
+    if (newSession.getStatus() == Session.State.Crashed
+        && oldSession.getStatus() != Session.State.Crashed) {
+      return true;
+    }
+
+    if (newSession.errorCount() > 0 && oldSession.errorCount() <= 0) {
+      return true;
+    }
+
+    return false;
+  }
+
   private @Nullable List<Attachment> getAttachments(
       final @Nullable Scope scope, final @NotNull Map<String, Object> hint) {
     List<Attachment> attachments = null;