RUM-13568: [Cronet]: Supporting RUM <> APM integration for Cronet by satween · Pull Request #3136 · DataDog/dd-sdk-android

satween · 2026-01-20T16:21:35Z

What does this PR do?

In this PR we are copying the main logic from TracingInterceptor / DatadogInterceptor into the NetworkTracingInstrumentation in order to:

Support RUM <> APM integration for Cronet
Create a foundation for single network instrumentation logic that should be shared across several networking libraries in the future.

Motivation

Continuing to add an integration for Cronet library meanwhile preparing infrastructure to migrate OkHttp onto the same logic.

Additional Notes

Note that in this PR we are not supporting deep network instrumentation that is being done by TracingInterceptor in OkHttp. This logic will be supported in a further PR as this one is already pretty big.

NOTE: In this PR as an experiment an AI agent helped to write tests and some docs. I've made few iterations of a fixes for that but if you spot any issues - let me know. AI wasn't involved into production code development.

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)

satween · 2026-01-20T16:54:48Z

@codex

chatgpt-codex-connector · 2026-01-20T16:54:53Z

To use Codex here, create a Codex account and connect to github.

kikoveiga · 2026-01-20T20:54:06Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5ee7daf6e5

ℹ️ 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".

...droid-cronet/src/main/kotlin/com/datadog/android/cronet/internal/DatadogUrlRequestBuilder.kt

codecov-commenter · 2026-01-22T14:22:11Z

Codecov Report

❌ Patch coverage is 74.66863% with 172 lines in your changes missing coverage. Please review.
✅ Project coverage is 71.24%. Comparing base (1d9888c) to head (b715ecb).

Files with missing lines	Patch %	Lines
...android/trace/internal/DatadogPropagationHelper.kt	62.94%	43 Missing and 10 partials ⚠️
...ndroid/trace/internal/ApmNetworkInstrumentation.kt	58.41%	31 Missing and 16 partials ⚠️
...oid/cronet/internal/DatadogCronetRequestContext.kt	87.62%	12 Missing and 1 partial ⚠️
.../com/datadog/android/cronet/DatadogCronetEngine.kt	63.64%	7 Missing and 5 partials ⚠️
...net/internal/DatadogRequestFinishedInfoListener.kt	47.37%	9 Missing and 1 partial ⚠️
...trace/internal/net/ApmNetworkInstrumentationExt.kt	73.08%	4 Missing and 3 partials ⚠️
...tadog/android/cronet/internal/DatadogUrlRequest.kt	61.11%	1 Missing and 6 partials ⚠️
.../android/cronet/internal/DatadogRequestCallback.kt	76.00%	6 Missing ⚠️
...id/trace/ApmNetworkInstrumentationConfiguration.kt	93.55%	4 Missing ⚠️
.../instrumentation/network/HttpRequestInfoBuilder.kt	0.00%	3 Missing ⚠️
... and 7 more

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #3136      +/-   ##
===========================================
+ Coverage    70.96%   71.24%   +0.27%     
===========================================
  Files          912      922      +10     
  Lines        33557    34111     +554     
  Branches      5642     5775     +133     
===========================================
+ Hits         23813    24299     +486     
- Misses        8171     8177       +6     
- Partials      1573     1635      +62

Files with missing lines	Coverage Δ
...droid/flags/openfeature/internal/FlagsClientExt.kt	`85.71% <ø> (ø)`
...otlin/com/datadog/android/rum/_RumInternalProxy.kt	`68.18% <100.00%> (+1.52%)`	⬆️
...guration/RumNetworkInstrumentationConfiguration.kt	`100.00% <100.00%> (ø)`
.../android/rum/internal/monitor/DatadogRumMonitor.kt	`88.40% <ø> (-0.11%)`	⬇️
...roid/rum/internal/net/RumNetworkInstrumentation.kt	`81.48% <100.00%> (ø)`
...om/datadog/trace/core/propagation/B3HttpCodec.java	`6.38% <ø> (ø)`
...tadog/trace/core/propagation/DatadogHttpCodec.java	`13.68% <ø> (ø)`
...m/datadog/trace/core/propagation/W3CHttpCodec.java	`12.99% <ø> (ø)`
...om/datadog/android/trace/ApmNetworkTracingScope.kt	`100.00% <100.00%> (ø)`
...datadog/android/trace/DeterministicTraceSampler.kt	`100.00% <100.00%> (ø)`
... and 26 more

