Merge pull request #26552 from vespa-engine/arnej/cosmetic-log-message

minor (cosmetic) changes to startup log messages

3 files changed, 10 insertions, 3 deletions

diff --git a/client/go/internal/admin/jvm/container.go b/client/go/internal/admin/jvm/container.go
index d7bdeae43b6..32110c5e1bc 100644
--- a/client/go/internal/admin/jvm/container.go
+++ b/client/go/internal/admin/jvm/container.go
@@ -68,8 +68,8 @@ func (cb *containerBase) Exec() {
 	if cb.propsFile != "" {
 		writeEnvAsProperties(p.EffectiveEnv(), cb.propsFile)
 	}
-	trace.Info("starting container; env:", readableEnv(p.Env))
-	trace.Info("starting container; exec:", argv)
+	trace.Info("JVM env:", readableEnv(p.Env))
+	trace.Info("JVM exec:", argv)
 	err := p.Run()
 	util.JustExitWith(err)
 }
diff --git a/client/go/internal/admin/trace/log.go b/client/go/internal/admin/trace/log.go
index 0254d0e4f4a..7b7fe6d29ec 100644
--- a/client/go/internal/admin/trace/log.go
+++ b/client/go/internal/admin/trace/log.go
@@ -13,6 +13,12 @@ import (
 	"github.com/vespa-engine/vespa/client/go/internal/admin/envvars"
 )
 
+func getComponent() string {
+	s := os.Args[0]
+	parts := strings.Split(s, "/")
+	return parts[len(parts)-1]
+}
+
 // make a vespa-format log line
 
 func logMessage(l outputLevel, msg string) {
@@ -24,7 +30,7 @@ func logMessage(l outputLevel, msg string) {
 	if service == "" {
 		service = "-"
 	}
-	component := "stderr"
+	component := getComponent()
 	level := "error"
 	switch l {
 	case levelWarning:
diff --git a/client/go/internal/admin/vespa-wrapper/services/configproxy.go b/client/go/internal/admin/vespa-wrapper/services/configproxy.go
index 9807d8d4591..0ff3e865c0a 100644
--- a/client/go/internal/admin/vespa-wrapper/services/configproxy.go
+++ b/client/go/internal/admin/vespa-wrapper/services/configproxy.go
@@ -25,6 +25,7 @@ const (
 )
 
 func JustRunConfigproxy() int {
+	os.Setenv(envvars.VESPA_SERVICE_NAME, PROXY_SERVICE_NAME)
 	commonPreChecks()
 	vespa.CheckCorrectUser()
 	configsources := defaults.VespaConfigserverRpcAddrs()