fix background span not sent because not checking visibility tracker …

…current screen
signalfx · Oct 11, 2023 · 57122a5 · 57122a5
1 parent ae948e6
commit 57122a5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/FileUtils.java b/splunk-otel-android/src/main/java/com/splunk/rum/FileUtils.java
@@ -86,6 +86,9 @@ Stream<File> listFilesRecursively(File directory) {
             return Stream.empty();
         }
         File[] files = directory.listFiles();
+        if (files == null){
+            return Stream.empty();
+        }
         Stream<File> directories = Stream.of(files).filter(File::isDirectory);
         Stream<File> plainFiles = Stream.of(files).filter(File::isFile);
         return Stream.concat(plainFiles, directories.flatMap(this::listFilesRecursively));

diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/StartTypeAwareSpanStorage.java b/splunk-otel-android/src/main/java/com/splunk/rum/StartTypeAwareSpanStorage.java
@@ -57,12 +57,16 @@ public Stream<File> getAllSpanFiles() {
 
     @Override
     public Stream<File> getPendingFiles() {
-        if (visibleScreenTracker.getPreviouslyVisibleScreen() != null) {
+        if (isAppForeground()) {
             moveBackgroundSpanToPendingSpan();
         }
         return fileUtils.listSpanFiles(spanDir);
     }
 
+    private boolean isAppForeground() {
+        return (visibleScreenTracker.getCurrentlyVisibleScreen() != null && !visibleScreenTracker.getCurrentlyVisibleScreen().equals("unknown")) || visibleScreenTracker.getPreviouslyVisibleScreen() != null;
+    }
+
     private void moveBackgroundSpanToPendingSpan() {
         fileUtils
                 .listSpanFiles(getCurrentSessionBackgroundFile())
@@ -90,9 +94,15 @@ public File provideSpanFile() {
     }
 
     private File getSpanFile() {
-        if (visibleScreenTracker.getPreviouslyVisibleScreen() == null) {
+        if (!isAppForeground()) {
+            Log.d(
+                    LOG_TAG,
+                    "Creating background span " + uniqueId);
             return getCurrentSessionBackgroundFile();
         }
+        Log.d(
+                LOG_TAG,
+                "Creating foreground span " + uniqueId);
         return spanDir;
     }
 

diff --git a/splunk-otel-android/src/test/java/com/splunk/rum/StartTypeAwareSpanStorageTest.java b/splunk-otel-android/src/test/java/com/splunk/rum/StartTypeAwareSpanStorageTest.java
@@ -51,14 +51,15 @@ void setup() {
     @Test
     void getPendingFiles_givenInBackground_shouldReturnForegoundOnlySpan() {
         when(visibleScreenTracker.getPreviouslyVisibleScreen()).thenReturn(null);
+        when(visibleScreenTracker.getCurrentlyVisibleScreen()).thenReturn("unknown");
         List<File> spans = fileProvider.getPendingFiles().collect(Collectors.toList());
         assertEquals(0, spans.size());
     }
 
     @Test
-    void
-            getPendingFiles_givenPrevouslyInBackground_shouldMoveBackgroundSpanToForegroundSpanForSending() {
+    void getPendingFiles_givenPrevouslyInBackground_shouldMoveBackgroundSpanToForegroundSpanForSending() {
         when(visibleScreenTracker.getPreviouslyVisibleScreen()).thenReturn("MainActivity");
+        when(visibleScreenTracker.getCurrentlyVisibleScreen()).thenReturn("MainActivity");
 
         List<File> backgroundFiles = new ArrayList<>();
         File fileToMove = mock();
@@ -86,6 +87,7 @@ void getPendingFiles_givenInBackground_shouldReturnForegoundOnlySpan() {
     @Test
     void getSpanPath_givenInBackground_shouldReturnBackgroundSpanPath() {
         when(visibleScreenTracker.getPreviouslyVisibleScreen()).thenReturn(null);
+        when(visibleScreenTracker.getCurrentlyVisibleScreen()).thenReturn("unknown");
 
         File path = fileProvider.provideSpanFile();
 
@@ -95,6 +97,7 @@ void getSpanPath_givenInBackground_shouldReturnBackgroundSpanPath() {
     @Test
     void getSpanPath_givenInForeground_shouldReturnForegroundSpanPath() {
         when(visibleScreenTracker.getPreviouslyVisibleScreen()).thenReturn("MainActivity");
+        when(visibleScreenTracker.getCurrentlyVisibleScreen()).thenReturn("MainActivity");
 
         File path = fileProvider.provideSpanFile();