Merge pull request #3797 from weaveworks/update-build-tools

Update build tools

probe/appclient/app_client_internal_test.go

@@ -32,8 +32,8 @@ 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)
+		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

probe/appclient/probe_config.go

@@ -46,8 +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_Probe/"+pc.ProbeVersion )
-
+	headers.Set("user-agent", "Scope_Probe/"+pc.ProbeVersion)
 
 }
 

probe/docker/container.go

@@ -399,7 +399,6 @@ func (c *container) controls() []string {
 	default:
 		return []string{StartContainer, RemoveContainer}
 	}
-	return nil
 }
 
 func (c *container) GetNode() report.Node {

probe/docker/registry.go

@@ -121,13 +121,13 @@ func NewRegistry(options RegistryOptions) (Registry, error) {
 		images:          map[string]docker_client.APIImages{},
 		pipeIDToexecID:  map[string]string{},
 
-		client:          client,
-		pipes:           options.Pipes,
-		interval:        options.Interval,
-		collectStats:    options.CollectStats,
-		hostID:          options.HostID,
-		handlerRegistry: options.HandlerRegistry,
-		quit:            make(chan chan struct{}),
+		client:                 client,
+		pipes:                  options.Pipes,
+		interval:               options.Interval,
+		collectStats:           options.CollectStats,
+		hostID:                 options.HostID,
+		handlerRegistry:        options.HandlerRegistry,
+		quit:                   make(chan chan struct{}),
 		noCommandLineArguments: options.NoCommandLineArguments,
 		noEnvironmentVariables: options.NoEnvironmentVariables,
 	}

probe/endpoint/ebpf.go

@@ -373,6 +373,7 @@ func (t *EbpfTracker) isDead() bool {
 	return t.dead
 }
 
+// Stop the tracker and wait for it to signal it has stopped
 func (t *EbpfTracker) Stop() {
 	t.stop()
 	if t.stopping != nil {

probe/kubernetes/service.go

@@ -49,8 +49,8 @@ func servicePortString(p apiv1.ServicePort) string {
 
 func (s *service) GetNode(probeID string) report.Node {
 	latest := map[string]string{
-		IP:   s.Spec.ClusterIP,
-		Type: string(s.Spec.Type),
+		IP:                    s.Spec.ClusterIP,
+		Type:                  string(s.Spec.Type),
 		report.ControlProbeID: probeID,
 	}
 	if s.Spec.LoadBalancerIP != "" {