RUM-6171: FileOrchestrator improvements by kikoveiga · Pull Request #3151 · DataDog/dd-sdk-android

kikoveiga · 2026-01-23T17:22:34Z

What does this PR do?

This is the follow-up on #2720, which was rolled back in #3124.

The original approach relied on FileObserver to detect file deletions asynchronously. Now, instead of relying on async file system notifications, we use synchronousonFileDeleted callbacks, and validate file existence in disk as a safeguard before returning files.

This is much better than running rootDir.listFilesSafe() everytime.

Review checklist (to be filled by reviewers)

Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
Make sure you discussed the feature or bugfix with the maintaining team in an Issue
Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

datadog-official · 2026-01-23T17:44:29Z

🎯 Code Coverage
• Patch Coverage: 86.67%
• Overall Coverage: 82.29%

View detailed report

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: 52ea5c3 | Docs | Datadog PR Page | Was this helpful? Give us feedback!}

codecov-commenter · 2026-01-23T17:59:45Z

Codecov Report

❌ Patch coverage is 90.00000% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 70.97%. Comparing base (39d8b4a) to head (e34c0d7).
⚠️ Report is 4 commits behind head on develop.

Files with missing lines	Patch %	Lines
...al/persistence/file/batch/BatchFileOrchestrator.kt	93.24%	1 Missing and 4 partials ⚠️
...ence/file/advanced/ConsentAwareFileOrchestrator.kt	0.00%	3 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #3151      +/-   ##
===========================================
+ Coverage    70.96%   70.97%   +0.02%     
===========================================
  Files          912      912              
  Lines        33548    33576      +28     
  Branches      5640     5645       +5     
===========================================
+ Hits         23804    23830      +26     
+ Misses        8173     8167       -6     
- Partials      1571     1579       +8

Files with missing lines	Coverage Δ
...d/core/internal/persistence/ConsentAwareStorage.kt	`94.12% <100.00%> (+0.14%)`	⬆️
...sistence/file/advanced/ConsentAwareFileMigrator.kt	`83.33% <100.00%> (+0.35%)`	⬆️
.../persistence/file/single/SingleFileOrchestrator.kt	`73.33% <ø> (ø)`
...ence/file/advanced/ConsentAwareFileOrchestrator.kt	`79.41% <0.00%> (-7.69%)`	⬇️
...al/persistence/file/batch/BatchFileOrchestrator.kt	`92.35% <93.24%> (-0.55%)`	⬇️

... and 40 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

kikoveiga · 2026-01-30T15:14:21Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3bcf9e9328

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

...ain/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestrator.kt

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4adc9f267e

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

...id-core/src/main/kotlin/com/datadog/android/core/internal/persistence/ConsentAwareStorage.kt

...ain/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestrator.kt

aleksandr-gringauz · 2026-02-03T13:01:28Z

...ain/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestrator.kt

                val isOldFile = (it.name.toLongOrNull() ?: 0) < threshold
                if (isOldFile) {
                    if (it.deleteSafe(internalLogger)) {
+                        onFileDeleted(it)


It seems we need some sort of private method that calls onFileDeleted after deleteSafe(internalLogger). This pattern is present in the code in multiple places.

aleksandr-gringauz · 2026-02-03T13:02:38Z

...ain/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestrator.kt

-    private var previousFileItemCount: Long = 0
-    private var lastFileAccessTimestamp: Long = 0L
-    private var lastCleanupTimestamp: Long = 0L
+    private var currentBatchState = CurrentBatchState(null, 0L, 0L)


Could you please double-check access to this currentBatchState doesn't need to be done in synchronized block?

I confirm this class runs on a persistenceExecutorService with pool size 1.

I confirm this class runs on a persistenceExecutorService with pool size 1.

This may change at some point though.

.../com/datadog/android/core/internal/persistence/file/advanced/ConsentAwareFileOrchestrator.kt

kikoveiga changed the title ~~RUM-6171: FileObserver improvements~~ RUM-6171: FileOrchestrator improvements Jan 28, 2026

kikoveiga force-pushed the kikoveiga/RUM-6171/file-observer branch 16 times, most recently from 9296fe8 to 3bcf9e9 Compare January 30, 2026 15:02

chatgpt-codex-connector bot reviewed Jan 30, 2026

View reviewed changes

...ain/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestrator.kt Outdated Show resolved Hide resolved

kikoveiga force-pushed the kikoveiga/RUM-6171/file-observer branch 3 times, most recently from 0acf4c7 to 4adc9f2 Compare January 30, 2026 15:53

kikoveiga self-assigned this Jan 30, 2026

kikoveiga marked this pull request as ready for review February 2, 2026 10:00

kikoveiga requested a review from a team as a code owner February 2, 2026 10:00

chatgpt-codex-connector bot reviewed Feb 2, 2026

View reviewed changes

...id-core/src/main/kotlin/com/datadog/android/core/internal/persistence/ConsentAwareStorage.kt Show resolved Hide resolved

kikoveiga force-pushed the kikoveiga/RUM-6171/file-observer branch from 4adc9f2 to e34c0d7 Compare February 2, 2026 10:48

aleksandr-gringauz reviewed Feb 3, 2026

View reviewed changes

...ain/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestrator.kt Show resolved Hide resolved

aleksandr-gringauz reviewed Feb 3, 2026

View reviewed changes

.../com/datadog/android/core/internal/persistence/file/advanced/ConsentAwareFileOrchestrator.kt Show resolved Hide resolved

RUM-6171: FileOrchestrator improvements

52ea5c3

kikoveiga force-pushed the kikoveiga/RUM-6171/file-observer branch from e34c0d7 to 52ea5c3 Compare February 3, 2026 16:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RUM-6171: FileOrchestrator improvements#3151

RUM-6171: FileOrchestrator improvements#3151
kikoveiga wants to merge 1 commit intodevelopfrom
kikoveiga/RUM-6171/file-observer

kikoveiga commented Jan 23, 2026 •

edited

Loading

Uh oh!

datadog-official bot commented Jan 23, 2026 •

edited

Loading

Uh oh!

codecov-commenter commented Jan 23, 2026 •

edited

Loading

Uh oh!

kikoveiga commented Jan 30, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

Uh oh!

aleksandr-gringauz Feb 3, 2026

Uh oh!

aleksandr-gringauz Feb 3, 2026

Uh oh!

kikoveiga Feb 3, 2026

Uh oh!

0xnm Feb 4, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

kikoveiga commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Review checklist (to be filled by reviewers)

Uh oh!

datadog-official bot commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

kikoveiga commented Jan 30, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

aleksandr-gringauz Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

aleksandr-gringauz Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

kikoveiga Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

0xnm Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kikoveiga commented Jan 23, 2026 •

edited

Loading

datadog-official bot commented Jan 23, 2026 •

edited

Loading

codecov-commenter commented Jan 23, 2026 •

edited

Loading