Skip to content

👌 fix merge conflict in configuration spec#4420

Merged
thomas-lebeau merged 1 commit intov7from
thomas.lebeau/fix-merge-conflict-config-spec
Mar 30, 2026
Merged

👌 fix merge conflict in configuration spec#4420
thomas-lebeau merged 1 commit intov7from
thomas.lebeau/fix-merge-conflict-config-spec

Conversation

@thomas-lebeau
Copy link
Copy Markdown
Collaborator

Motivation

Fix merge conflict in configuration.spec.ts after merging main into v7.

Changes

Removed betaTrackActionsInShadowDom from the test config and the type exclusion list, resolving the conflict.

Test instructions

CI should pass.

Checklist

  • Tested locally

@thomas-lebeau thomas-lebeau requested a review from a team as a code owner March 30, 2026 15:28
@cit-pr-commenter-54b7da
Copy link
Copy Markdown

cit-pr-commenter-54b7da bot commented Mar 30, 2026

Bundles Sizes Evolution

📦 Bundle Name Base Size Local Size 𝚫 𝚫% Status
Rum 174.17 KiB 174.17 KiB 0 B 0.00%
Rum Profiler 6.19 KiB 6.19 KiB 0 B 0.00%
Rum Recorder 27.01 KiB 27.01 KiB 0 B 0.00%
Logs 56.49 KiB 56.49 KiB 0 B 0.00%
Rum Slim 131.53 KiB 131.53 KiB 0 B 0.00%
Worker 23.63 KiB 23.63 KiB 0 B 0.00%
🚀 CPU Performance
Action Name Base CPU Time (ms) Local CPU Time (ms) 𝚫%
addglobalcontext N/A 0.0042 N/A
addaction N/A 0.0175 N/A
addtiming N/A 0.0045 N/A
startview N/A 0.019 N/A
startstopsessionreplayrecording N/A 0.001 N/A
logmessage N/A 0.0255 N/A
🧠 Memory Performance
Action Name Base Memory Consumption Local Memory Consumption 𝚫
addglobalcontext N/A 33.77 KiB N/A
addaction N/A 111.86 KiB N/A
adderror N/A 104.47 KiB N/A
addtiming N/A 34.50 KiB N/A
startstopsessionreplayrecording N/A 34.31 KiB N/A
startview N/A 479.66 KiB N/A
logmessage N/A 94.78 KiB N/A

🔗 RealWorld

@thomas-lebeau thomas-lebeau changed the title 🔀 fix merge conflict in configuration spec 👌 fix merge conflict in configuration spec Mar 30, 2026
@datadog-datadog-prod-us1-2
Copy link
Copy Markdown

✅ Tests

🎉 All green!

❄️ No new flaky tests detected
🧪 All tests passed

🎯 Code Coverage (details)
Patch Coverage: 100.00%
Overall Coverage: 77.29% (+0.00%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: ac3c4f6 | Docs | Datadog PR Page | Was this helpful? React with 👍/👎 or give us feedback!

@thomas-lebeau thomas-lebeau merged commit 073e5c9 into v7 Mar 30, 2026
19 of 20 checks passed
@thomas-lebeau thomas-lebeau deleted the thomas.lebeau/fix-merge-conflict-config-spec branch March 30, 2026 15:53
@github-actions github-actions bot locked and limited conversation to collaborators Mar 30, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants