Merge 7bc8576 into 52c06f6

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git@github.com:bugsnag/maze-runner
-  revision: 9f5b7f220441d047888ffdd91bd6b32be6367078
+  revision: f7123450d5a75b719911c6dd3baa0507e6062c2d
   specs:
     bugsnag-maze-runner (1.0.0)
       cucumber (~> 3.1.0)
@@ -12,7 +12,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.11.2)
+    backports (3.11.3)
     builder (3.2.3)
     coderay (1.1.2)
     cucumber (3.1.0)

features/multi_client.feature

@@ -56,4 +56,4 @@ Scenario: Sessions while captured offline is detected by two clients with differ
 
     And the "Bugsnag-API-Key" header equals "a35a2a72bd230ac0aa0f52715bbdc6aa" for request 0
     And the payload field "sessions.0.user.name" equals "Bob" for request 0
-    And the payload field "sessions" is an array with 1 element for request 10
+    And the payload field "sessions" is an array with 1 element for request 0

mazerunner/src/main/java/com/bugsnag/android/mazerunner/scenarios/MultiClientSessionScenario.kt

@@ -35,7 +35,7 @@ internal class MultiClientSessionScenario(config: Configuration,
             secondClient!!.startSession()
         } else {
             flushAllSessions(firstClient!!)
-            Thread.sleep(10) // enforce request order
+            Thread.sleep(50) // enforce request order
             flushAllSessions(secondClient!!)
         }
     }

sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java

@@ -23,6 +23,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
@@ -42,8 +43,7 @@ public void setUp() throws Exception {
         Client client = new Client(InstrumentationRegistry.getContext(), "api-key");
         config = client.config;
         errorStore = client.errorStore;
-        Assert.assertNotNull(errorStore.storeDirectory);
-        errorStorageDir = new File(errorStore.storeDirectory);
+        errorStorageDir = errorStore.storageDir;
         FileUtils.clearFilesInDir(errorStorageDir);
     }
 
@@ -123,6 +123,19 @@ public void isStartupCrash() throws Exception {
         assertFalse(errorStore.isStartupCrash(10000));
     }
 