... and 35 files with indirect coverage changes

🚀 New features to boost your workflow:

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

dd-sdk-android-internal/src/main/java/com/datadog/android/internal/utils/LangExt.kt

...droid-rum/src/main/kotlin/com/datadog/android/rum/internal/net/RumResourceInstrumentation.kt

...ndroid-trace/src/main/kotlin/com/datadog/android/trace/internal/ApmNetworkInstrumentation.kt

sample/kotlin/src/main/kotlin/com/datadog/android/sample/cronet/CronetImageFragment.kt

dd-sdk-android-core/api/apiSurface

...e/src/main/kotlin/com/datadog/android/api/instrumentation/network/HttpRequestInfoModifier.kt

dd-sdk-android-internal/src/main/java/com/datadog/android/internal/utils/LangExt.kt

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/_RumInternalProxy.kt

features/dd-sdk-android-trace/api/apiSurface

...-android-okhttp/src/main/kotlin/com/datadog/android/okhttp/internal/OkHttpHttpRequestInfo.kt

integrations/dd-sdk-android-cronet/api/apiSurface

...id-cronet/src/main/kotlin/com/datadog/android/cronet/internal/DatadogCronetRequestContext.kt

0xnm

I partially covered this PR, but will continue review later.

...re/src/main/kotlin/com/datadog/android/api/instrumentation/network/HttpRequestInfoBuilder.kt

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/_RumInternalProxy.kt

features/dd-sdk-android-trace/api/apiSurface

...id-trace/src/main/kotlin/com/datadog/android/trace/ApmNetworkInstrumentationConfiguration.kt

...ndroid-trace/src/main/kotlin/com/datadog/android/trace/internal/ApmNetworkInstrumentation.kt

integrations/dd-sdk-android-cronet/api/apiSurface

...id-cronet/src/main/kotlin/com/datadog/android/cronet/internal/DatadogCronetRequestContext.kt

...ndroid-trace/src/main/kotlin/com/datadog/android/trace/internal/ApmNetworkInstrumentation.kt

...d-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/internal/net/TracerProvider.kt

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/RumInternalProxyTest.kt

features/dd-sdk-android-trace/api/apiSurface

...id-trace/src/main/kotlin/com/datadog/android/trace/ApmNetworkInstrumentationConfiguration.kt

...res/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/ApmNetworkTracingScope.kt

...ndroid-trace/src/main/kotlin/com/datadog/android/trace/internal/ApmNetworkInstrumentation.kt

...ndroid-trace/src/test/kotlin/com/datadog/android/trace/internal/DatadogTracingToolkitTest.kt

...oid-trace/src/test/kotlin/com/datadog/android/trace/internal/DatadogPropagationHelperTest.kt

...-android-cronet/src/test/kotlin/com/datadog/android/cronet/DatadogCronetEngineBuilderTest.kt

...d-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/internal/net/TracerProvider.kt

...ndroid-trace/src/main/kotlin/com/datadog/android/trace/internal/ApmNetworkInstrumentation.kt

...trace/src/main/kotlin/com/datadog/android/trace/internal/net/ApmNetworkInstrumentationExt.kt

0xnm · 2026-02-10T08:35:14Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5086f65e99

ℹ️ 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".

...ions/dd-sdk-android-cronet/src/main/kotlin/com/datadog/android/cronet/DatadogCronetEngine.kt

...id-cronet/src/main/kotlin/com/datadog/android/cronet/internal/DatadogCronetRequestContext.kt

0xnm

Some final suggestions, otherwise lgtm.

Codex suggested something as well.

features/dd-sdk-android-rum/api/apiSurface

...ndroid-rum/src/main/kotlin/com/datadog/android/rum/internal/net/RumNetworkInstrumentation.kt

