Merge branch 'release/1.1.2'

agent.go

@@ -52,7 +52,7 @@ type (
 
 const (
 	// AgentVersion represents the version of the agent.
-	AgentVersion = "1.1.1"
+	AgentVersion = "1.1.2"
 	// DefaultListenAddr is the default address used by the web server.
 	DefaultListenAddr = "0.0.0.0"
 	// DefaultAgentPort is the default port exposed by the web server.

cmd/agent/main.go

@@ -79,16 +79,19 @@ func retrieveAdvertiseAddress() (string, error) {
 
 	var advertiseAddr string
 	for _, i := range ifaces {
-		if matched, _ := regexp.MatchString(`^(eth0)$||^(vEthernet) \(.*\)$`, i.Name); matched {
-			var ip net.IP
-			addrs, _ := i.Addrs()
+		if matched, _ := regexp.MatchString(`^(eth0)$|^(vEthernet) \(.*\)$`, i.Name); matched {
+			addrs, err := i.Addrs()
+			if err != nil {
+				return "", err
+			}
 
 			j := 0
 			// On Windows first IP address is link-local IPv6
 			if runtime.GOOS == "windows" {
 				j = 1
 			}
 
+			var ip net.IP
 			switch v := addrs[j].(type) {
 			case *net.IPNet:
 				ip = v.IP