From b33c5167588cbb574aea89631dbd402c609208cf Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@weave.works>
Date: Fri, 26 Feb 2016 12:58:07 +0000
Subject: [PATCH] Review feedback+test

---
 probe/docker/reporter_test.go | 11 +++++++----
 probe/host/tagger.go          | 11 +++--------
 probe/host/tagger_test.go     |  8 +-------
 prog/probe.go                 |  2 +-
 report/report.go              |  2 --
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/probe/docker/reporter_test.go b/probe/docker/reporter_test.go
index 639d2b32d..2be0f698f 100644
--- a/probe/docker/reporter_test.go
+++ b/probe/docker/reporter_test.go
@@ -50,8 +50,10 @@ var (
 )
 
 func TestReporter(t *testing.T) {
+	var controlProbeID = "a1b2c3d4"
+
 	containerImageNodeID := report.MakeContainerImageNodeID("baz")
-	rpt, err := docker.NewReporter(mockRegistryInstance, "host1", "probeID", nil).Report()
+	rpt, err := docker.NewReporter(mockRegistryInstance, "host1", controlProbeID, nil).Report()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -65,9 +67,10 @@ func TestReporter(t *testing.T) {
 		}
 
 		for k, want := range map[string]string{
-			docker.ContainerID:   "ping",
-			docker.ContainerName: "pong",
-			docker.ImageID:       "baz",
+			docker.ContainerID:    "ping",
+			docker.ContainerName:  "pong",
+			docker.ImageID:        "baz",
+			report.ControlProbeID: controlProbeID,
 		} {
 			if have, ok := node.Latest.Lookup(k); !ok || have != want {
 				t.Errorf("Expected container %s latest %q: %q, got %q", containerNodeID, k, want, have)
diff --git a/probe/host/tagger.go b/probe/host/tagger.go
index 7f999d974..105104b82 100644
--- a/probe/host/tagger.go
+++ b/probe/host/tagger.go
@@ -9,15 +9,13 @@ import (
 // in every topology to an origin host node in the host topology.
 type Tagger struct {
 	hostNodeID string
-	probeID    string
 }
 
 // NewTagger tags each node with a foreign key linking it to its origin host
 // in the host topology.
-func NewTagger(hostID, probeID string) Tagger {
+func NewTagger(hostID string) Tagger {
 	return Tagger{
 		hostNodeID: report.MakeHostNodeID(hostID),
-		probeID:    probeID,
 	}
 }
 
@@ -27,11 +25,8 @@ func (Tagger) Name() string { return "Host" }
 // Tag implements Tagger.
 func (t Tagger) Tag(r report.Report) (report.Report, error) {
 	var (
-		metadata = map[string]string{
-			report.HostNodeID: t.hostNodeID,
-			report.ProbeID:    t.probeID,
-		}
-		parents = report.EmptySets.Add(report.Host, report.MakeStringSet(t.hostNodeID))
+		metadata = map[string]string{report.HostNodeID: t.hostNodeID}
+		parents  = report.EmptySets.Add(report.Host, report.MakeStringSet(t.hostNodeID))
 	)
 
 	// Explicity don't tag Endpoints and Addresses - These topologies include pseudo nodes,
diff --git a/probe/host/tagger_test.go b/probe/host/tagger_test.go
index 4bf0cb171..bc35b31e2 100644
--- a/probe/host/tagger_test.go
+++ b/probe/host/tagger_test.go
@@ -10,14 +10,13 @@ import (
 func TestTagger(t *testing.T) {
 	var (
 		hostID         = "foo"
-		probeID        = "a1b2c3d4"
 		endpointNodeID = report.MakeEndpointNodeID(hostID, "1.2.3.4", "56789") // hostID ignored
 		node           = report.MakeNodeWith(map[string]string{"foo": "bar"})
 	)
 
 	r := report.MakeReport()
 	r.Process.AddNode(endpointNodeID, node)
-	rpt, _ := host.NewTagger(hostID, probeID).Tag(r)
+	rpt, _ := host.NewTagger(hostID).Tag(r)
 	have := rpt.Process.Nodes[endpointNodeID].Copy()
 
 	// It should now have the host ID
@@ -26,11 +25,6 @@ func TestTagger(t *testing.T) {
 		t.Errorf("Expected %q got %q", wantHostID, report.MakeHostNodeID(hostID))
 	}
 
-	// It should now have the probe ID
-	if haveProbeID, ok := have.Latest.Lookup(report.ProbeID); !ok || haveProbeID != probeID {
-		t.Errorf("Expected %q got %q", probeID, haveProbeID)
-	}
-
 	// It should still have the other keys
 	want := "bar"
 	if have, ok := have.Latest.Lookup("foo"); !ok || have != want {
diff --git a/prog/probe.go b/prog/probe.go
index f170ab5df..fadbc0529 100644
--- a/prog/probe.go
+++ b/prog/probe.go
@@ -146,7 +146,7 @@ func probeMain() {
 		host.NewReporter(hostID, hostName),
 		process.NewReporter(processCache, hostID, process.GetDeltaTotalJiffies),
 	)
-	p.AddTagger(probe.NewTopologyTagger(), host.NewTagger(hostID, probeID))
+	p.AddTagger(probe.NewTopologyTagger(), host.NewTagger(hostID))
 
 	if *dockerEnabled {
 		if err := report.AddLocalBridge(*dockerBridge); err != nil {
diff --git a/report/report.go b/report/report.go
index be5662ecc..5c0ad3e5b 100644
--- a/report/report.go
+++ b/report/report.go
@@ -207,8 +207,6 @@ const (
 	// a node in the host topology. That host node is the origin host, where
 	// the node was originally detected.
 	HostNodeID = "host_node_id"
-	// ProbeID is the random ID of the probe which generated the specific node.
-	ProbeID = "probe_id"
 	// ControlProbeID is the random ID of the probe which controls the specific node.
 	ControlProbeID = "control_probe_id"
 )