+    @Test
+    public void testFindOldFiles() throws Throwable {
+        new File(errorStore.oldDirectory, "foo.json").createNewFile();
+        File dir = errorStore.storageDir;
+        new File(dir, "foo.json").createNewFile();
+
+        List<File> files = errorStore.findStoredFiles();
+        for (File file : files) {
+            assertTrue(file.getAbsolutePath().endsWith("foo.json"));
+        }
+        assertEquals(2, files.size());
+    }
+
     /**
      * Ensures that the file can be serialised back into a JSON report, and contains the same info
      * as the original

sdk/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java

@@ -15,12 +15,14 @@
 import org.junit.runner.RunWith;
 
 import java.io.File;
+import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class SessionStoreTest {
 
     private File storageDir;
+    private SessionStore sessionStore;
 
     /**
      * Generates a session store with 0 files
@@ -30,9 +32,8 @@ public class SessionStoreTest {
     @Before
     public void setUp() throws Exception {
         Client client = new Client(InstrumentationRegistry.getContext(), "api-key");
-        SessionStore sessionStore = client.sessionStore;
-        assertNotNull(sessionStore.storeDirectory);
-        storageDir = new File(sessionStore.storeDirectory);
+        sessionStore = client.sessionStore;
+        storageDir = sessionStore.storageDir;
         FileUtils.clearFilesInDir(storageDir);
     }
 
@@ -70,4 +71,17 @@ public void testComparator() throws Exception {
         assertTrue(SESSION_COMPARATOR.compare(new File(second), new File(startup)) > 0);
     }
 
+    @Test
+    public void testFindOldFiles() throws Throwable {
+        new File(sessionStore.oldDirectory, "foo.json").createNewFile();
+        File dir = sessionStore.storageDir;
+        new File(dir, "foo.json").createNewFile();
+
+        List<File> files = sessionStore.findStoredFiles();
+        for (File file : files) {
+            assertTrue(file.getAbsolutePath().endsWith("foo.json"));
+        }
+        assertEquals(2, files.size());
+    }
+
 }

sdk/src/androidTest/java/com/bugsnag/android/SessionTrackingPayloadTest.java

@@ -38,8 +38,7 @@ public void setUp() throws Exception {
         Context context = InstrumentationRegistry.getContext();
         Client client = new Client(context, "api-key");
         sessionStore = client.sessionStore;
-        Assert.assertNotNull(sessionStore.storeDirectory);
-        storageDir = new File(sessionStore.storeDirectory);
+        storageDir = sessionStore.storageDir;
         FileUtils.clearFilesInDir(storageDir);
 
         session = generateSession();

sdk/src/main/java/com/bugsnag/android/ErrorStore.java

@@ -46,7 +46,7 @@ public int compare(File lhs, File rhs) {
 
     ErrorStore(@NonNull Configuration config, @NonNull Context appContext) {
         super(config, appContext,
-            "/bugsnag-errors/", 128, ERROR_REPORT_COMPARATOR);
+            "bugsnag-errors", 128, ERROR_REPORT_COMPARATOR);
     }
 
     void flushOnLaunch(final ErrorReportApiClient errorReportApiClient) {
@@ -88,10 +88,9 @@ public void run() {
      * Flush any on-disk errors to Bugsnag
      */
     void flushAsync(final ErrorReportApiClient errorReportApiClient) {
-        if (storeDirectory == null) {
+        if (storageDir == null) {
             return;
         }
-
         try {
             Async.run(new Runnable() {
                 @Override
@@ -162,8 +161,9 @@ private List<File> findLaunchCrashReports() {
     String getFilename(Error error) {
         boolean isStartupCrash = isStartupCrash(AppData.getDurationMs());
         String suffix = isStartupCrash ? STARTUP_CRASH : "";
-        return String.format(Locale.US, "%s%d_%s%s.json",
-            storeDirectory, System.currentTimeMillis(), UUID.randomUUID().toString(), suffix);
+        return String.format(Locale.US, "%s/%d_%s%s.json",
+            storageDir.getAbsolutePath(), System.currentTimeMillis(),
+            UUID.randomUUID().toString(), suffix);
     }
 
     boolean isStartupCrash(long durationMs) {

sdk/src/main/java/com/bugsnag/android/FileStore.java

@@ -7,6 +7,7 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.Writer;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -16,8 +17,11 @@ abstract class FileStore<T extends JsonStream.Streamable> {
 
     @NonNull
     protected final Configuration config;
+
     @Nullable
-    final String storeDirectory;
+    final String oldDirectory;
+
+    File storageDir;
     private final int maxStoreCount;
     private final Comparator<File> comparator;
 
@@ -29,31 +33,30 @@ abstract class FileStore<T extends JsonStream.Streamable> {
 
         String path;
         try {
-            path = appContext.getCacheDir().getAbsolutePath() + folder;
+            File baseDir = new File(appContext.getCacheDir().getAbsolutePath(), folder);
+            path = baseDir.getAbsolutePath();
+            storageDir = getStorageDir(path, config);
 
-            File outFile = new File(path);
-            outFile.mkdirs();
-            if (!outFile.exists()) {
+            if (!storageDir.exists()) {
                 Logger.warn("Could not prepare file storage directory");
                 path = null;
             }
         } catch (Exception exception) {
             Logger.warn("Could not prepare file storage directory", exception);
             path = null;
         }
-        this.storeDirectory = path;
+        this.oldDirectory = path;
     }
 
     @Nullable
     String write(@NonNull T streamable) {
-        if (storeDirectory == null) {
+        if (storageDir == null) {
             return null;
         }
 
         // Limit number of saved errors to prevent disk space issues
-        File exceptionDir = new File(storeDirectory);
-        if (exceptionDir.isDirectory()) {
-            File[] files = exceptionDir.listFiles();
+        if (storageDir.isDirectory()) {
+            File[] files = storageDir.listFiles();
             if (files != null && files.length >= maxStoreCount) {
                 // Sort files then delete the first one (oldest timestamp)
                 Arrays.sort(files, comparator);
@@ -86,22 +89,50 @@ String write(@NonNull T streamable) {
         return null;
     }
 
-    @NonNull abstract String getFilename(T streamable);
+    @NonNull
+    abstract String getFilename(T streamable);
 
     List<File> findStoredFiles() {
         List<File> files = new ArrayList<>();
 
-        if (storeDirectory != null) {
-            File dir = new File(storeDirectory);
+        if (oldDirectory != null) {
+            File dir = new File(oldDirectory);
+            addStoredFiles(dir, files);
+        }
+        if (storageDir != null) {
+            addStoredFiles(storageDir, files);
+        }
+        return files;
+    }
 
-            if (dir.exists() && dir.isDirectory()) {
-                File[] values = dir.listFiles();
+    void addStoredFiles(File dir, List<File> files) {
+        if (!dir.exists() || !dir.isDirectory()) {
+            return;
+        }
+        File[] values = dir.listFiles();
 
-                if (values != null) {
-                    files.addAll(Arrays.asList(values));
+        if (values != null) {
+            for (File value : values) {
+                if (value.isFile()) {
+                    files.add(value);
                 }
             }
         }
-        return files;
     }
+
+    // support multiple clients in the same app by using a unique directory path
+
+    private File getStorageDir(String path, @NonNull Configuration config) {
+        String apiKey = "" + config.getApiKey().hashCode();
+        String endpoint = "" + config.getEndpoint().hashCode();
+
+        File apiDir = new File(path, apiKey);
+        apiDir.mkdirs();
+
+        File dir = new File(apiDir, endpoint);
+        dir.mkdirs();
+
+        return dir;
+    }
+
 }

sdk/src/main/java/com/bugsnag/android/NativeInterface.java

@@ -65,7 +65,7 @@ public static String getContext() {
 
     @Nullable
     public static String getErrorStorePath() {
-        return getClient().errorStore.storeDirectory;
+        return getClient().errorStore.storageDir.getAbsolutePath();
     }
 
     public static String getUserId() {

sdk/src/main/java/com/bugsnag/android/SessionStore.java

@@ -33,15 +33,15 @@ public int compare(File lhs, File rhs) {
     };
 
     SessionStore(@NonNull Configuration config, @NonNull Context appContext) {
-        super(config, appContext, "/bugsnag-sessions/",
+        super(config, appContext, "bugsnag-sessions",
             128, SESSION_COMPARATOR);
     }
 
     @NonNull
     @Override
     String getFilename(Session session) {
-        return String.format(Locale.US, "%s%s%d.json",
-            storeDirectory, UUID.randomUUID().toString(), System.currentTimeMillis());
+        return String.format(Locale.US, "%s/%s%d.json",
+            storageDir.getAbsolutePath(), UUID.randomUUID().toString(), System.currentTimeMillis());
     }
 
 }