From 0000173c05681e7b57bf861e94472bbeaf508d5e Mon Sep 17 00:00:00 2001 From: rahul agrawal Date: Wed, 23 Oct 2019 16:31:59 +0530 Subject: [PATCH 1/5] add the user-agent header --- probe/appclient/app_client_internal_test.go | 4 ++++ probe/appclient/probe_config.go | 1 + 2 files changed, 5 insertions(+) diff --git a/probe/appclient/app_client_internal_test.go b/probe/appclient/app_client_internal_test.go index e2a260d2c..8f9b9fca8 100644 --- a/probe/appclient/app_client_internal_test.go +++ b/probe/appclient/app_client_internal_test.go @@ -3,6 +3,7 @@ package appclient import ( "compress/gzip" "fmt" + "github.com/weaveworks/scope/app" "net/http" "net/http/httptest" "net/url" @@ -32,6 +33,9 @@ func dummyServer(t *testing.T, expectedToken, expectedID string, expectedVersion t.Errorf("want %q, have %q", expectedID, have) } + if have := r.Header.Get("user-agent"); "Scope/1.11.6" != have { + t.Errorf("want %q, have %q", app.Version, have) + } var have report.Report reader := r.Body diff --git a/probe/appclient/probe_config.go b/probe/appclient/probe_config.go index 8e2cecd58..20d84f80e 100644 --- a/probe/appclient/probe_config.go +++ b/probe/appclient/probe_config.go @@ -46,6 +46,7 @@ func (pc ProbeConfig) authorizeHeaders(headers http.Header) { } headers.Set(xfer.ScopeProbeIDHeader, pc.ProbeID) headers.Set(xfer.ScopeProbeVersionHeader, pc.ProbeVersion) + headers.Set("user-agent","Scope/1.11.6") } func (pc ProbeConfig) authorizedRequest(method string, urlStr string, body io.Reader) (*http.Request, error) { From 7adc70c5a5b9977bd10ce2ab8c62d489037f3fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDarthSett=E2=80=9D?= Date: Wed, 23 Oct 2019 16:35:57 +0530 Subject: [PATCH 2/5] add the user-agent header --- probe/appclient/app_client_internal_test.go | 2 +- probe/appclient/probe_config.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/probe/appclient/app_client_internal_test.go b/probe/appclient/app_client_internal_test.go index 8f9b9fca8..2632a0ba9 100644 --- a/probe/appclient/app_client_internal_test.go +++ b/probe/appclient/app_client_internal_test.go @@ -33,7 +33,7 @@ func dummyServer(t *testing.T, expectedToken, expectedID string, expectedVersion t.Errorf("want %q, have %q", expectedID, have) } - if have := r.Header.Get("user-agent"); "Scope/1.11.6" != have { + if have := r.Header.Get("user-agent"); have != "Scope/1.11.6" { t.Errorf("want %q, have %q", app.Version, have) } var have report.Report diff --git a/probe/appclient/probe_config.go b/probe/appclient/probe_config.go index 20d84f80e..7963401fb 100644 --- a/probe/appclient/probe_config.go +++ b/probe/appclient/probe_config.go @@ -46,7 +46,7 @@ func (pc ProbeConfig) authorizeHeaders(headers http.Header) { } headers.Set(xfer.ScopeProbeIDHeader, pc.ProbeID) headers.Set(xfer.ScopeProbeVersionHeader, pc.ProbeVersion) - headers.Set("user-agent","Scope/1.11.6") + headers.Set("user-agent","Scope/1.11.6" ) } func (pc ProbeConfig) authorizedRequest(method string, urlStr string, body io.Reader) (*http.Request, error) { From af31e3043916d458bbb1934dc5d6966e7fdac0fe Mon Sep 17 00:00:00 2001 From: DarthSett Date: Fri, 25 Oct 2019 12:33:35 +0530 Subject: [PATCH 3/5] Add user-agent header --- probe/appclient/app_client_internal_test.go | 6 +----- probe/appclient/probe_config.go | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/probe/appclient/app_client_internal_test.go b/probe/appclient/app_client_internal_test.go index 2632a0ba9..abeacc7d4 100644 --- a/probe/appclient/app_client_internal_test.go +++ b/probe/appclient/app_client_internal_test.go @@ -3,7 +3,6 @@ package appclient import ( "compress/gzip" "fmt" - "github.com/weaveworks/scope/app" "net/http" "net/http/httptest" "net/url" @@ -30,12 +29,9 @@ func dummyServer(t *testing.T, expectedToken, expectedID string, expectedVersion } if have := r.Header.Get(xfer.ScopeProbeVersionHeader); expectedVersion != have { - t.Errorf("want %q, have %q", expectedID, have) + t.Errorf("want %q, have %q", expectedVersion, have) } - if have := r.Header.Get("user-agent"); have != "Scope/1.11.6" { - t.Errorf("want %q, have %q", app.Version, have) - } var have report.Report reader := r.Body diff --git a/probe/appclient/probe_config.go b/probe/appclient/probe_config.go index 7963401fb..719315caf 100644 --- a/probe/appclient/probe_config.go +++ b/probe/appclient/probe_config.go @@ -46,7 +46,9 @@ func (pc ProbeConfig) authorizeHeaders(headers http.Header) { } headers.Set(xfer.ScopeProbeIDHeader, pc.ProbeID) headers.Set(xfer.ScopeProbeVersionHeader, pc.ProbeVersion) - headers.Set("user-agent","Scope/1.11.6" ) + headers.Set("user-agent","Probe_Scope/"+pc.ProbeVersion ) + + } func (pc ProbeConfig) authorizedRequest(method string, urlStr string, body io.Reader) (*http.Request, error) { From 4eab46670edbedc6d16fcefd7f3f0f84ac3558ec Mon Sep 17 00:00:00 2001 From: DarthSett <48887016+DarthSett@users.noreply.github.com> Date: Fri, 25 Oct 2019 19:31:17 +0530 Subject: [PATCH 4/5] Update user-agent in probe/appclient/probe_config.go Co-Authored-By: Filip Barl --- probe/appclient/probe_config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probe/appclient/probe_config.go b/probe/appclient/probe_config.go index 719315caf..7a170f763 100644 --- a/probe/appclient/probe_config.go +++ b/probe/appclient/probe_config.go @@ -46,7 +46,7 @@ func (pc ProbeConfig) authorizeHeaders(headers http.Header) { } headers.Set(xfer.ScopeProbeIDHeader, pc.ProbeID) headers.Set(xfer.ScopeProbeVersionHeader, pc.ProbeVersion) - headers.Set("user-agent","Probe_Scope/"+pc.ProbeVersion ) + headers.Set("user-agent","Scope_Probe/"+pc.ProbeVersion ) } From ccfd2f0427091329eff26b527b0c452d86431d1d Mon Sep 17 00:00:00 2001 From: DarthSett Date: Mon, 28 Oct 2019 19:34:22 +0530 Subject: [PATCH 5/5] Added test to check user-agent header --- probe/appclient/app_client_internal_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/probe/appclient/app_client_internal_test.go b/probe/appclient/app_client_internal_test.go index abeacc7d4..4eded3adf 100644 --- a/probe/appclient/app_client_internal_test.go +++ b/probe/appclient/app_client_internal_test.go @@ -32,6 +32,10 @@ func dummyServer(t *testing.T, expectedToken, expectedID string, expectedVersion t.Errorf("want %q, have %q", expectedVersion, have) } + if have := r.Header.Get("user-agent"); "Scope_Probe/"+expectedVersion!=have { + t.Errorf("want %q, have %q","Scope_Probe/"+expectedVersion,have) + } + var have report.Report reader := r.Body