feat(build): use the builder to set config providers #1587
Merged
Conversation
This file contains 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
swiatekm
force-pushed
the
build/collector-config-settings
branch
from
84421a2
to
46aed61
Compare
sumo-drosiek
approved these changes
May 21, 2024
echlebek
reviewed
May 21, 2024
Comment on lines
-161
to
-162
| cd cmd && go get github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/globprovider@v0.0.0-00010101000000-000000000000 | ||
| cd cmd && go get github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/opampprovider@v0.0.0-00010101000000-000000000000 |
There was a problem hiding this comment.
Very happy to see these lines removed 🎉
|
Converting to draft until I figure out how the service registration should work. I think it should just work with the upstream service handler, but that's not actually the case. |
swiatekm
force-pushed
the
build/collector-config-settings
branch
from
46aed61
to
5379591
Compare
fguimond
approved these changes
May 31, 2024
rnishtala-sumo
approved these changes
Jun 4, 2024
swiatekm
force-pushed
the
build/collector-config-settings
branch
from
5379591
to
d1a4fda
Compare
swiatekm
force-pushed
the
build/collector-config-settings
branch
from
d1a4fda
to
49ce573
Compare
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.
The builder now supports setting config providers and converters via its configuration. Use that instead of our own patches. This change gets rid of a bunch of custom build code. We only keep the flags necessary to check if
--remote-configand--confighaven't been set at the same time.I've also removed our custom Windows service code. The Windows service initialization in core now behaves very similarly to starting the collector normally, so doing the same thing gives the right result. One modification I had to make was deleting the opamp flag from
os.Args, as the service handler callsflags.Parse, which errors on unknown flags, and there isn't a way to add our custom flag there.Removing the custom windows code makes our custom
--remote-configflag not appear in the help text when running as a Windows service, but I think that's worth it in return for being able to use the upstream service handler.Resolves #1565