-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
[cmd/opampsupervisor] Enable Strict Unmarshal for Supervisor Configuration #36148
[cmd/opampsupervisor] Enable Strict Unmarshal for Supervisor Configuration #36148
Conversation
…efault provided by koanf Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
Hi @evan-bradley / @atoulme / @tigrannajaryan can you please help review this? Thanks |
Please add a changelog - any chance you can have a test checking the behavior? |
Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
Hi @atoulme , added both chlog and test in recent commits. Thanks |
Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
Hi @atoulme , just following up on this PR. Let me know if there are any concerns or updates? Thanks |
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.
Please fix the failed CI lint https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/11762947657/job/33410954056?pr=36148
--- a/cmd/opampsupervisor/go.mod
+++ b/cmd/opampsupervisor/go.mod
@@ -4,6 +4,7 @@ go 1.22.0
require (
github.com/cenkalti/backoff/v4 v4.3.0
+ github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1
github.com/google/uuid v1.6.0
github.com/knadh/koanf/maps v0.1.1
github.com/knadh/koanf/parsers/yaml v0.1.0
@@ -25,7 +26,6 @@ require (
require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
- github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
go.mod/go.sum deps changes detected, please run "make gotidy" and commit the changes in this PR.
Done, as instructed in the result. |
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.
please help resolve the conflict
74b8637
to
ed0fa73
Compare
Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
Resolved the conflict. Thanks |
Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
Hi @fatsheep9146 , I fixed the pr check failure. Can you please re-trigger the checks? |
Ping @atoulme @evan-bradley for a final review. |
Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
…ation (open-telemetry#36148) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description The changes includes providing a custom `DecoderConfig` with `ErrorUnused` enabled instead of using the default `DecoderConfig` provided by `koanf` <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes: open-telemetry#35838 <!--Describe what testing was performed and which tests were added.--> <!--Describe the documentation added.--> <!--Please delete paragraphs that you did not use before submitting.--> --------- Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com> Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
…ation (open-telemetry#36148) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description The changes includes providing a custom `DecoderConfig` with `ErrorUnused` enabled instead of using the default `DecoderConfig` provided by `koanf` <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes: open-telemetry#35838 <!--Describe what testing was performed and which tests were added.--> <!--Describe the documentation added.--> <!--Please delete paragraphs that you did not use before submitting.--> --------- Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com> Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
…ation (open-telemetry#36148) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description The changes includes providing a custom `DecoderConfig` with `ErrorUnused` enabled instead of using the default `DecoderConfig` provided by `koanf` <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes: open-telemetry#35838 <!--Describe what testing was performed and which tests were added.--> <!--Describe the documentation added.--> <!--Please delete paragraphs that you did not use before submitting.--> --------- Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com> Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
Description
The changes includes providing a custom
DecoderConfig
withErrorUnused
enabled instead of using the defaultDecoderConfig
provided bykoanf
Link to tracking issue
Fixes: #35838