Limit redisson batch command length#18744
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Limits the combined sanitized query text length in Redisson batch commands to prevent excessive memory consumption (and potential OOMs) when batches contain many or very large commands.
Changes:
- Adds a 32 KiB cap on the cumulative sanitized text in
RedissonRequest.sanitizeQuery(), breaking out of the loop once exceeded. - Adds a
largeBatchCommandtest that verifies only commands fitting under the limit are included in thedb.statementattribute. - Fixes a typo ("loner" → "longer") in
RedisCommandSanitizer's LIMIT comment.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| instrumentation/redisson/redisson-common-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/common/v3_0/RedissonRequest.java | Introduces a 32 KiB length limit while sanitizing batch commands. |
| instrumentation/redisson/redisson-common-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java | Adds large-batch test; switches existing batch test from sorted to plain trace assertion. |
| instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/RedisCommandSanitizer.java | Typo fix in comment. |
trask
approved these changes
May 14, 2026
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.
Hopefully resolves #9952