dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the product token for the user agent in more locations (#7378)

Browse Source
This commit is contained in:
Daniel Nelson
2020-04-21 10:02:18 -07:00
committed by GitHub
parent c9a3b697b8
commit a4eb9c2205
7 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/outputs/http/http.go
View File

@@ -193,7 +193,7 @@ func (h *HTTP) write(reqBody []byte) error {
req.SetBasicAuth(h.Username, h.Password)
}
req.Header.Set("User-Agent", "Telegraf/"+internal.Version())
req.Header.Set("User-Agent", internal.ProductToken())
req.Header.Set("Content-Type", defaultContentType)
if h.ContentEncoding == "gzip" {
req.Header.Set("Content-Encoding", "gzip")

4
plugins/outputs/http/http_test.go
View File

@@ -431,11 +431,9 @@ func TestDefaultUserAgent(t *testing.T) {
u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
require.NoError(t, err)
internal.SetVersion("1.2.3")
t.Run("default-user-agent", func(t *testing.T) {
ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
require.Equal(t, "Telegraf/1.2.3", r.Header.Get("User-Agent"))
require.Equal(t, internal.ProductToken(), r.Header.Get("User-Agent"))
w.WriteHeader(http.StatusOK)
})

2
plugins/outputs/influxdb/http.go
View File

@@ -129,7 +129,7 @@ func NewHTTPClient(config HTTPConfig) (*httpClient, error) {
userAgent := config.UserAgent
if userAgent == "" {
userAgent = "Telegraf/" + internal.Version()
userAgent = internal.ProductToken()
}
if config.Headers == nil {

4
plugins/outputs/influxdb/http_test.go
View File

@@ -248,8 +248,6 @@ func TestHTTP_Write(t *testing.T) {
u, err := url.Parse(fmt.Sprintf("http://%s", ts.Listener.Addr().String()))
require.NoError(t, err)
internal.SetVersion("1.2.3")
tests := []struct {
name string
config influxdb.HTTPConfig
@@ -310,7 +308,7 @@ func TestHTTP_Write(t *testing.T) {
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, r.Header.Get("User-Agent"), "Telegraf/1.2.3")
require.Equal(t, internal.ProductToken(), r.Header.Get("User-Agent"))
w.WriteHeader(http.StatusNoContent)
},
},

2
plugins/outputs/influxdb_v2/http.go
View File

@@ -84,7 +84,7 @@ func NewHTTPClient(config *HTTPConfig) (*httpClient, error) {
userAgent := config.UserAgent
if userAgent == "" {
userAgent = "Telegraf/" + internal.Version()
userAgent = internal.ProductToken()
}
var headers = make(map[string]string, len(config.Headers)+2)