Pre-gzip the crashlytics payloads before sending them up (#1404)

* Pre-gzip the crashlytics payloads before sending them up the firelog pipeline

Author: jakeouellette

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/BytesBackedNativeSessionFileTest.java

@@ -49,7 +49,7 @@ public void testAsFilePayload_convertsToFilePayload() {
         new BytesBackedNativeSessionFile("file_name", "file", testBytes);
     CrashlyticsReport.FilesPayload.File filesPayload = nativeSessionFile.asFilePayload();
     assertNotNull(filesPayload);
-    assertArrayEquals(testBytes, filesPayload.getContents());
+    assertArrayEquals(testBytes, TestUtils.inflateGzipToRawBytes(filesPayload.getContents()));
     assertEquals("file_name", filesPayload.getFilename());
   }
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/FileBackedNativeSessionFileTest.java

@@ -85,7 +85,7 @@ public void testAsFilePayload_convertsToFilePayload() {
         new FileBackedNativeSessionFile("file_name", "file", testFile);
     CrashlyticsReport.FilesPayload.File filesPayload = nativeSessionFile.asFilePayload();
     assertNotNull(filesPayload);
-    assertArrayEquals(testContents, filesPayload.getContents());
+    assertArrayEquals(testContents, TestUtils.inflateGzipToRawBytes(filesPayload.getContents()));
     assertEquals("file_name", filesPayload.getFilename());
   }
 
@@ -95,7 +95,7 @@ public void testAsFilePayloadWhenEmpty_returnsEmptyPayload() {
         new FileBackedNativeSessionFile("file_name", "file", emptyFile);
     CrashlyticsReport.FilesPayload.File filesPayload = nativeSessionFile.asFilePayload();
     assertNotNull(filesPayload);
-    assertArrayEquals(emptyContents, filesPayload.getContents());
+    assertArrayEquals(emptyContents, TestUtils.inflateGzipToRawBytes(filesPayload.getContents()));
     assertEquals("file_name", filesPayload.getFilename());
   }
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -339,7 +340,10 @@ public void testFinalizeSessionWithNativeEvent_createsCrashlyticsReportWithNativ
     verify(reportPersistence).finalizeSessionWithNativeEvent(eq("id"), filesPayload.capture());
     CrashlyticsReport.FilesPayload ndkPayloadFinalized = filesPayload.getValue();
     assertEquals(1, ndkPayloadFinalized.getFiles().size());
-    assertEquals(testBytes, ndkPayloadFinalized.getFiles().get(0).getContents());
+
+    assertArrayEquals(
+        testBytes,
+        TestUtils.inflateGzipToRawBytes(ndkPayloadFinalized.getFiles().get(0).getContents()));
     assertEquals(byteBackedSessionName, ndkPayloadFinalized.getFiles().get(0).getFilename());
   }
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/TestUtils.java

@@ -15,9 +15,12 @@
 package com.google.firebase.crashlytics.internal.common;
 
 import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.zip.GZIPInputStream;
 
 final class TestUtils {
   private TestUtils() {}
@@ -33,4 +36,19 @@ public static void writeStringToFile(String s, File f) throws IOException {
       }
     }
   }
+
+  public static byte[] inflateGzipToRawBytes(byte[] compressed) {
+    try (ByteArrayInputStream bis = new ByteArrayInputStream(compressed);
+        GZIPInputStream gis = new GZIPInputStream(bis);
+        ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+      int value = gis.read();
+      while (value != -1) {
+        bos.write(value);
+        value = gis.read();
+      }
+      return bos.toByteArray();
+    } catch (Exception e) {
+      return null;
+    }
+  }
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/BytesBackedNativeSessionFile.java

@@ -18,7 +18,10 @@
 import androidx.annotation.Nullable;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.util.zip.GZIPOutputStream;
 
 /** A {@link NativeSessionFile} backed by a byte array. */
 class BytesBackedNativeSessionFile implements NativeSessionFile {
@@ -50,15 +53,32 @@ public InputStream getStream() {
   @Override
   @Nullable
   public CrashlyticsReport.FilesPayload.File asFilePayload() {
-    return isEmpty()
+    byte[] gzippedBytes = asGzippedBytes();
+    return gzippedBytes == null
         ? null
         : CrashlyticsReport.FilesPayload.File.builder()
-            .setContents(bytes)
+            .setContents(gzippedBytes)
             .setFilename(dataTransportFilename)
             .build();
   }
 
   private boolean isEmpty() {
     return bytes == null || bytes.length == 0;
   }
+
+  @Nullable
+  private byte[] asGzippedBytes() {
+    if (isEmpty()) {
+      return null;
+    }
+
+    try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        GZIPOutputStream gos = new GZIPOutputStream(bos)) {
+      gos.write(bytes);
+      gos.finish();
+      return bos.toByteArray();
+    } catch (IOException e) {
+      return null;
+    }
+  }
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/FileBackedNativeSessionFile.java

@@ -23,6 +23,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.zip.GZIPOutputStream;
 
 /** A {@link NativeSessionFile} backed by a {@link File} currently on disk. */
 class FileBackedNativeSessionFile implements NativeSessionFile {
@@ -62,7 +63,7 @@ public InputStream getStream() {
   @Override
   @Nullable
   public CrashlyticsReport.FilesPayload.File asFilePayload() {
-    byte[] bytes = asBytes();
+    byte[] bytes = asGzippedBytes();
     return bytes != null
         ? CrashlyticsReport.FilesPayload.File.builder()
             .setContents(bytes)
@@ -71,17 +72,20 @@ public CrashlyticsReport.FilesPayload.File asFilePayload() {
         : null;
   }
 
-  private byte[] asBytes() {
+  @Nullable
+  private byte[] asGzippedBytes() {
     final byte[] readBuffer = new byte[8192];
-    final ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    try (InputStream stream = getStream()) {
+    try (InputStream stream = getStream();
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        GZIPOutputStream gos = new GZIPOutputStream(bos)) {
       if (stream == null) {
         return null;
       }
       int read;
       while ((read = stream.read(readBuffer)) > 0) {
-        bos.write(readBuffer, 0, read);
+        gos.write(readBuffer, 0, read);
       }
+      gos.finish();
       return bos.toByteArray();
     } catch (IOException e) {
       return null;