Merge "veyron2/security: Remove use of FakePublicID in tests."
diff --git a/runtimes/google/rt/ipc.go b/runtimes/google/rt/ipc.go
index c4cf92f..0e1281a 100644
--- a/runtimes/google/rt/ipc.go
+++ b/runtimes/google/rt/ipc.go
@@ -12,11 +12,13 @@
"veyron.io/veyron/veyron2"
"veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/i18n"
"veyron.io/veyron/veyron2/ipc"
"veyron.io/veyron/veyron2/ipc/stream"
"veyron.io/veyron/veyron2/ipc/version"
"veyron.io/veyron/veyron2/naming"
"veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror2"
"veyron.io/veyron/veyron2/vtrace"
)
@@ -114,7 +116,10 @@
}
func (rt *vrt) NewContext() context.T {
- ctx, _ := ivtrace.WithNewSpan(iipc.InternalNewContext(rt), "Root")
+ ctx := iipc.InternalNewContext(rt)
+ ctx = i18n.ContextWithLangID(ctx, rt.lang)
+ ctx = verror2.ContextWithComponentName(ctx, rt.program)
+ ctx, _ = ivtrace.WithNewSpan(ctx, "Root")
return ctx
}
diff --git a/runtimes/google/rt/rt.go b/runtimes/google/rt/rt.go
index 4cd8779..3692c37 100644
--- a/runtimes/google/rt/rt.go
+++ b/runtimes/google/rt/rt.go
@@ -4,11 +4,13 @@
"flag"
"fmt"
"os"
+ "path/filepath"
"strings"
"sync"
"veyron.io/veyron/veyron2"
"veyron.io/veyron/veyron2/config"
+ "veyron.io/veyron/veyron2/i18n"
"veyron.io/veyron/veyron2/ipc"
"veyron.io/veyron/veyron2/ipc/stream"
"veyron.io/veyron/veyron2/naming"
@@ -43,13 +45,16 @@
// TODO(ashankar,ataly): Variables to help with the transition between the
// old and new security model. Will be removed once the transition is complete.
useNewSecurityModelInIPCClients bool
+
+ lang i18n.LangID // Language, from environment variables.
+ program string // Program name, from os.Args[0].
}
var _ veyron2.Runtime = (*vrt)(nil)
// Implements veyron2/rt.New
func New(opts ...veyron2.ROpt) (veyron2.Runtime, error) {
- rt := &vrt{mgmt: new(mgmtImpl)}
+ rt := &vrt{mgmt: new(mgmtImpl), lang: i18n.LangIDFromEnv(), program: filepath.Base(os.Args[0])}
flag.Parse()
rt.initHTTPDebugServer()
nsRoots := []string{}
