also discard cached envelope on 429

Author: adinauer

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

@@ -309,12 +309,14 @@ public void run() {
 
             options.getLogger().log(SentryLevel.ERROR, message);
 
-            // ignore e.g. 429 as we're not the ones actively dropping
-            if (result.getResponseCode() >= 400 && result.getResponseCode() != 429) {
+            if (result.getResponseCode() >= 400) {
               envelopeCache.discard(envelope);
-              options
-                  .getClientReportRecorder()
-                  .recordLostEnvelope(DiscardReason.NETWORK_ERROR, envelopeWithClientReport);
+              // ignore e.g. 429 as we're not the ones actively dropping
+              if (result.getResponseCode() != 429) {
+                options
+                    .getClientReportRecorder()
+                    .recordLostEnvelope(DiscardReason.NETWORK_ERROR, envelopeWithClientReport);
+              }
             }
 
             throw new IllegalStateException(message);

sentry/src/test/java/io/sentry/transport/AsyncHttpTransportTest.kt

@@ -157,7 +157,7 @@ class AsyncHttpTransportTest {
   }
 
   @Test
-  fun `stores envelope after unsuccessful send 429`() {
+  fun `discards envelope after unsuccessful send 429`() {
     // given
     val envelope = SentryEnvelope.from(fixture.sentryOptions.serializer, createSession(), null)
     whenever(fixture.transportGate.isConnected).thenReturn(true)
@@ -180,7 +180,7 @@ class AsyncHttpTransportTest {
     order.verify(fixture.sentryOptions.envelopeDiskCache).storeEnvelope(eq(envelope), anyOrNull())
 
     order.verify(fixture.connection).send(eq(envelope))
-    verify(fixture.sentryOptions.envelopeDiskCache, never()).discard(any())
+    order.verify(fixture.sentryOptions.envelopeDiskCache).discard(eq(envelope))
   }
 
   @Test