generated from amazon-archives/__template_Custom
-
Notifications
You must be signed in to change notification settings - Fork 237
[Bugfix] Fix merging logic to append multiple jvm/otlp configurations #1870
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Conversation
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
musa-asad
reviewed
Sep 18, 2025
musa-asad
reviewed
Sep 18, 2025
musa-asad
previously approved these changes
Sep 21, 2025
|
need to fix integ test |
lisguo
commented
Sep 22, 2025
musa-asad
reviewed
Sep 22, 2025
musa-asad
reviewed
Sep 22, 2025
jefchien
previously approved these changes
Sep 22, 2025
jefchien
previously approved these changes
Sep 22, 2025
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestMergeArrayOrObjectConfiguration(t *testing.T) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Missing coverage for merging an array into an object.
musa-asad
previously approved these changes
Sep 22, 2025
Co-authored-by: Jeffrey Chien <[email protected]>
jefchien
approved these changes
Sep 23, 2025
JayPolanco
approved these changes
Sep 23, 2025
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.
Description of the issue
Currently if you try to use the "append-config" action on two configurations that have separate JVM configurations, it will fail.
Kafka Config:
Tomcat config:
I expect this to merge the jvm configurations to this valid config:
Description of changes
Modify the
mergeMapfunction in the translator to add a conditional if we see a "jmx" or "otlp" configuration, then merge the incoming jmx config into the list.License
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Tests
Added unit test and manual testing. I appended 4 jmx configurations and see the otel receivers populated:
Requirements
Before commiting your code, please do the following steps.
make fmtandmake fmt-shmake lintIntegration Tests
To run integration tests against this PR, add the
ready for testinglabel.