Merge pull request #15 from instana/better_announce_under_kubernetes

Improved Announce Under Kubernetes

fsm.go

@@ -130,10 +130,9 @@ func (r *fsmS) announceSensor(e *f.Event) {
 
 	go func(cb func(b bool, from *FromS)) {
 
-		d := &Discovery{
-			PID:  os.Getpid(),
-			Name: os.Args[0],
-			Args: os.Args[1:]}
+		d := &Discovery{PID: os.Getpid()}
+
+		d.Name, d.Args = getCommandLine()
 
 		var socket net.Conn
 		if _, err := os.Stat("/proc"); err == nil {

util.go

@@ -1,7 +1,11 @@
 package instana
 
 import (
+	"io/ioutil"
 	"math/rand"
+	"os"
+	"strconv"
+	"strings"
 	"sync"
 	"time"
 )
@@ -16,3 +20,23 @@ func randomID() uint64 {
 	defer seededIDLock.Unlock()
 	return uint64(seededIDGen.Int63())
 }
+
+func getCommandLine() (string, []string) {
+	var cmdline_path string = "/proc/" + strconv.Itoa(os.Getpid()) + "/cmdline"
+
+	cmdline, err := ioutil.ReadFile(cmdline_path)
+
+	if err != nil {
+		log.debug("No /proc.  Returning OS reported cmdline")
+		return os.Args[0], os.Args[1:]
+	}
+
+	parts := strings.FieldsFunc(string(cmdline), func(c rune) bool {
+		if c == '\u0000' {
+			return true
+		}
+		return false
+	})
+	log.debug("cmdline says:", parts[0], parts[1:])
+	return parts[0], parts[1:]
+}