fix(lettuce5): decorate Redis command spans with resolved node connection for master-replica connection providers by ygree · Pull Request #11819 · DataDog/dd-trace-java

ygree · 2026-06-30T21:45:23Z

What Does This Do

Decorates Redis command spans with resolved node connection for master-replica connection providers

Before (no hostname) and After (hostname and other resolved connection related tags present):

Motivation

Redis command span missing hostname and other connection related tags when run with a master/replica connection

Additional Notes

Lettuce master/replica APIs expose a routing connection, while the concrete node connection is selected only when the command is dispatched.
The existing command advice only sees the wrapper connection, so static master/replica routing can leave peer.hostname unset.

Instrument the legacy MasterSlaveConnectionProvider.getConnection path and the newer MasterReplicaConnectionProvider.getConnection* paths. When a Redis command span is active, decorate it with the RedisURI from the resolved StatefulRedisConnection.

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
Add your completed PR to the merge queue by commenting /merge. You can also:
- Customize the commit message associated with the merge with /merge --commit-message "..."
- Remove your PR from the merge queue with /merge -c
- Skip all merge queue checks with /merge -f --reason "reason"; please use this judiciously, as some checks do not run at the PR-level (note: the PR still needs to be mergeable, this will only skip the pre-merge build)
- Get more information in this doc

Jira ticket: APMS-19871

… master/replica command span

connection for master-replica connetion providers Lettuce master/replica APIs expose a routing connection, while the concrete node connection is selected only when the command is dispatched. The existing command advice only sees the wrapper connection, so static master/replica routing can leave peer.hostname unset. Instrument the legacy MasterSlaveConnectionProvider#getConnection path and the newer MasterReplicaConnectionProvider#getConnection* paths. When a Redis command span is active, decorate it with the RedisURI from the resolved StatefulRedisConnection.

dd-octo-sts · 2026-06-30T22:03:52Z

🟢 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.03 s	13.97 s	[-0.2%; +1.1%] (no difference)
startup:insecure-bank:tracing:Agent	12.97 s	12.98 s	[-0.6%; +0.5%] (no difference)
startup:petclinic:appsec:Agent	16.93 s	16.77 s	[-0.1%; +2.0%] (no difference)
startup:petclinic:iast:Agent	16.79 s	16.91 s	[-1.5%; +0.1%] (no difference)
startup:petclinic:profiling:Agent	16.43 s	16.89 s	[-7.1%; +1.6%] (no difference)
startup:petclinic:sca:Agent	16.95 s	16.85 s	[-0.5%; +1.7%] (no difference)
startup:petclinic:tracing:Agent	15.62 s	15.61 s	[-5.9%; +6.0%] (unstable)

Commit: a63c83f3 · 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.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a2351d0726

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

chatgpt-codex-connector · 2026-06-30T23:29:58Z

+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.masterslave.MasterSlave;


Keep legacy-only test out of latest suite

This source is also compiled by latestDepTest because this module uses addTestSuiteForDir('latestDepTest', 'test') and latestDepTestImplementation depends on lettuce-core:+. The latest Lettuce 7.x no longer has the legacy io.lettuce.core.masterslave package (the production code treats it as [5,7)), so compileLatestDepTestJava/forked compile will fail on this import before tests run. Put this test in a 5.x-only source set or use the masterreplica API for the latest-dependency suite.

Useful? React with 👍 / 👎.

I checked this against the current latest-dependency resolution. latestDepTestCompileClasspath resolves lettuce-core:+ to 7.6.0.RELEASE, and compileLatestDepTestJava --rerun-tasks succeeds.

Lettuce 7.6 still ships the public compatibility API io.lettuce.core.masterslave.MasterSlave.

Given that the MasterSlave public API exists in both our baseline 5.0 dependency and current latest 7.6 dependency, I’d prefer to keep this test in src/test for now so it runs against both versions. If Lettuce removes that compatibility API in a future release, we can then split it into a version-specific source set or add a latest-dependency variant using masterreplica.

I changed the test so it prefers the newer master/replica API and falls back to the old one via reflection. This way, it uses the old API only before 5.2. This should keep working even if the deprecated API is removed completely.

chatgpt-codex-connector · 2026-06-30T23:29:58Z

+            .and(takesArgument(0, named("io.lettuce.core.protocol.ConnectionIntent")))
+            .and(returns(named("java.util.concurrent.CompletableFuture"))),


Add legacy async master/slave matching

For Lettuce 5.1–6, io.lettuce.core.masterslave.MasterSlaveChannelWriter.write dispatches commands through MasterSlaveConnectionProvider.getConnectionAsync(Intent), not the synchronous getConnection(Intent). This async matcher only accepts the newer io.lettuce.core.protocol.ConnectionIntent, so those legacy versions never run either advice during command dispatch and still emit master/slave command spans without the resolved connection tags.

Useful? React with 👍 / 👎.

Adding few explicit tests in e0e65be for lettuce 5.1, 6.0, 6.1, and 6.2 uncovered some missing instrumentation

Fixed in 8add908 and c4b629d

Prefer the newer MasterReplica facade in the Lettuce master/replica test and fall back to the legacy MasterSlave facade when needed.

master/replica command span connection tagging across the version range.

Collapse version-specific `getConnection*` matchers to public method shape matching and keep coverage for Lettuce 5.0 through latest master/replica command span connection tagging.

…tation

datadog-datadog-prod-us1 · 2026-07-01T16:54:27Z

🎯 Code Coverage (details)
• Patch Coverage: 100.00%
• Overall Coverage: 69.73% (+14.74%)

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: a63c83f | Docs | Datadog PR Page | Give us feedback!}

ValentinZakharov

LGTM!

ygree · 2026-07-01T20:41:04Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-07-01T20:41:08Z

View all feedbacks in Devflow UI.

2026-07-01 20:41:08 UTC ℹ️ Start processing command /merge
Use /merge -c to cancel this operation!

2026-07-01 20:41:14 UTC ℹ️ MergeQueue: pull request added to the queue

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

Use /merge -c to cancel this operation!

⏳ Processing

test(lettuce5): reproduce the missing hostname on the lettuce5 static…

47e2eca

… master/replica command span

ygree self-assigned this Jun 30, 2026

ygree added type: bug Bug report and fix inst: lettuce Lettuce instrumentation tag: ai generated Largely based on code generated by an AI or LLM labels Jun 30, 2026

ygree changed the title ~~Fix lettuce5 command span decoration when used with master-replica connection~~ fix(lettuce5): decorate Redis command spans with resolved node connection for master-replica connection providers Jun 30, 2026

ygree marked this pull request as ready for review June 30, 2026 23:23

ygree requested a review from a team as a code owner June 30, 2026 23:23

ygree requested review from ValentinZakharov and removed request for a team June 30, 2026 23:23

chatgpt-codex-connector Bot reviewed Jun 30, 2026

View reviewed changes

ygree added 6 commits June 30, 2026 18:47

Use reflective Lettuce master-replica API lookup

90ddf53

Prefer the newer MasterReplica facade in the Lettuce master/replica test and fall back to the legacy MasterSlave facade when needed.

Add pinned Lettuce 5.1, 6.0, 6.1, and 6.2 test suites to exercise

e0e65be

master/replica command span connection tagging across the version range.

Add missing instrumentationfor missed lettuce connection providers

8add908

Fix Lettuce master/replica connection provider matching

c4b629d

Collapse version-specific `getConnection*` matchers to public method shape matching and keep coverage for Lettuce 5.0 through latest master/replica command span connection tagging.

Clean up Lettuce5MasterReplicaTest.connectMasterReplica

c3efcf5

Merge branch 'master' into ygree/fix-lettuce5-masterreplica-instrumen…

a63c83f

…tation

ygree added this to the 1.64.0 milestone Jul 1, 2026

ValentinZakharov approved these changes Jul 1, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(lettuce5): decorate Redis command spans with resolved node connection for master-replica connection providers#11819

fix(lettuce5): decorate Redis command spans with resolved node connection for master-replica connection providers#11819
ygree wants to merge 8 commits into
masterfrom
ygree/fix-lettuce5-masterreplica-instrumentation

ygree commented Jun 30, 2026 •

edited

Loading

Uh oh!

dd-octo-sts Bot commented Jun 30, 2026 •

edited

Loading

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Jun 30, 2026

Uh oh!

ygree Jul 1, 2026

Uh oh!

ygree Jul 1, 2026

Uh oh!

chatgpt-codex-connector Bot Jun 30, 2026

Uh oh!

ygree Jul 1, 2026

Uh oh!

ygree Jul 1, 2026

Uh oh!

datadog-datadog-prod-us1 Bot commented Jul 1, 2026

Uh oh!

ValentinZakharov left a comment

Uh oh!

ygree commented Jul 1, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Jul 1, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		.and(takesArgument(0, named("io.lettuce.core.protocol.ConnectionIntent")))
		.and(returns(named("java.util.concurrent.CompletableFuture"))),

Uh oh!

Conversation

ygree commented Jun 30, 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 Jun 30, 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!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

ygree Jul 1, 2026

Choose a reason for hiding this comment

Uh oh!

ygree Jul 1, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

ygree Jul 1, 2026

Choose a reason for hiding this comment

Uh oh!

ygree Jul 1, 2026

Choose a reason for hiding this comment

Uh oh!

datadog-datadog-prod-us1 Bot commented Jul 1, 2026

Uh oh!

ValentinZakharov left a comment

Choose a reason for hiding this comment

Uh oh!

ygree commented Jul 1, 2026

Uh oh!

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

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ygree commented Jun 30, 2026 •

edited

Loading

dd-octo-sts Bot commented Jun 30, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Jul 1, 2026 •

edited

Loading