-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
build: Update DEB and RPM artifacts to align with documentation/non contrib collector #3123
build: Update DEB and RPM artifacts to align with documentation/non contrib collector #3123
Conversation
Codecov Report
@@ Coverage Diff @@
## main #3123 +/- ##
==========================================
+ Coverage 91.59% 91.61% +0.01%
==========================================
Files 486 486
Lines 23519 23519
==========================================
+ Hits 21543 21546 +3
+ Misses 1466 1464 -2
+ Partials 510 509 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
@Jammicus Thanks for looking into this! Quick question: Since this is the contrib collector, should the config be located at: Update: Just confirmed by looking at the agent error message in my issue (#3097) -- when the agent fails due to a missing config file, the error message specifically mentions that it's looking for the config file in |
Oooh good spot! Will update |
d284f6c
to
20cfb3d
Compare
Looking at the failing tests, its failing due to a test which explicitly checks that the collector does not start without config:
Looking at the file this seems to have been added when it was initially created. Will need some guidance from the contributors as to whether this is intentional and the collector should not be shipped with default config or can be removed (Happy to update/close this depending on your guidance) |
f731f19
to
ab7268e
Compare
ab7268e
to
d224517
Compare
|
||
# Command-line options for the otel-collector service. | ||
# Run `/usr/bin/otelcontribcol --help` to see all available options. | ||
OTELCOL_OPTIONS="--config=/etc/otel-contrib-collector/config.yaml" |
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.
Thanks again @Jammicus !
Q: I've seen the use of OTELCONTRIBCOL
in other places, so not sure what the appropriate contrib naming scheme is for this variable -- should it be OTELCOL_OPTIONS
or OTELCONTRIBCOL_OPTIONS
?
Also, minor edit: In the comment on line 3, otel-collector
should be otel-contrib-collector
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.
Thanks, updated line 3.
Not sure on the naming conventions - approvers can give us some guidance when they have time to review this
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.
I think there's value in keeping the environment variables symmetrical between contrib and non-contrib, they're mostly just different versions of the same thing so more swappability is nice
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.
IMO, I would use OTELCONTRIBCOL_OPTIONS
just to be consistent with the otelcontribcol
binary name.
…sts to reflect bundled default config.
d224517
to
2a98f6c
Compare
@jchengsfx can you review? |
|
||
# Command-line options for the otel-collector service. | ||
# Run `/usr/bin/otelcontribcol --help` to see all available options. | ||
OTELCOL_OPTIONS="--config=/etc/otel-contrib-collector/config.yaml" |
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.
I think there's value in keeping the environment variables symmetrical between contrib and non-contrib, they're mostly just different versions of the same thing so more swappability is nice
@jchengsfx please approve if everything looks good |
…ontrib collector (open-telemetry#3123) * build: Add example config to deb and rpm artifacts * build: update systemd service to point to environment file, update tests to reflect bundled default config.
…ed) (#3123) The comment was about traceid/spanid "bytes" fields. This comment is incorrect since we have changed traceid/spanid fields to use hex encoding (as required by the spec). In the future if we add any other "bytes" fields to the proto they will be encoded as base64 as it is expected and is default behavior of Protobuf/JSON, but this does not require an explicit comment, so I am deleting it.
…ontrib collector (open-telemetry#3123) * build: Add example config to deb and rpm artifacts * build: update systemd service to point to environment file, update tests to reflect bundled default config.
Description: Updating RPM and DEB artifacts to match documentation
Currently the RPM and Deb artifacts are not aligned to how they are described in the documentation. They are:
This PR does the following:
OTELCOL_OPTIONS
Link to tracking Issue:
#3097
#3143
Testing: Automated tests have installed + checked service is running after 5 seconds. Manually tested the DEB on Ubuntu 18.04
Documentation: N/A
Edit: Updating path.
Edit 2: Including #3143 as its dependent on the config being present