Skip to content

RUM-12633: Merge develop into cronet feature branch#3028

Merged
satween merged 99 commits into
feature/cronetfrom
tvaleev/feature/RUM-12633-merge-develop
Nov 26, 2025
Merged

RUM-12633: Merge develop into cronet feature branch#3028
satween merged 99 commits into
feature/cronetfrom
tvaleev/feature/RUM-12633-merge-develop

Conversation

@satween

@satween satween commented Nov 26, 2025

Copy link
Copy Markdown
Contributor

What does this PR do?

Merges develop into cronet feature branch.

Motivation

Required to fix broken detekt rules by flags feature.

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)

jonathanmos and others added 30 commits October 22, 2025 16:15
fix: Detekt violations in the flags module

Co-authored-by: typotter <[email protected]>
RUM-12720: Updating MIGRATION.MD with the default sampling rate
refs: RUM-12763

This PR adds a check to RUM feature initialization: if the new internal
option `_dd.rum.disable_jank_stats` is explicitly set to true, then we
refrain from calling `initializeFrameStatesAggregator()`. Otherwise, we
call that function as normal.

This allows the Unity SDK to configure the Android SDK in such a way
that it will never call `JankStats.createAndTrack()`, which is necessary
to avoid crashes caused by the older versions of `androidx.metrics` that
the `dd-sdk-unity` is forced to use in older versions of Unity.

(I notice that the generated `apiSurface` files are not up to date at
latest in develop, so I expect that CI will fail. When I test locally
with `./local-ci.sh --test`, everything passes. I can rebase once the
unrelated API surface issue is fixed in develop.)
…k-stats

fix: Add internal disableJankStats config option
RUM-7562: Provide SDK commit SHA1 to the Shopist App
kikoveiga and others added 22 commits November 21, 2025 14:03
…mentation-tests-behavioral

RUM-5445: Revive Session Replay instrumentation tests
…elemetry-sample-rate

RUM-5387: Override Metrics telemetry sample rate
…al-exception

RUM-10417: Handle potential StackOverflowError
@satween
satween requested review from a team as code owners November 26, 2025 16:31
@datadog-official

datadog-official Bot commented Nov 26, 2025

Copy link
Copy Markdown

🎯 Code Coverage
Patch Coverage: 94.23%
Total Coverage: 71.35% (+0.08%)

View detailed report

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: f696c88 | Docs | Datadog PR Page | Was this helpful? Give us feedback!

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 83.91960% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 71.23%. Comparing base (baeb6e7) to head (f696c88).

Files with missing lines Patch % Lines
...ionreplay/compose/internal/utils/SemanticsUtils.kt 77.78% 6 Missing and 8 partials ⚠️
...id/webview/internal/log/WebViewLogEventConsumer.kt 82.61% 2 Missing and 2 partials ⚠️
...kotlin/com/datadog/android/rum/RumConfiguration.kt 0.00% 2 Missing ⚠️
.../main/kotlin/com/datadog/android/_InternalProxy.kt 0.00% 0 Missing and 1 partial ⚠️
...n/com/datadog/android/core/internal/CoreFeature.kt 85.71% 1 Missing ⚠️
...tadog/android/core/internal/NoOpContextProvider.kt 0.00% 1 Missing ⚠️
.../android/core/internal/logger/SdkInternalLogger.kt 83.33% 0 Missing and 1 partial ⚠️
...oid/core/internal/system/NoOpAppVersionProvider.kt 0.00% 1 Missing ⚠️
...tadog/android/flags/internal/FlagValueConverter.kt 50.00% 0 Missing and 1 partial ⚠️
...otlin/com/datadog/android/rum/_RumInternalProxy.kt 0.00% 1 Missing ⚠️
... and 5 more
Additional details and impacted files
@@                Coverage Diff                 @@
##           feature/cronet    #3028      +/-   ##
==================================================
+ Coverage           71.13%   71.23%   +0.11%     
==================================================
  Files                 859      859              
  Lines               31308    31457     +149     
  Branches             5275     5306      +31     
==================================================
+ Hits                22268    22408     +140     
- Misses               7547     7550       +3     
- Partials             1493     1499       +6     
Files with missing lines Coverage Δ
.../com/datadog/android/api/context/DatadogContext.kt 100.00% <100.00%> (ø)
...og/android/core/internal/DatadogContextProvider.kt 98.15% <100.00%> (+0.03%) ⬆️
.../core/internal/system/DefaultAppVersionProvider.kt 100.00% <100.00%> (ø)
...g/android/core/internal/time/KronosTimeProvider.kt 100.00% <100.00%> (ø)
...com/datadog/android/flags/internal/FlagsFeature.kt 83.08% <ø> (ø)
...s/internal/net/PrecomputedAssignmentsDownloader.kt 100.00% <ø> (ø)
...ternal/net/PrecomputedAssignmentsRequestFactory.kt 70.91% <ø> (ø)
...lags/internal/repository/DefaultFlagsRepository.kt 65.31% <ø> (ø)
...android/log/internal/domain/DatadogLogGenerator.kt 97.99% <100.00%> (+0.07%) ⬆️
...ndroid/rum/internal/domain/scope/RumActionScope.kt 96.53% <100.00%> (+0.03%) ⬆️
... and 25 more

... and 34 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@satween
satween merged commit 0c156cc into feature/cronet Nov 26, 2025
26 checks passed
@satween
satween deleted the tvaleev/feature/RUM-12633-merge-develop branch November 26, 2025 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants