Repository navigation
Normalize Redis batch query separators - #19164
Merged
trask merged 3 commits intoJul 10, 2026
Merged
Conversation
trask
force-pushed
the
fix-redis-batch-query-separators
branch
2 times, most recently
from
July 9, 2026 18:45
5219853 to
1671c8e
Compare
trask
force-pushed
the
fix-redis-batch-query-separators
branch
from
July 9, 2026 18:53
1671c8e to
b2126ef
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR normalizes the separator used when joining multiple Redis commands into a single batch db.query.text value. When stable database semantic conventions are emitted (stable or database/dup mode), the separator becomes "; " (semicolon plus space); old-only semconv mode keeps the existing compact ";" for db.statement. The change is applied consistently across the Jedis (2.0/3.0/4.0), Redisson, Lettuce 5.0, and Vert.x Redis javaagent instrumentations, with a small batchQuerySeparator() helper in each module and matching test expectations. Existing truncation limits are preserved because the separator length is factored into the limit checks.
Changes:
- Introduce a semconv-aware
batchQuerySeparator()helper in each Redis batch request class and use it when concatenating batch query text. - Preserve truncation behavior by counting the actual separator length against the batch text limit.
- Update tests to expect
"; "under stable semconv and";"otherwise, including database/dup and large-batch truncation scenarios.
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| jedis-2.0/.../JedisRequest.java | Use batchQuerySeparator() in pipeline join; add helper and import. |
| jedis-2.0/.../JedisClientTest.java | Expect semconv-dependent separator for pipeline/transaction scenarios. |
| jedis-3.0/.../JedisRequest.java | Same separator helper change for Jedis 3.0. |
| jedis-3.0/.../Jedis30ClientTest.java | Expect semconv-dependent separator. |
| jedis-4.0/.../JedisRequest.java | Same separator helper change for Jedis 4.0. |
| jedis-4.0/.../Jedis40ClientTest.java | Expect semconv-dependent separator. |
| lettuce-5.0/.../LettuceBatchRequest.java | Use batchQuerySeparator() in query-text join; add helper and import. |
| lettuce-5.0/.../LettuceAsyncClientTest.java | Expect semconv-dependent separator for deferred-flush scenarios. |
| redisson-common-3.0/.../RedissonRequest.java | Join sanitized queries with batchQuerySeparator(); add helper. |
| redisson-common-3.0/.../AbstractRedissonClientTest.java | Update batch/large/atomic expectations for separator. |
| redisson-common-3.0/.../AbstractRedissonAsyncClientTest.java | Update atomic-batch expectation for separator. |
| vertx-redis-client-4.0/.../VertxRedisClientRequest.java | Use batchQuerySeparator() and count its length against the limit. |
| vertx-redis-client-4.0/.../VertxRedisClientTest.java | Update batch and large-truncation expectations for separator. |
trask
marked this pull request as ready for review
July 9, 2026 19:13
trask
marked this pull request as draft
July 9, 2026 19:13
trask
marked this pull request as ready for review
July 9, 2026 19:23
laurit
approved these changes
Jul 10, 2026
…ry-separators # Conflicts: # instrumentation/redisson/redisson-common-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java # instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedisClientTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Normalize Redis batch db.query.text joins to use semicolon-plus-space separators across Jedis, Redisson, Lettuce 5.0, and Vert.x Redis whenever stable database semantic conventions are emitted, including database/dup mode. Old-only semconv mode continues to emit the existing compact db.statement separator, and existing truncation behavior is preserved.