Fix replaceParam when the replaced string contains a replacement marker - #782
Merged
wu-sheng merged 2 commits intoNov 26, 2025
Merged
Fix replaceParam when the replaced string contains a replacement marker#782wu-sheng merged 2 commits into
wu-sheng merged 2 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
3 tasks
Copy link
Copy Markdown
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug in the AbstractLogger.replaceParam method where replacement strings containing the {} marker would be incorrectly processed, causing repeated replacements. The fix replaces the regex-based approach with a more efficient StringBuilder-based implementation that correctly handles replacement strings containing {} by tracking the position after each replacement.
- Replaces regex-based string replacement with StringBuilder for efficiency and correctness
- Adds comprehensive test coverage for both normal cases and the specific bug scenario
- Updates CHANGES.md to document the fix
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/AbstractLogger.java | Refactored replaceParam method to use StringBuilder instead of regex, fixing the double-replacement bug and improving performance |
| apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/AbstractLoggerTest.java | Added new test file with test cases for normal parameter replacement and the specific bug case with {} in replacement strings |
| CHANGES.md | Added changelog entry documenting the fix |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sorry, something went wrong.
wu-sheng
approved these changes
Nov 26, 2025
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
Reviewers
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.
For replaceParam("from {} to {}", "a={}", "b={}"), the correct output should be from a={} to b={}, not from a=b={} to {}.
Closes apache/skywalking#13591