Add logging to catch test failure

Author: daymxn

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStore.java

@@ -73,7 +73,7 @@ public String readUserId(String sessionId) {
     final File f = getUserDataFileForSession(sessionId);
     if (!f.exists() || f.length() == 0) {
       Logger.getLogger().d("No userId set for session " + sessionId);
-      safeDeleteCorruptFile(f);
+      safeDeleteCorruptFile(f, "No userId set for session " + sessionId);
       return null;
     }
 
@@ -85,7 +85,7 @@ public String readUserId(String sessionId) {
       return userId;
     } catch (Exception e) {
       Logger.getLogger().w("Error deserializing user metadata.", e);
-      safeDeleteCorruptFile(f);
+      safeDeleteCorruptFile(f, "Error deserializing user metadata: " + e);
     } finally {
       CommonUtils.closeOrLog(is, "Failed to close user metadata file.");
     }
@@ -107,7 +107,7 @@ public void writeKeyData(String sessionId, Map<String, String> keyData, boolean
       writer.flush();
     } catch (Exception e) {
       Logger.getLogger().w("Error serializing key/value metadata.", e);
-      safeDeleteCorruptFile(f);
+      safeDeleteCorruptFile(f, "Error serializing key/value metadata." + e);
     } finally {
       CommonUtils.closeOrLog(writer, "Failed to close key/value metadata file.");
     }
@@ -121,7 +121,19 @@ Map<String, String> readKeyData(String sessionId, boolean isInternal) {
     final File f =
         isInternal ? getInternalKeysFileForSession(sessionId) : getKeysFileForSession(sessionId);
     if (!f.exists() || f.length() == 0) {
-      safeDeleteCorruptFile(f);
+      if (!f.exists()) {
+        safeDeleteCorruptFile(
+            f,
+            String.format(
+                "The file at path \"%s\" doesn't exists for session \"%s\"",
+                f.getAbsolutePath(), sessionId));
+      } else {
+        safeDeleteCorruptFile(
+            f,
+            String.format(
+                "The file at path \"%s\" has a length of zero for session \"%s\"",
+                f.getAbsolutePath(), sessionId));
+      }
       return Collections.emptyMap();
     }
 
@@ -131,7 +143,7 @@ Map<String, String> readKeyData(String sessionId, boolean isInternal) {
       return jsonToKeysData(CommonUtils.streamToString(is));
     } catch (Exception e) {
       Logger.getLogger().w("Error deserializing user metadata.", e);
-      safeDeleteCorruptFile(f);
+      safeDeleteCorruptFile(f, "Error deserializing user metadata." + e);
     } finally {
       CommonUtils.closeOrLog(is, "Failed to close user metadata file.");
     }
@@ -141,7 +153,20 @@ Map<String, String> readKeyData(String sessionId, boolean isInternal) {
   public List<RolloutAssignment> readRolloutsState(String sessionId) {
     final File f = getRolloutsStateForSession(sessionId);
     if (!f.exists() || f.length() == 0) {
-      safeDeleteCorruptFile(f);
+      if (!f.exists()) {
+        safeDeleteCorruptFile(
+            f,
+            String.format(
+                "The file at path \"%s\" doesn't exists for session \"%s\"",
+                f.getAbsolutePath(), sessionId));
+      } else {
+        safeDeleteCorruptFile(
+            f,
+            String.format(
+                "The file at path \"%s\" has a length of zero for session \"%s\"",
+                f.getAbsolutePath(), sessionId));
+      }
+
       return Collections.emptyList();
     }
 
@@ -154,7 +179,7 @@ public List<RolloutAssignment> readRolloutsState(String sessionId) {
       return rolloutsState;
     } catch (Exception e) {
       Logger.getLogger().w("Error deserializing rollouts state.", e);
-      safeDeleteCorruptFile(f);
+      safeDeleteCorruptFile(f, "Error deserializing rollouts state." + e);
     } finally {
       CommonUtils.closeOrLog(is, "Failed to close rollouts state file.");
     }
@@ -164,7 +189,7 @@ public List<RolloutAssignment> readRolloutsState(String sessionId) {
   public void writeRolloutState(String sessionId, List<RolloutAssignment> rolloutsState) {
     final File f = getRolloutsStateForSession(sessionId);
     if (rolloutsState.isEmpty()) {
-      safeDeleteCorruptFile(f);
+      safeDeleteCorruptFile(f, "Rollout state is empty for session: " + sessionId);
       return;
     }
 
@@ -176,7 +201,7 @@ public void writeRolloutState(String sessionId, List<RolloutAssignment> rollouts
       writer.flush();
     } catch (Exception e) {
       Logger.getLogger().w("Error serializing rollouts state.", e);
-      safeDeleteCorruptFile(f);
+      safeDeleteCorruptFile(f, "Error serializing rollouts state." + e);
     } finally {
       CommonUtils.closeOrLog(writer, "Failed to close rollouts state file.");
     }
@@ -270,9 +295,13 @@ private static String valueOrNull(JSONObject json, String key) {
     return !json.isNull(key) ? json.optString(key, null) : null;
   }
 
-  private static void safeDeleteCorruptFile(File file) {
+  private static void safeDeleteCorruptFile(File file, String reason) {
     if (file.exists() && file.delete()) {
-      Logger.getLogger().i("Deleted corrupt file: " + file.getAbsolutePath());
+
+      Logger.getLogger()
+          .i(
+              String.format(
+                  "Deleted corrupt file due to \"%s\": %s", reason, file.getAbsolutePath()));
     }
   }
 }