Use hostname for probe ID

probe/main.go

@@ -4,14 +4,12 @@ import (
 	"flag"
 	"fmt"
 	"log"
-	"math/rand"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
 	"os/signal"
 	"runtime"
-	"strconv"
 	"strings"
 	"syscall"
 	"time"
@@ -50,9 +48,12 @@ func main() {
 	)
 	flag.Parse()
 
-	rand.Seed(time.Now().UnixNano())
-	id := strconv.FormatInt(rand.Int63(), 16)
-	log.Printf("probe starting, version %s, ID %s", version, id)
+	var (
+		hostName = hostname()
+		hostID   = hostName // TODO: we should sanitize the hostname
+		probeID  = hostName // TODO: does this need to be a random string instead?
+	)
+	log.Printf("probe starting, version %s, ID %s", version, probeID)
 
 	if len(flag.Args()) > 0 {
 		targets = flag.Args()
@@ -78,7 +79,7 @@ func main() {
 		log.Printf("warning: process reporting enabled, but that requires root to find everything")
 	}
 
-	publisherFactory := func(target string) (xfer.Publisher, error) { return xfer.NewHTTPPublisher(target, *token, id) }
+	publisherFactory := func(target string) (xfer.Publisher, error) { return xfer.NewHTTPPublisher(target, *token, probeID) }
 	publishers := xfer.NewMultiPublisher(publisherFactory)
 	resolver := newStaticResolver(targets, publishers.Add)
 	defer resolver.Stop()
@@ -96,8 +97,6 @@ func main() {
 	}
 
 	var (
-		hostName     = hostname()
-		hostID       = hostName // TODO: we should sanitize the hostname
 		taggers      = []Tagger{newTopologyTagger(), host.NewTagger(hostID)}
 		reporters    = []Reporter{host.NewReporter(hostID, hostName, localNets), endpoint.NewReporter(hostID, hostName, *spyProcs)}
 		processCache *process.CachingWalker