Fix race in ConfigurationUpdater by jpbempel · Pull Request #12496 · DataDog/dd-trace-java

jpbempel · 2026-09-15T09:47:14Z

What Does This Do

definitionSources must be thread safe for usage as accept method can be called concurrently
also the accept method need to apply configuration and new defintions atomically to avoid lost of defintions for
concurrent accept calls
therefore the configurationLock is extended for the whole accept method

Motivation

Additional Notes

Contributor Checklist

Format the title according to the contribution guidelines
Assign the type: and (comp: or inst:) labels in addition to any other useful labels
Avoid using close, fix, or any linking keywords when referencing an issue
Use solves instead, and assign the PR milestone to the issue
Update the CODEOWNERS file on source file addition, migration, or deletion
Update public documentation with any new configuration flags or behaviors
Once approved, use merge queue to merge the PR

Jira ticket: DEBUG-6209

definitionSources must be thread safe for usage as accept method can be called concurrently

dd-octo-sts · 2026-09-15T09:47:26Z

Hi! 👋 Thanks for your pull request! 🎉

To help us review it, please make sure to:

Add at least one type, and one component or instrumentation label to the pull request

If you need help, please check our contributing guidelines.

datadog-datadog-prod-us1

Two concurrent accept calls can still apply configuration snapshots in the wrong order. An older snapshot can replace a newer snapshot and remove the second update until another call occurs.

_{Open Bits AI session}

_{🤖 Datadog Autotest · Commit 388c690 · What is Autotest? · @DataDog review to ask questions · Any feedback? Reach out in #autotest}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 388c6902ac

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

pr-commenter · 2026-09-15T10:05:52Z

Debugger benchmarks

Parameters

	Baseline	Candidate
baseline_or_candidate	baseline	candidate
ci_job_date	1789476493	1789476819
end_time	2026-09-15T12:49:41	2026-09-15T12:55:07
git_branch	master	jpbempel/fix-race-configupdater
git_commit_sha	`f9b4550`	`3d6f829`
start_time	2026-09-15T12:48:14	2026-09-15T12:53:40

See matching parameters

	Baseline	Candidate
ci_job_id	2044398774	2044398774
ci_pipeline_id	137526526	137526526
cpu_model	Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz	Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz
git_commit_date	1789475724	1789475724

Summary

Found 5 performance improvements and 0 performance regressions! Performance is the same for 4 metrics, 6 unstable metrics.

scenario	Δ mean agg_http_req_duration_min	Δ mean agg_http_req_duration_p50	Δ mean agg_http_req_duration_p75	Δ mean agg_http_req_duration_p99	Δ mean throughput
scenario:loop	better [-568.026µs; -472.503µs] or [-7.073%; -5.883%]	better [-566.785µs; -470.161µs] or [-7.005%; -5.811%]	better [-569.392µs; -471.993µs] or [-7.007%; -5.808%]	better [-556.092µs; -427.021µs] or [-6.773%; -5.201%]	better [+6.324op/s; +9.527op/s] or [+5.186%; +7.812%]

See unchanged results

scenario	Δ mean agg_http_req_duration_min	Δ mean agg_http_req_duration_p50	Δ mean agg_http_req_duration_p75	Δ mean agg_http_req_duration_p99	Δ mean throughput
scenario:noprobe	unstable [-17.870µs; +35.958µs] or [-5.714%; +11.498%]	unstable [-34.765µs; +42.340µs] or [-9.868%; +12.018%]	unstable [-43.584µs; +54.148µs] or [-11.888%; +14.770%]	unstable [-128.765µs; +88.246µs] or [-11.333%; +7.767%]	same
scenario:basic	same	same	same	unstable [-155.733µs; +54.986µs] or [-15.357%; +5.422%]	unstable [-75.677op/s; +186.419op/s] or [-3.254%; +8.016%]

Request duration reports for reports

gantt
    title reports - request duration [CI 0.99] : candidate=None, baseline=None
    dateFormat X
    axisFormat %s
section baseline
noprobe (352.296 µs) : 322, 383
.   : milestone, 352,
basic (323.198 µs) : 317, 330
.   : milestone, 323,
loop (8.091 ms) : 8028, 8154
.   : milestone, 8091,
section candidate
noprobe (356.084 µs) : 314, 398
.   : milestone, 356,
basic (318.785 µs) : 311, 326
.   : milestone, 319,
loop (7.572 ms) : 7566, 7579
.   : milestone, 7572,

baseline results

Scenario	Request median duration [CI 0.99]
noprobe	352.296 µs [321.977 µs, 382.616 µs]
basic	323.198 µs [316.891 µs, 329.505 µs]
loop	8.091 ms [8.028 ms, 8.154 ms]

candidate results

Scenario	Request median duration [CI 0.99]
noprobe	356.084 µs [314.082 µs, 398.086 µs]
basic	318.785 µs [311.305 µs, 326.264 µs]
loop	7.572 ms [7.566 ms, 7.579 ms]

dd-octo-sts · 2026-09-15T10:12:44Z

🟢 Java Benchmark SLOs — All performance SLOs passed

Suite	Status
Startup	🟢 pass

SLO thresholds are defined here based on automatically generated metrics. A warning is raised when results are within 5% of the threshold.

PR vs. master results

Scenario	Candidate	master	Δ (95% CI of mean)
startup:insecure-bank:iast:Agent	14.75 s	14.57 s	[+0.5%; +1.9%] (maybe worse)
startup:insecure-bank:tracing:Agent	13.66 s	13.66 s	[-0.9%; +0.9%] (no difference)
startup:petclinic:appsec:Agent	17.58 s	17.34 s	[+0.6%; +2.2%] (maybe worse)
startup:petclinic:iast:Agent	17.49 s	17.58 s	[-1.3%; +0.3%] (no difference)
startup:petclinic:profiling:Agent	17.57 s	17.22 s	[+0.9%; +3.2%] (maybe worse)
startup:petclinic:sca:Agent	17.63 s	17.48 s	[-0.1%; +1.7%] (no difference)
startup:petclinic:tracing:Agent	16.56 s	16.66 s	[-1.7%; +0.5%] (no difference)

Commit: 3d6f8297 · CI Pipeline · Benchmarking Platform UI

Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion.

avoid lost of definitions on concurrent accepts

dd-octo-sts · 2026-09-15T14:50:49Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-15T14:50:53Z

View all feedbacks in Devflow UI.

2026-09-15 14:50:52 UTC ℹ️ Start processing command /merge

2026-09-15 14:51:03 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).

