Merge 8812916 into 320aa5a

Author: markushi

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

@@ -174,7 +174,11 @@ public void store(final @NotNull SentryEnvelope envelope, final @NotNull Hint hi
     } else {
       options
           .getLogger()
-          .log(DEBUG, "Adding Envelope to offline storage: %s", envelopeFile.getAbsolutePath());
+          .log(
+              DEBUG,
+              new Exception(),
+              "Adding Envelope to offline storage: %s",
+              envelopeFile.getAbsolutePath());
     }
 
     writeEnvelopeToDisk(envelopeFile, envelope);
@@ -362,16 +366,11 @@ public void discard(final @NotNull SentryEnvelope envelope) {
    * @return the file
    */
   private synchronized @NotNull File getEnvelopeFile(final @NotNull SentryEnvelope envelope) {
-    String fileName;
+    final @NotNull String fileName;
     if (fileNameMap.containsKey(envelope)) {
       fileName = fileNameMap.get(envelope);
     } else {
-      if (envelope.getHeader().getEventId() != null) {
-        fileName = envelope.getHeader().getEventId().toString();
-      } else {
-        fileName = UUID.randomUUID().toString();
-      }
-      fileName += SUFFIX_ENVELOPE_FILE;
+      fileName = UUID.randomUUID() + SUFFIX_ENVELOPE_FILE;
       fileNameMap.put(envelope, fileName);
     }
 

sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt

@@ -1,6 +1,7 @@
 package io.sentry.cache
 
 import io.sentry.DateUtils
+import io.sentry.Hint
 import io.sentry.ILogger
 import io.sentry.NoOpLogger
 import io.sentry.SentryCrashLastRunState
@@ -16,6 +17,7 @@ import io.sentry.cache.EnvelopeCache.SUFFIX_SESSION_FILE
 import io.sentry.hints.AbnormalExit
 import io.sentry.hints.SessionEndHint
 import io.sentry.hints.SessionStartHint
+import io.sentry.protocol.SentryId
 import io.sentry.util.HintUtils
 import org.mockito.kotlin.mock
 import java.io.File
@@ -317,4 +319,32 @@ class EnvelopeCacheTest {
             null
         )
     }
+
+    @Test
+    fun `two items with the same event id can be stored side-by-side`() {
+        val cache = fixture.getSUT()
+
+        val eventId = SentryId()
+
+        val envelopeA = SentryEnvelope.from(
+            fixture.options.serializer,
+            SentryEvent().apply {
+                setEventId(eventId)
+            },
+            null
+        )
+
+        val envelopeB = SentryEnvelope.from(
+            fixture.options.serializer,
+            SentryEvent().apply {
+                setEventId(eventId)
+            },
+            null
+        )
+
+        cache.store(envelopeA, Hint())
+        cache.store(envelopeB, Hint())
+
+        assertEquals(2, cache.directory.list()?.size)
+    }
 }