Skip to content

[fixme] main conflicts with v7#4608

Merged
gh-worker-dd-devflow-36fce6[bot] merged 4 commits into
v7from
fix-merge-e739e7e329-into-v7
May 12, 2026
Merged

[fixme] main conflicts with v7#4608
gh-worker-dd-devflow-36fce6[bot] merged 4 commits into
v7from
fix-merge-e739e7e329-into-v7

Conversation

@gh-worker-dd-devflow-36fce6
Copy link
Copy Markdown
Contributor

Note

TL,DR: Fix the conflicts and use /resume to merge.
⚠️ Do not mark this pull request as ready for review.

We couldn't automatically merge the commit e739e7e329 from main into v7, there is a conflict!

We created this pull request so that you can fix those conflicts by clicking on the Resolve conflicts button at the bottom of this page.

If the conflicts are not trivial, you can also resolve them locally by running the following commands in your terminal:

git fetch origin fix-merge-e739e7e329-into-v7 v7
git checkout fix-merge-e739e7e329-into-v7
git merge origin/v7

Once you solved the conflicts, you can finish the merge and push your fix by running:

git merge --continue
git push origin fix-merge-e739e7e329-into-v7

Finally, you can resume the integration of this change by either:

  • commenting /resume on this pull request, or clicking on the "Resume" button at the bottom of the page if you have Doggo installed.
  • running the following command directly in your terminal while having the fix branch checked out:
    ddr devflow resume
    
    Note: Once the command started, you can exit it at any time and switch branch to keep working locally. It will finish in the background.

Alternatively, you can cancel this operation by commenting this pull request with /resume -c

watson and others added 2 commits May 12, 2026 11:09
Introduce the `@datadog/browser-debugger` package, which provides Live
Debugger support in browser applications. Frontend developers can attach
log probes to running applications, evaluate conditions, and inspect
runtime state without redeploying or modifying source code.

The package is published privately for now (excluded from generated docs
via `typedoc.json`).

The probe execution pipeline lives entirely on the client: instrumented
code calls into hooks exposed on `globalThis` (`$dd_entry`,
`$dd_return`, `$dd_throw`, `$dd_probes`), and the SDK is responsible
for evaluating probe conditions, capturing snapshots of arguments,
locals, return values, and thrown errors, rendering template messages
against runtime context, applying per-probe and global rate limits, and
shipping the resulting events to the logs intake. To keep that hot path
predictable, expressions, conditions, and message templates are
compiled once at probe registration and the capture logic enforces
explicit depth, collection-size, and string-length bounds.

Probes themselves are pulled from a Delivery API via a cursor-based
polling client, so probe lifecycle (add/remove/clear) is driven by the
backend rather than the page. Event delivery reuses
`@datadog/browser-core`'s batch/flush transport infrastructure, which
required a small core change: the transport layer now accepts
`'dd_debugger'` as a URL-only source override so events route correctly
in the intake without widening the public RUM `source` surface.

To validate behavior and guard against regressions, the change also
introduces E2E scenarios covering snapshot delivery, value capture,
exception handling, template and condition evaluation, and RUM
correlation, plus a dedicated instrumentation-overhead benchmark that
stress-tests the hooks against the real built bundle (rather than
stubs) so the per-call cost we track is the cost customers will
actually pay.
@datadog-prod-us1-4
Copy link
Copy Markdown

datadog-prod-us1-4 Bot commented May 12, 2026

Tests

🎉 All green!

❄️ No new flaky tests detected
🧪 All tests passed

🎯 Code Coverage (details)
Patch Coverage: 72.02%
Overall Coverage: 77.07% (-0.41%)

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

@cit-pr-commenter-54b7da
Copy link
Copy Markdown

Bundles Sizes Evolution

📦 Bundle Name Base Size Local Size 𝚫 𝚫% Status
Rum 169.26 KiB 169.29 KiB +33 B +0.02%
Rum Profiler 5.97 KiB 5.97 KiB 0 B 0.00%
Rum Recorder 21.23 KiB 21.23 KiB 0 B 0.00%
Logs 54.56 KiB 54.60 KiB +33 B +0.06%
Rum Slim 127.59 KiB 127.62 KiB +33 B +0.03%
Worker 22.99 KiB 22.99 KiB 0 B 0.00%
🚀 CPU Performance

Pending...

🧠 Memory Performance

Pending...

🔗 RealWorld

@thomas-lebeau
Copy link
Copy Markdown
Collaborator

/resume

@gh-worker-devflow-routing-ef8351
Copy link
Copy Markdown

gh-worker-devflow-routing-ef8351 Bot commented May 12, 2026

View all feedbacks in Devflow UI.

2026-05-12 12:08:36 UTC ℹ️ Start processing command /resume


2026-05-12 12:08:39 UTC ℹ️ Devflow: /resume

The v7 branch of browser-sdk has been updated with the latest changes from main

@gh-worker-dd-devflow-36fce6 gh-worker-dd-devflow-36fce6 Bot merged commit 9b6d2c0 into v7 May 12, 2026
16 checks passed
@gh-worker-dd-devflow-36fce6 gh-worker-dd-devflow-36fce6 Bot deleted the fix-merge-e739e7e329-into-v7 branch May 12, 2026 12:08
@github-actions github-actions Bot locked and limited conversation to collaborators May 12, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants