Do not report cached events as lost

Author: adinauer

sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java

@@ -47,6 +47,7 @@ public AndroidEnvelopeCache(final @NotNull SentryAndroidOptions options) {
     this.currentDateProvider = currentDateProvider;
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public void store(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {
     super.store(envelope, hint);

sentry/api/sentry.api

@@ -4357,6 +4357,7 @@ public abstract interface class io/sentry/cache/IEnvelopeCache : java/lang/Itera
 	public abstract fun discard (Lio/sentry/SentryEnvelope;)V
 	public fun store (Lio/sentry/SentryEnvelope;)V
 	public abstract fun store (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V
+	public fun storeEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Z
 }
 
 public final class io/sentry/cache/PersistingOptionsObserver : io/sentry/IOptionsObserver {
@@ -6659,6 +6660,7 @@ public final class io/sentry/transport/NoOpEnvelopeCache : io/sentry/cache/IEnve
 	public static fun getInstance ()Lio/sentry/transport/NoOpEnvelopeCache;
 	public fun iterator ()Ljava/util/Iterator;
 	public fun store (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V
+	public fun storeEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Z
 }
 
 public final class io/sentry/transport/NoOpTransport : io/sentry/transport/ITransport {

sentry/src/main/java/io/sentry/cache/EnvelopeCache.java

@@ -93,6 +93,7 @@ public EnvelopeCache(
     previousSessionLatch = new CountDownLatch(1);
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public void store(final @NotNull SentryEnvelope envelope, final @NotNull Hint hint) {
     Objects.requireNonNull(envelope, "Envelope is required.");

sentry/src/main/java/io/sentry/cache/IEnvelopeCache.java

@@ -6,10 +6,17 @@
 
 public interface IEnvelopeCache extends Iterable<SentryEnvelope> {
 
+  @Deprecated
   void store(@NotNull SentryEnvelope envelope, @NotNull Hint hint);
 
+  default boolean storeEnvelope(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {
+    store(envelope, hint);
+    return true;
+  }
+
+  @Deprecated
   default void store(@NotNull SentryEnvelope envelope) {
-    store(envelope, new Hint());
+    storeEnvelope(envelope, new Hint());
   }
 
   void discard(@NotNull SentryEnvelope envelope);

sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java

@@ -139,7 +139,7 @@ private static QueuedThreadPoolExecutor initExecutor(
             final EnvelopeSender envelopeSender = (EnvelopeSender) r;
 
             if (!HintUtils.hasType(envelopeSender.hint, Cached.class)) {
-              envelopeCache.store(envelopeSender.envelope, envelopeSender.hint);
+              envelopeCache.storeEnvelope(envelopeSender.envelope, envelopeSender.hint);
             }
 
             markHintWhenSendingFailed(envelopeSender.hint, true);
@@ -268,7 +268,7 @@ public void run() {
       TransportResult result = this.failedResult;
 
       envelope.getHeader().setSentAt(null);
-      envelopeCache.store(envelope, hint);
+      boolean cached = envelopeCache.storeEnvelope(envelope, hint);
 
       HintUtils.runIfHasType(
           hint,
@@ -308,14 +308,17 @@ public void run() {
 
             // ignore e.g. 429 as we're not the ones actively dropping
             if (result.getResponseCode() >= 400 && result.getResponseCode() != 429) {
-              HintUtils.runIfDoesNotHaveType(
-                  hint,
-                  Retryable.class,
-                  (hint) -> {
-                    options
-                        .getClientReportRecorder()
-                        .recordLostEnvelope(DiscardReason.NETWORK_ERROR, envelopeWithClientReport);
-                  });
+              if (!cached) {
+                HintUtils.runIfDoesNotHaveType(
+                    hint,
+                    Retryable.class,
+                    (hint) -> {
+                      options
+                          .getClientReportRecorder()
+                          .recordLostEnvelope(
+                              DiscardReason.NETWORK_ERROR, envelopeWithClientReport);
+                    });
+              }
             }
 
             throw new IllegalStateException(message);
@@ -329,10 +332,12 @@ public void run() {
                 retryable.setRetry(true);
               },
               (hint, clazz) -> {
-                LogUtils.logNotInstanceOf(clazz, hint, options.getLogger());
-                options
-                    .getClientReportRecorder()
-                    .recordLostEnvelope(DiscardReason.NETWORK_ERROR, envelopeWithClientReport);
+                if (!cached) {
+                  LogUtils.logNotInstanceOf(clazz, hint, options.getLogger());
+                  options
+                      .getClientReportRecorder()
+                      .recordLostEnvelope(DiscardReason.NETWORK_ERROR, envelopeWithClientReport);
+                }
               });
           throw new IllegalStateException("Sending the event failed.", e);
         }
@@ -345,10 +350,12 @@ public void run() {
               retryable.setRetry(true);
             },
             (hint, clazz) -> {
-              LogUtils.logNotInstanceOf(clazz, hint, options.getLogger());
-              options
-                  .getClientReportRecorder()
-                  .recordLostEnvelope(DiscardReason.NETWORK_ERROR, envelope);
+              if (!cached) {
+                LogUtils.logNotInstanceOf(clazz, hint, options.getLogger());
+                options
+                    .getClientReportRecorder()
+                    .recordLostEnvelope(DiscardReason.NETWORK_ERROR, envelope);
+              }
             });
       }
       return result;

sentry/src/main/java/io/sentry/transport/NoOpEnvelopeCache.java

@@ -14,9 +14,15 @@ public static NoOpEnvelopeCache getInstance() {
     return instance;
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public void store(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {}
 
+  @Override
+  public boolean storeEnvelope(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {
+    return false;
+  }
+
   @Override
   public void discard(@NotNull SentryEnvelope envelope) {}