reverse resolutions for remote side of connections.

probe/endpoint/reporter.go

@@ -26,6 +26,7 @@ type Reporter struct {
 	includeNAT       bool
 	conntracker      *Conntracker
 	natmapper        *natmapper
+	revResolver      *ReverseResolver
 }
 
 // SpyDuration is an exported prometheus metric
@@ -70,6 +71,7 @@ func NewReporter(hostID, hostName string, includeProcesses bool, useConntrack bo
 		includeProcesses: includeProcesses,
 		conntracker:      conntracker,
 		natmapper:        natmapper,
+		revResolver:      NewReverseResolver(),
 	}
 }
 
@@ -81,6 +83,7 @@ func (r *Reporter) Stop() {
 	if r.natmapper != nil {
 		r.natmapper.Stop()
 	}
+	r.revResolver.Stop()
 }
 
 // Report implements Reporter.
@@ -145,6 +148,13 @@ func (r *Reporter) addConnection(rpt *report.Report, localAddr, remoteAddr strin
 			})
 		)
 
+		// in case we have a reverse resolution for the IP, we can use it for the name...
+		if revRemoteName, err := r.revResolver.Get(remoteAddr); err == nil {
+			remoteNode = remoteNode.AddMetadata(map[string]string{
+				"name": revRemoteName,
+			})
+		}
+
 		if localIsClient {
 			// New nodes are merged into the report so we don't need to do any counting here; the merge does it for us.
 			localNode = localNode.WithEdge(remoteAddressNodeID, report.EdgeMetadata{
@@ -177,6 +187,13 @@ func (r *Reporter) addConnection(rpt *report.Report, localAddr, remoteAddr strin
 			})
 		)
 
+		// in case we have a reverse resolution for the IP, we can use it for the name...
+		if revRemoteName, err := r.revResolver.Get(remoteAddr); err == nil {
+			remoteNode = remoteNode.AddMetadata(map[string]string{
+				"name": revRemoteName,
+			})
+		}
+
 		if localIsClient {
 			// New nodes are merged into the report so we don't need to do any counting here; the merge does it for us.
 			localNode = localNode.WithEdge(remoteEndpointNodeID, report.EdgeMetadata{

probe/endpoint/reporter_test.go

@@ -54,7 +54,7 @@ var (
 			LocalAddress:  fixLocalAddress,
 			LocalPort:     fixLocalPort,
 			RemoteAddress: fixRemoteAddress,
-			RemotePort:    fixRemotePortB,
+			RemotePort:    fixRemotePort,
 			Proc: procspy.Proc{
 				PID:  fixProcessPID,
 				Name: fixProcessName,

probe/endpoint/resolver.go

@@ -0,0 +1,76 @@
+package endpoint
+
+import (
+	"net"
+	"strings"
+	"time"
+
+	"github.com/bluele/gcache"
+)
+
+const (
+	rAddrCacheLen        = 500 // Default cache length
+	rAddrBacklog         = 1000
+	rAddrCacheExpiration = 30 * time.Minute
+)
+
+type revResFunc func(addr string) (names []string, err error)
+
+// ReverseResolver is a caching, reverse resolver
+type ReverseResolver struct {
+	addresses chan string
+	cache     gcache.Cache
+	Throttle  <-chan time.Time // Made public for mocking
+	Resolver  revResFunc
+}
+
+// NewReverseResolver starts a new reverse resolver that
+// performs reverse resolutions and caches the result.
+func NewReverseResolver() *ReverseResolver {
+	r := ReverseResolver{
+		addresses: make(chan string, rAddrBacklog),
+		cache:     gcache.New(rAddrCacheLen).LRU().Expiration(rAddrCacheExpiration).Build(),
+		Throttle:  time.Tick(time.Second / 10),
+		Resolver:  net.LookupAddr,
+	}
+	go r.loop()
+	return &r
+}
+
+// Get the reverse resolution for an IP address if already in the cache,
+// a gcache.NotFoundKeyError error otherwise.
+// Note: it returns one of the possible names that can be obtained for that IP.
+func (r *ReverseResolver) Get(address string) (string, error) {
+	val, err := r.cache.Get(address)
+	if err == nil {
+		return val.(string), nil
+	}
+	if err == gcache.NotFoundKeyError {
+		// we trigger a asynchronous reverse resolution when not cached
+		select {
+		case r.addresses <- address:
+		default:
+		}
+	}
+	return "", err
+}
+
+func (r *ReverseResolver) loop() {
+	for request := range r.addresses {
+		<-r.Throttle // rate limit our DNS resolutions
+		// and check if the answer is already in the cache
+		if _, err := r.cache.Get(request); err == nil {
+			continue
+		}
+		names, err := r.Resolver(request)
+		if err == nil && len(names) > 0 {
+			name := strings.TrimRight(names[0], ".")
+			r.cache.Set(request, name)
+		}
+	}
+}
+
+// Stop the async reverse resolver
+func (r *ReverseResolver) Stop() {
+	close(r.addresses)
+}

probe/endpoint/resolver_test.go

@@ -0,0 +1,38 @@
+package endpoint_test
+
+import (
+	"errors"
+	"testing"
+	"time"
+
+	. "github.com/weaveworks/scope/probe/endpoint"
+	"github.com/weaveworks/scope/test"
+)
+
+func TestReverseResolver(t *testing.T) {
+	tests := map[string]string{
+		"1.2.3.4": "test.domain.name",
+		"4.3.2.1": "im.a.little.tea.pot",
+	}
+
+	revRes := NewReverseResolver()
+	defer revRes.Stop()
+
+	// use a mocked resolver function
+	revRes.Resolver = func(addr string) (names []string, err error) {
+		if name, ok := tests[addr]; ok {
+			return []string{name}, nil
+		}
+		return []string{}, errors.New("invalid IP")
+	}
+
+	// Up the rate limit so the test runs faster
+	revRes.Throttle = time.Tick(time.Millisecond)
+
+	for ip, hostname := range tests {
+		test.Poll(t, 100*time.Millisecond, hostname, func() interface{} {
+			result, _ := revRes.Get(ip)
+			return result
+		})
+	}
+}

render/detailed_node.go

@@ -205,22 +205,25 @@ func OriginTable(r report.Report, originID string, addHostTags bool, addContaine
 
 func connectionDetailsRows(topology report.Topology, originID string) []Row {
 	rows := []Row{}
-	labeler := func(nodeID string) (string, bool) {
+	labeler := func(nodeID string, meta map[string]string) (string, bool) {
 		if _, addr, port, ok := report.ParseEndpointNodeID(nodeID); ok {
+			if name, ok := meta["name"]; ok {
+				return fmt.Sprintf("%s:%s", name, port), true
+			}
 			return fmt.Sprintf("%s:%s", addr, port), true
 		}
 		if _, addr, ok := report.ParseAddressNodeID(nodeID); ok {
 			return addr, true
 		}
 		return "", false
 	}
-	local, ok := labeler(originID)
+	local, ok := labeler(originID, topology.Nodes[originID].Metadata)
 	if !ok {
 		return rows
 	}
 	// Firstly, collection outgoing connections from this node.
 	for _, serverNodeID := range topology.Nodes[originID].Adjacency {
-		remote, ok := labeler(serverNodeID)
+		remote, ok := labeler(serverNodeID, topology.Nodes[serverNodeID].Metadata)
 		if !ok {
 			continue
 		}
@@ -239,7 +242,7 @@ func connectionDetailsRows(topology report.Topology, originID string) []Row {
 		if !serverNodeIDs.Contains(originID) {
 			continue
 		}
-		remote, ok := labeler(clientNodeID)
+		remote, ok := labeler(clientNodeID, clientNode.Metadata)
 		if !ok {
 			continue
 		}

report/topology.go

@@ -102,6 +102,12 @@ func (n Node) WithMetadata(m map[string]string) Node {
 	return result
 }
 
+// AddMetadata returns a fresh copy of n, with Metadata set to the merge of n and the metadata provided
+func (n Node) AddMetadata(m map[string]string) Node {
+	additional := MakeNodeWith(m)
+	return n.Merge(additional)
+}
+
 // WithCounters returns a fresh copy of n, with Counters set to c
 func (n Node) WithCounters(c map[string]int) Node {
 	result := n.Copy()