Expose UserAgent and fix User-Agent version source #2603
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
…nt header Promtail wasn't using github.com/prometheus/common/version for the User-Agent header when obtaining the build version. Instead, it imported github.com/grafana/loki/pkg/build which modifies the Prometheus version package on init. This causes problems for importers that also import and modify github.com/prometheus/common/version with their own build information (i.e., grafana/agent). This PR changes Promtail to obtain the build info from the common dependency to obtain the correct build information regardless of how Promtail is being run.
This was referenced Sep 8, 2020
Codecov Report
@@ Coverage Diff @@
## master #2603 +/- ##
==========================================
+ Coverage 62.92% 62.93% +0.01%
==========================================
Files 169 169
Lines 15018 15018
==========================================
+ Hits 9450 9452 +2
+ Misses 4810 4809 -1
+ Partials 758 757 -1
|
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.
This PR exposes UserAgent as an equivalent to a similar PR recently made for Prometheus, This allows importers (like grafana/agent) to customize the User-Agent to allow tracking which clients are sending data through Promtail.
As a secondary fix, this PR also changes the User Agent's version info to be pulled from
github.com/prometheus/common/versionrather thangithub.com/grafana/loki/pkg/build.grafana/agenthas its own equivalent build package that sets the build version and needs a hack to ensure its own overrides take precedence. The clean fix is to get the version from the common dependency rather than the package responsible for setting the version globals.