Skip to content

Merge release 3.7.0 to master#3214

Merged
satween merged 215 commits intomasterfrom
release/3.7.0
Mar 3, 2026
Merged

Merge release 3.7.0 to master#3214
satween merged 215 commits intomasterfrom
release/3.7.0

Conversation

@satween
Copy link
Contributor

@satween satween commented Mar 3, 2026

What does this PR do?

Merge release 3.7.0 to master

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)

typotter and others added 30 commits January 19, 2026 10:31
…-build-cache-fallback

Use `develop` build cache as a fallback in Gitlab CI jobs
…e" instead of instantiating Time() directly.
…ovider instead of Thread.sleep(), making tests deterministic and ~25 seconds faster.

- Adds StubSDKCore.advanceTimeBy() method to advance simulated time, and updates all test methods to use explicit time advancement rather than actual sleeping.
- Updates StopResourceWithError in DatadogRumMonitor to use getEventTime() so it respects the controllable timeProvider.
[RUM-9129] Make ViewLoadingTimeMetrics tests deterministic and faster with controlled time
…0-into-develop

Merge `release/3.6.0` into `develop` branch
Add Profiling start reason for synthetics test
Fix `stopResourceWithError` overloads to use `getEventTime(attributes)`
0xnm and others added 24 commits February 23, 2026 18:18
refactor(flags): use time-based periodic flush instead of cancel+reschedule

Co-authored-by: typotter <tyler.potter@datadoghq.com>
…assignments-response-body

Close precomputed assignments response body
RUM-13974: [Cronet] Supporting APM on network layer for Cronet
Co-authored-by: Nikita Ogorodnikov <4046447+0xnm@users.noreply.github.com>
…ector-methods

Improve InsightsCollector.kt methods signatures
…rors

RUM-13564 Add GraphQL errors support for cross-platform SDKs

Co-authored-by: barboraplasovska <barbora.plasovska@datadoghq.com>
Lower layoutNodeUtils telemetry to warning with callsite information
@satween satween requested review from a team as code owners March 3, 2026 16:09
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review


P1 Badge Accept legacy TraceContext tags when extracting parent span

Parent-context extraction now only checks request.tag(TraceContext::class.java) for the new internal com.datadog.android.trace.internal.net.TraceContext type, while the previous public OkHttp TraceContext type was removed in this release. Existing integrations that still tag requests with the old public class will no longer propagate parent context after upgrade. The extractor should handle both legacy and new tag types during the deprecation window.

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

imports = ["com.datadog.android.trace.TraceContextInjection"]
)
)
typealias TraceContextInjection = TraceContextInjection

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve old TraceContextInjection enum for Java callers

Switching com.datadog.android.okhttp.TraceContextInjection from a concrete enum to a Kotlin typealias removes the JVM class from the published artifact. Kotlin source callers can still resolve the alias, but Java callers and already-compiled binaries that reference the old type will break on upgrade because the old class no longer exists. Keep a deprecated concrete type in the old package (delegating/mapping to the new enum) to preserve binary compatibility.

Useful? React with 👍 / 👎.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will be adressed with hofix

imports = ["com.datadog.android.trace.DeterministicTraceSampler"]
)
)
typealias DeterministicTraceSampler = DeterministicTraceSampler

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep DeterministicTraceSampler as a concrete deprecated type

Replacing the old com.datadog.android.okhttp.trace.DeterministicTraceSampler class with a typealias drops the original JVM type, which breaks Java consumers and any precompiled code linked against the previous class symbol. A deprecated compatibility class in the original package is needed so upgrades do not cause compile/runtime linkage failures.

Useful? React with 👍 / 👎.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will be adressed with hofix

Copy link
Member

@0xnm 0xnm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

release/3.7.0 branch will be deleted after this merge (probably, didn't check current branch protection rules), it needs to be restored

@satween satween merged commit 1521c6d into master Mar 3, 2026
27 checks passed
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.

10 participants