2026-09-15 15:09:21 UTC ❌ MergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for ebf8ce6:

exploration-tests-method-jackson-databind

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

Investigate the failures and when ready, re-add your pull request to the queue!
If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
Any question, go check the FAQ.

Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

jpbempel · 2026-09-15T15:21:40Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-15T15:21:45Z

View all feedbacks in Devflow UI.

2026-09-15 15:21:44 UTC ℹ️ Start processing command /merge

2026-09-15 15:21:50 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).

2026-09-15 15:41:57 UTC ❌ MergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for dae9328:

exploration-tests-method-jackson-databind

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

Investigate the failures and when ready, re-add your pull request to the queue!
If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
Any question, go check the FAQ.

Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

jpbempel · 2026-09-15T15:42:35Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-15T15:42:39Z

View all feedbacks in Devflow UI.

2026-09-15 15:42:39 UTC ℹ️ Start processing command /merge

2026-09-15 15:42:44 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).

2026-09-15 15:54:36 UTC ❌ MergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 4be52a4:

build_tests: [:smokeTest, smoke, -Xms256M -Xmx1024M]

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

Investigate the failures and when ready, re-add your pull request to the queue!
If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
Any question, go check the FAQ.

Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

jpbempel · 2026-09-16T05:42:27Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-16T05:42:32Z

View all feedbacks in Devflow UI.

2026-09-16 05:42:31 UTC ℹ️ Start processing command /merge

2026-09-16 05:42:36 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).

2026-09-16 06:41:56 UTC ℹ️ MergeQueue: This merge request was merged

Fix race in ConfigurationUpdater

388c690

definitionSources must be thread safe for usage as accept method can be called concurrently

jpbempel requested a review from a team as a code owner September 15, 2026 09:47

jpbempel requested review from dudikeleti and removed request for a team September 15, 2026 09:47

jpbempel added the comp: debugger Dynamic Instrumentation label Sep 15, 2026

jpbempel added the type: bug fix Bug fix label Sep 15, 2026

dudikeleti approved these changes Sep 15, 2026

View reviewed changes

datadog-datadog-prod-us1 Bot reviewed Sep 15, 2026

View reviewed changes

Comment thread dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java Outdated

chatgpt-codex-connector Bot reviewed Sep 15, 2026

View reviewed changes

Comment thread dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java Outdated

This comment has been minimized.

Sign in to view

fix atomicity of ConfigurationUpdater::accept

3d6f829

avoid lost of definitions on concurrent accepts

jpbempel added this pull request to the merge queue Sep 15, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 15, 2026

gh-worker-dd-mergequeue-cf854d Bot merged commit a81ca42 into master Sep 16, 2026
617 checks passed

gh-worker-dd-mergequeue-cf854d Bot deleted the jpbempel/fix-race-configupdater branch September 16, 2026 06:41

github-actions Bot added this to the 1.67.0 milestone Sep 16, 2026

Conversation

jpbempel commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Does This Do

Motivation

Additional Notes

Contributor Checklist

Uh oh!

dd-octo-sts Bot commented Sep 15, 2026

Uh oh!

datadog-datadog-prod-us1 Bot left a comment

Choose a reason for hiding this comment

Uh oh!

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.

pr-commenter Bot commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Debugger benchmarks

Parameters

Summary

Uh oh!

dd-octo-sts Bot commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🟢 Java Benchmark SLOs — All performance SLOs passed

Uh oh!

dd-octo-sts Bot commented Sep 15, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What to do next?

Uh oh!

Uh oh!

jpbempel commented Sep 15, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What to do next?

Uh oh!

jpbempel commented Sep 15, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What to do next?

Uh oh!

jpbempel commented Sep 16, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jpbempel commented Sep 15, 2026 •

edited

Loading

pr-commenter Bot commented Sep 15, 2026 •

edited

Loading

dd-octo-sts Bot commented Sep 15, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 16, 2026 •

edited

Loading