Skip to content

Allow to overwrite User-Agent http request header (#335) #336

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

Merged
merged 1 commit into from
Aug 23, 2021
Merged

Allow to overwrite User-Agent http request header (#335) #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion estransport/estransport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ const (

// esCompatHeader defines the env var for Compatibility header.
esCompatHeader = "ELASTIC_CLIENT_APIVERSIONING"

userAgentHeader = "User-Agent"
)

var (
Expand Down Expand Up @@ -474,7 +476,14 @@ func (c *Client) setReqAuth(u *url.URL, req *http.Request) *http.Request {
}

func (c *Client) setReqUserAgent(req *http.Request) *http.Request {
req.Header.Set("User-Agent", userAgent)
if len(c.header) > 0 {
ua := c.header.Get(userAgentHeader)
if ua != "" {
req.Header.Set(userAgentHeader, ua)
return req
}
}
req.Header.Set(userAgentHeader, userAgent)
return req
}

Expand Down
15 changes: 15 additions & 0 deletions estransport/estransport_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,21 @@ func TestTransportPerform(t *testing.T) {
}
})

t.Run("Overwrites UserAgent", func(t *testing.T) {
u, _ := url.Parse("http://example.com")

tp, _ := New(Config{URLs: []*url.URL{u}, Header: http.Header{
userAgentHeader: []string{"Elastic-Fleet-Server/7.11.1 (darwin; amd64; Go 1.16.6)"},
}})

req, _ := http.NewRequest("GET", "/abc", nil)
tp.setReqUserAgent(req)

if !strings.HasPrefix(req.UserAgent(), "Elastic-Fleet-Server") {
t.Errorf("Unexpected user agent: %s", req.UserAgent())
}
})

t.Run("Sets global HTTP request headers", func(t *testing.T) {
hdr := http.Header{}
hdr.Set("X-Foo", "bar")
Expand Down