...oid-trace/src/test/kotlin/com/datadog/android/trace/internal/DatadogPropagationHelperTest.kt

...rc/test/kotlin/com/datadog/android/trace/internal/net/ApmInstrumentationConfigurationTest.kt

0xnm · 2026-02-10T08:50:00Z

integrations/dd-sdk-android-okhttp/api/apiSurface

-  constructor(Float)
-  constructor(Double)
+typealias TraceContextInjection = com.datadog.android.trace.TraceContextInjection
+class com.datadog.android.okhttp.internal.OkHttpRequestInfoBuilder : com.datadog.android.api.instrumentation.network.HttpRequestInfoBuilder


should this class be public?

yes, for -otel module, it's marked with @InternalApi

satween requested a review from a team as a code owner January 20, 2026 16:21

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

...droid-cronet/src/main/kotlin/com/datadog/android/cronet/internal/DatadogUrlRequestBuilder.kt Outdated Show resolved Hide resolved

satween force-pushed the tvaleev/feature/RUM-13568-apm-dependencies branch 5 times, most recently from 21d8777 to 3db3a62 Compare January 22, 2026 13:41

This comment has been minimized.

Sign in to view

ambushwork reviewed Jan 23, 2026

View reviewed changes

0xnm reviewed Jan 25, 2026

View reviewed changes

satween force-pushed the tvaleev/feature/RUM-13568-apm-dependencies branch 2 times, most recently from 4ef7d94 to 6c726f5 Compare February 2, 2026 16:25

satween requested review from 0xnm and ambushwork February 2, 2026 16:26

satween force-pushed the tvaleev/feature/RUM-13568-apm-dependencies branch from 6c726f5 to 0e81151 Compare February 2, 2026 18:36

0xnm reviewed Feb 4, 2026

View reviewed changes

0xnm reviewed Feb 5, 2026

View reviewed changes

satween force-pushed the tvaleev/feature/RUM-13568-apm-dependencies branch from 0e81151 to f636bd2 Compare February 5, 2026 16:09

satween requested a review from 0xnm February 5, 2026 16:09

0xnm reviewed Feb 5, 2026

View reviewed changes

kikoveiga reviewed Feb 5, 2026

View reviewed changes

satween force-pushed the tvaleev/feature/RUM-13568-apm-dependencies branch from f636bd2 to eb2e15e Compare February 10, 2026 00:00

satween requested a review from 0xnm February 10, 2026 00:00

satween force-pushed the tvaleev/feature/RUM-13568-apm-dependencies branch from eb2e15e to 5086f65 Compare February 10, 2026 00:44

chatgpt-codex-connector bot reviewed Feb 10, 2026

View reviewed changes

...ions/dd-sdk-android-cronet/src/main/kotlin/com/datadog/android/cronet/DatadogCronetEngine.kt Show resolved Hide resolved

...id-cronet/src/main/kotlin/com/datadog/android/cronet/internal/DatadogCronetRequestContext.kt Outdated Show resolved Hide resolved

0xnm reviewed Feb 10, 2026

View reviewed changes

RUM-13568: Supporting RUM <> APM integration for Cronet

b715ecb

satween force-pushed the tvaleev/feature/RUM-13568-apm-dependencies branch from 5086f65 to b715ecb Compare February 10, 2026 12:58

satween requested a review from 0xnm February 10, 2026 12:58

0xnm approved these changes Feb 10, 2026

View reviewed changes

satween merged commit e2d7d5b into develop Feb 10, 2026
26 checks passed

satween deleted the tvaleev/feature/RUM-13568-apm-dependencies branch February 10, 2026 15:06

Conversation

satween commented Jan 20, 2026

What does this PR do?

Motivation

Additional Notes

Review checklist (to be filled by reviewers)

Uh oh!

satween commented Jan 20, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 20, 2026

Uh oh!

kikoveiga commented Jan 20, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

This comment has been minimized.

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

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

0xnm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

0xnm commented Feb 10, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

0xnm left a comment

codecov-commenter commented Jan 22, 2026 •

edited

Loading