Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Expose UserAgent and fix User-Agent version source #2603

Merged
merged 2 commits into from
Sep 8, 2020
Merged

Expose UserAgent and fix User-Agent version source #2603

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2414c8
Use prometheus/common/version for reporting build version in User Age…
rfratto Sep 8, 2020
857f1f5
expose UserAgent to allow it to be modifiable by importers
rfratto Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/promtail/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/config"
"github.com/prometheus/common/model"
"github.com/prometheus/common/version"

"github.com/grafana/loki/pkg/build"
"github.com/grafana/loki/pkg/helpers"
"github.com/grafana/loki/pkg/logproto"
)
Expand Down Expand Up @@ -72,7 +72,7 @@ var (
encodedBytes, sentBytes, droppedBytes, sentEntries, droppedEntries,
}

userAgent = fmt.Sprintf("promtail/%s", build.Version)
UserAgent = fmt.Sprintf("promtail/%s", version.Version)
)

func init() {
Expand Down Expand Up @@ -262,7 +262,7 @@ func (c *client) send(ctx context.Context, tenantID string, buf []byte) (int, er
}
req = req.WithContext(ctx)
req.Header.Set("Content-Type", contentType)
req.Header.Set("User-Agent", userAgent)
req.Header.Set("User-Agent", UserAgent)

// If the tenant ID is not empty promtail is running in multi-tenant mode, so
// we should send it to Loki
Expand Down