Use updated version of m-lab/go/host, which supports service names (#117)

* Uses m-lab/go/host package to determine hostname

Virtual machines that are part of a managed instance group will have
hostnames/machinenames that have a random suffix, and many of mlab's
tools expect hostnames without this suffix. This commit uses the
hostname as parsed by the `host` package rather than the raw node Name
passed in through the environment. This should result in a valid
hostname that does not include any random suffixes.

* Uses m-lab/go/host v0.1.58 to preserve service name

In the case of virtual nodes that are part of a managed instane group,
the node name and hostname will have a random 4 char suffix. This suffix
isn't wanted by heartbeat or Locate. This commit updates the included
version of m-lab/go to bring in changes to the host package, which adds
new functions for returning the hostname with or without service names
and suffixes.

* Fixes unit test for location.go which uses  package

Author: nkinkade

cmd/heartbeat/heartbeatmsg.go

@@ -39,7 +39,7 @@ func LoadRegistration(ctx context.Context, hostname string, url *url.URL) (*v2.R
 	}
 
 	if v, ok := registrations[h.String()]; ok {
-		v.Hostname = hostname
+		v.Hostname = h.StringWithService()
 		return &v, nil
 	}
 

cmd/heartbeat/heartbeatmsg_test.go

@@ -44,6 +44,13 @@ func Test_LoadRegistration(t *testing.T) {
 			wantErr:  false,
 			wantMsg:  validMsg,
 		},
+		{
+			name:     "valid-hostname-with-suffix",
+			hostname: validHostname + "-t95j",
+			url:      validURL,
+			wantErr:  false,
+			wantMsg:  validMsg,
+		},
 		{
 			name:     "invalid-hostname",
 			hostname: "foo",

go.mod

@@ -14,10 +14,11 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/justinas/alice v1.2.0
 	github.com/m-lab/access v0.0.10
-	github.com/m-lab/go v0.1.54
+	github.com/m-lab/go v0.1.58
 	github.com/m-lab/uuid-annotator v0.4.5
 	github.com/oschwald/geoip2-golang v1.5.0
 	github.com/prometheus/client_golang v1.13.0
+	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.37.0
 	github.com/rafaeljusto/redigomock v2.4.0+incompatible
 	github.com/sirupsen/logrus v1.8.1
@@ -65,7 +66,6 @@ require (
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/oschwald/maxminddb-golang v1.8.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect

go.sum

@@ -306,8 +306,8 @@ github.com/m-lab/access v0.0.10 h1:t/lMUJ+nGyDvW9fhT3yDFB+1hQgmuKEX7QMBOqkJBrA=
 github.com/m-lab/access v0.0.10/go.mod h1:gZ7YN3SeMTZYeRv5EFaLdG+XVI/F/X4njM1G1BfwuE4=
 github.com/m-lab/annotation-service v0.0.0-20210504151333-138bdf572368/go.mod h1:bW5A2AmUqyh6kGbmu4X8fYK2pRcfTvTjAXW/+4VQZUA=
 github.com/m-lab/go v0.1.44/go.mod h1:+C0ZBlRKsF7wIbqHRtiL8bqD6cOwlZXDTK/KQ7Iv434=
-github.com/m-lab/go v0.1.54 h1:z5FxSrcMT0RJF/EDNjeo77pmvzvhGHJMiyPl4N9Mbzo=
-github.com/m-lab/go v0.1.54/go.mod h1:O1D/EoVarJ8lZt9foANcqcKtwxHatBzUxXFFyC87aQQ=
+github.com/m-lab/go v0.1.58 h1:Byow2/BmhoKy6+0hHMx5WxZiD7lF7fQcnEMtaHNxkC0=
+github.com/m-lab/go v0.1.58/go.mod h1:O1D/EoVarJ8lZt9foANcqcKtwxHatBzUxXFFyC87aQQ=
 github.com/m-lab/tcp-info v1.5.3/go.mod h1:bkvI4qbjB6QVC2tsLSHqf5OnIYcmuLEVjo7+8YA56Kg=
 github.com/m-lab/uuid-annotator v0.4.1/go.mod h1:f/zvgcc5A3HQ1Y63HWpbBVXNcsJwQ4uRIOqsF/nyto8=
 github.com/m-lab/uuid-annotator v0.4.5 h1:YSgAwaYqgJ85Al+40DEc3NGBaL1t4TiZatdzXgFNTTI=

heartbeat/location_test.go

@@ -526,10 +526,12 @@ func TestIsValidInstance(t *testing.T) {
 			score:        validScore,
 			expected:     true,
 			expectedHost: host.Name{
+				Service: "ndt",
 				Machine: "mlab1",
 				Site:    "lga00",
 				Project: "mlab-sandbox",
 				Domain:  "measurement-lab.org",
+				Suffix:  "",
 				Version: "v2",
 			},
 			expectedDist: 296.043665,
@@ -545,10 +547,12 @@ func TestIsValidInstance(t *testing.T) {
 			score:        validScore,
 			expected:     true,
 			expectedHost: host.Name{
+				Service: "ndt",
 				Machine: "mlab1",
 				Site:    "lga00",
 				Project: "mlab-sandbox",
 				Domain:  "measurement-lab.org",
+				Suffix:  "",
 				Version: "v2",
 			},
 			expectedDist: 296.043665,
@@ -586,7 +590,7 @@ func TestIsValidInstance(t *testing.T) {
 			}
 
 			if gotHost != tt.expectedHost {
-				t.Errorf("isValidInstance() host got: %+v, want: %+v", gotHost, tt.expectedHost)
+				t.Errorf("isValidInstance() host got: %#v, want: %#v", gotHost, tt.expectedHost)
 			}
 
 			if math.Abs(gotDist-tt.expectedDist) > 0.01 {