profiles/internal: add logcop calls.
Change-Id: If9f229d4d48df6b91676c6afebeaf6cafce44947
diff --git a/profiles/internal/lib/appcycle/appcycle.go b/profiles/internal/lib/appcycle/appcycle.go
index c0017f4..9e9bc49 100644
--- a/profiles/internal/lib/appcycle/appcycle.go
+++ b/profiles/internal/lib/appcycle/appcycle.go
@@ -68,20 +68,24 @@
}
func (m *AppCycle) Stop() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
m.stop(v23.LocalStop)
}
func (*AppCycle) ForceStop() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
os.Exit(v23.ForceStopExitCode)
}
func (m *AppCycle) WaitForStop(ch chan<- string) {
+ defer vlog.LogCallf("ch=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
m.Lock()
defer m.Unlock()
m.waiters = append(m.waiters, ch)
}
func (m *AppCycle) TrackTask(ch chan<- v23.Task) {
+ defer vlog.LogCallf("ch=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
m.Lock()
defer m.Unlock()
if m.shutDown {
@@ -109,6 +113,7 @@
}
func (m *AppCycle) AdvanceGoal(delta int32) {
+ defer vlog.LogCallf("delta=%v", delta)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
if delta <= 0 {
return
}
@@ -116,6 +121,7 @@
}
func (m *AppCycle) AdvanceProgress(delta int32) {
+ defer vlog.LogCallf("delta=%v", delta)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
if delta <= 0 {
return
}
@@ -123,10 +129,12 @@
}
func (m *AppCycle) Remote() interface{} {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return public.AppCycleServer(m.disp)
}
func (d *invoker) Stop(ctx *context.T, call public.AppCycleStopServerCall) error {
+ defer vlog.LogCallf("ctx=,call=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
blessings, _ := security.RemoteBlessingNames(ctx, call.Security())
vlog.Infof("AppCycle Stop request from %v", blessings)
// The size of the channel should be reasonably sized to expect not to
@@ -150,6 +158,7 @@
}
func (d *invoker) ForceStop(*context.T, rpc.ServerCall) error {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
d.ac.ForceStop()
return fmt.Errorf("ForceStop should not reply as the process should be dead")
}
diff --git a/profiles/internal/naming/endpoint.go b/profiles/internal/naming/endpoint.go
index 6f70248..d1b238f 100644
--- a/profiles/internal/naming/endpoint.go
+++ b/profiles/internal/naming/endpoint.go
@@ -14,6 +14,7 @@
"v.io/v23/naming"
"v.io/x/lib/metadata"
+ "v.io/x/lib/vlog"
)
const (
@@ -156,6 +157,7 @@
var defaultVersion = 5
func (ep *Endpoint) VersionedString(version int) string {
+ defer vlog.LogCallf("version=%v", version)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
switch version {
default:
return ep.VersionedString(defaultVersion)
diff --git a/profiles/internal/naming/namespace/glob.go b/profiles/internal/naming/namespace/glob.go
index e81d052..e9c5ff9 100644
--- a/profiles/internal/naming/namespace/glob.go
+++ b/profiles/internal/naming/namespace/glob.go
@@ -230,7 +230,7 @@
// Glob implements naming.MountTable.Glob.
func (ns *namespace) Glob(ctx *context.T, pattern string, opts ...naming.NamespaceOpt) (chan naming.GlobReply, error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,pattern=%.10s...,opts...=%v", pattern, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// Root the pattern. If we have no servers to query, give up.
e, patternWasRooted := ns.rootMountEntry(pattern)
if len(e.Servers) == 0 {
diff --git a/profiles/internal/naming/namespace/mount.go b/profiles/internal/naming/namespace/mount.go
index b42ddc4..600028d 100644
--- a/profiles/internal/naming/namespace/mount.go
+++ b/profiles/internal/naming/namespace/mount.go
@@ -26,8 +26,7 @@
// Mount implements Namespace.Mount.
func (ns *namespace) Mount(ctx *context.T, name, server string, ttl time.Duration, opts ...naming.NamespaceOpt) error {
- defer vlog.LogCall()()
-
+ defer vlog.LogCallf("ctx=,name=%.10s...,server=%.10s...,ttl=%v,opts...=%v", name, server, ttl, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
var flags naming.MountFlag
for _, o := range opts {
// NB: used a switch since we'll be adding more options.
@@ -67,7 +66,7 @@
// Unmount implements Namespace.Unmount.
func (ns *namespace) Unmount(ctx *context.T, name, server string, opts ...naming.NamespaceOpt) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,server=%.10s...,opts...=%v", name, server, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// Unmount the server from all the mount tables.
client := v23.GetClient(ctx)
f := func(ctx *context.T, mt, id string) status {
@@ -89,7 +88,7 @@
// RDeleteemove implements Namespace.Delete.
func (ns *namespace) Delete(ctx *context.T, name string, deleteSubtree bool, opts ...naming.NamespaceOpt) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,deleteSubtree=%v,opts...=%v", name, deleteSubtree, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// Remove from all the mount tables.
client := v23.GetClient(ctx)
f := func(ctx *context.T, mt, id string) status {
diff --git a/profiles/internal/naming/namespace/namespace.go b/profiles/internal/naming/namespace/namespace.go
index bda109e..0533432 100644
--- a/profiles/internal/naming/namespace/namespace.go
+++ b/profiles/internal/naming/namespace/namespace.go
@@ -71,7 +71,7 @@
// SetRoots implements naming.Namespace.SetRoots
func (ns *namespace) SetRoots(roots ...string) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("roots...=%v", roots)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// Allow roots to be cleared with a call of SetRoots()
if len(roots) > 0 && !rooted(roots) {
return badRoots(roots)
@@ -175,7 +175,7 @@
// CacheCtl implements naming.Namespace.CacheCtl
func (ns *namespace) CacheCtl(ctls ...naming.CacheCtl) []naming.CacheCtl {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctls...=%v", ctls)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
for _, c := range ctls {
switch v := c.(type) {
case naming.DisableCache:
diff --git a/profiles/internal/naming/namespace/perms.go b/profiles/internal/naming/namespace/perms.go
index ed97813..19a1e0a 100644
--- a/profiles/internal/naming/namespace/perms.go
+++ b/profiles/internal/naming/namespace/perms.go
@@ -23,7 +23,7 @@
}
func (ns *namespace) SetPermissions(ctx *context.T, name string, perms access.Permissions, version string, opts ...naming.NamespaceOpt) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,perms=,version=%.10s...,opts...=%v", name, version, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
client := v23.GetClient(ctx)
// Apply to all mount tables implementing the name.
@@ -37,7 +37,7 @@
// GetPermissions gets Permissions from a mount table.
func (ns *namespace) GetPermissions(ctx *context.T, name string, opts ...naming.NamespaceOpt) (perms access.Permissions, version string, err error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,opts...=%v", name, opts)("perms=,version=%.10s...,err=%v", &version, &err) // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
client := v23.GetClient(ctx)
// Resolve to all the mount tables implementing name.
diff --git a/profiles/internal/naming/namespace/resolve.go b/profiles/internal/naming/namespace/resolve.go
index 96b08f8..562359b 100644
--- a/profiles/internal/naming/namespace/resolve.go
+++ b/profiles/internal/naming/namespace/resolve.go
@@ -61,7 +61,7 @@
// Resolve implements v.io/v23/naming.Namespace.
func (ns *namespace) Resolve(ctx *context.T, name string, opts ...naming.NamespaceOpt) (*naming.MountEntry, error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,opts...=%v", name, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
e, _ := ns.rootMountEntry(name, opts...)
if vlog.V(2) {
_, file, line, _ := runtime.Caller(1)
@@ -105,7 +105,7 @@
// ResolveToMountTable implements v.io/v23/naming.Namespace.
func (ns *namespace) ResolveToMountTable(ctx *context.T, name string, opts ...naming.NamespaceOpt) (*naming.MountEntry, error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,opts...=%v", name, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
e, _ := ns.rootMountEntry(name, opts...)
if vlog.V(2) {
_, file, line, _ := runtime.Caller(1)
@@ -156,7 +156,7 @@
// FlushCache flushes the most specific entry found for name. It returns true if anything was
// actually flushed.
func (ns *namespace) FlushCacheEntry(name string) bool {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("name=%.10s...", name)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
flushed := false
for _, n := range ns.rootName(name) {
// Walk the cache as we would in a resolution. Unlike a resolution, we have to follow
diff --git a/profiles/internal/rpc/client.go b/profiles/internal/rpc/client.go
index f00c4ba..4e61ff9 100644
--- a/profiles/internal/rpc/client.go
+++ b/profiles/internal/rpc/client.go
@@ -185,13 +185,12 @@
}
func (c *client) StartCall(ctx *context.T, name, method string, args []interface{}, opts ...rpc.CallOpt) (rpc.ClientCall, error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,method=%.10s...,args=,opts...=%v", name, method, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return c.startCall(ctx, name, method, args, opts)
}
func (c *client) Call(ctx *context.T, name, method string, inArgs, outArgs []interface{}, opts ...rpc.CallOpt) error {
- defer vlog.LogCall()()
-
+ defer vlog.LogCallf("ctx=,name=%.10s...,method=%.10s...,inArgs=,outArgs=,opts...=%v", name, method, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
deadline := getDeadline(ctx, opts)
var lastErr error
@@ -729,7 +728,7 @@
}
func (c *client) Close() {
- defer vlog.LogCall()()
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
for _, v := range c.vcCache.Close() {
c.streamMgr.ShutdownEndpoint(v.RemoteEndpoint())
}
@@ -852,7 +851,7 @@
}
func (fc *flowClient) Send(item interface{}) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("item=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
if fc.sendClosed {
return verror.New(verror.ErrAborted, fc.ctx)
}
@@ -896,7 +895,7 @@
}
func (fc *flowClient) Recv(itemptr interface{}) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("itemptr=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
switch {
case fc.response.Error != nil:
// TODO(cnicolaou): this will become a verror.E when we convert the
@@ -935,7 +934,7 @@
}
func (fc *flowClient) CloseSend() error {
- defer vlog.LogCall()()
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return fc.closeSend()
}
@@ -967,7 +966,7 @@
}
func (fc *flowClient) Finish(resultptrs ...interface{}) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("resultptrs...=%v", resultptrs)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
err := fc.finish(resultptrs...)
vtrace.GetSpan(fc.ctx).Finish()
return err
@@ -1044,6 +1043,7 @@
}
func (fc *flowClient) RemoteBlessings() ([]string, security.Blessings) {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return fc.server, fc.flow.RemoteBlessings()
}
diff --git a/profiles/internal/rpc/discharges.go b/profiles/internal/rpc/discharges.go
index 9417172..a5dd1d9 100644
--- a/profiles/internal/rpc/discharges.go
+++ b/profiles/internal/rpc/discharges.go
@@ -23,8 +23,12 @@
// NoDischarges specifies that the RPC call should not fetch discharges.
type NoDischarges struct{}
-func (NoDischarges) RPCCallOpt() {}
-func (NoDischarges) NSOpt() {}
+func (NoDischarges) RPCCallOpt() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+}
+func (NoDischarges) NSOpt() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+}
// discharger implements vc.DischargeClient.
type dischargeClient struct {
diff --git a/profiles/internal/rpc/options.go b/profiles/internal/rpc/options.go
index 5a61261..f5ab563 100644
--- a/profiles/internal/rpc/options.go
+++ b/profiles/internal/rpc/options.go
@@ -11,6 +11,7 @@
"v.io/v23/options"
"v.io/v23/rpc"
+ "v.io/x/lib/vlog"
"v.io/x/ref/profiles/internal/rpc/stream"
)
@@ -19,13 +20,17 @@
// and to order them in the specified order.
type PreferredProtocols []string
-func (PreferredProtocols) RPCClientOpt() {}
+func (PreferredProtocols) RPCClientOpt() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+}
// This option is used to sort and filter the endpoints when resolving the
// proxy name from a mounttable.
type PreferredServerResolveProtocols []string
-func (PreferredServerResolveProtocols) RPCServerOpt() {}
+func (PreferredServerResolveProtocols) RPCServerOpt() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+}
// ReservedNameDispatcher specifies the dispatcher that controls access
// to framework managed portion of the namespace.
@@ -33,7 +38,9 @@
Dispatcher rpc.Dispatcher
}
-func (ReservedNameDispatcher) RPCServerOpt() {}
+func (ReservedNameDispatcher) RPCServerOpt() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+}
func getRetryTimeoutOpt(opts []rpc.CallOpt) (time.Duration, bool) {
for _, o := range opts {
diff --git a/profiles/internal/rpc/reserved.go b/profiles/internal/rpc/reserved.go
index 249a043..03a63fc 100644
--- a/profiles/internal/rpc/reserved.go
+++ b/profiles/internal/rpc/reserved.go
@@ -44,6 +44,7 @@
}
func (r *reservedMethods) Describe__() []rpc.InterfaceDesc {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return []rpc.InterfaceDesc{{
Name: "__Reserved",
Doc: `Reserved methods implemented by the RPC framework. Each method name is prefixed with a double underscore "__".`,
@@ -354,8 +355,14 @@
return &derivedServerCall{src, src.Suffix(), sec}
}
-func (c *derivedServerCall) Suffix() string { return c.suffix }
-func (c *derivedServerCall) Security() security.Call { return c.security }
+func (c *derivedServerCall) Suffix() string {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+ return c.suffix
+}
+func (c *derivedServerCall) Security() security.Call {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+ return c.security
+}
type derivedSecurityCall struct {
security.Call
@@ -371,5 +378,11 @@
return &derivedSecurityCall{src, src.Suffix(), tags}
}
-func (c *derivedSecurityCall) Suffix() string { return c.suffix }
-func (c *derivedSecurityCall) MethodTags() []*vdl.Value { return c.methodTags }
+func (c *derivedSecurityCall) Suffix() string {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+ return c.suffix
+}
+func (c *derivedSecurityCall) MethodTags() []*vdl.Value {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+ return c.methodTags
+}
diff --git a/profiles/internal/rpc/server.go b/profiles/internal/rpc/server.go
index d289516..f89e327 100644
--- a/profiles/internal/rpc/server.go
+++ b/profiles/internal/rpc/server.go
@@ -253,6 +253,7 @@
}
func (s *server) Status() rpc.ServerStatus {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
status := rpc.ServerStatus{}
defer vlog.LogCall()()
s.Lock()
@@ -280,7 +281,7 @@
}
func (s *server) WatchNetwork(ch chan<- rpc.NetworkChange) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ch=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
s.Lock()
defer s.Unlock()
if s.dhcpState != nil {
@@ -289,7 +290,7 @@
}
func (s *server) UnwatchNetwork(ch chan<- rpc.NetworkChange) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ch=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
s.Lock()
defer s.Unlock()
if s.dhcpState != nil {
@@ -363,7 +364,7 @@
}
func (s *server) Listen(listenSpec rpc.ListenSpec) ([]naming.Endpoint, error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("listenSpec=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
useProxy := len(listenSpec.Proxy) > 0
if !useProxy && len(listenSpec.Addrs) == 0 {
return nil, verror.New(verror.ErrBadArg, s.ctx, "ListenSpec contains no proxy or addresses to listen on")
@@ -743,6 +744,7 @@
}
func (d leafDispatcher) Lookup(suffix string) (interface{}, security.Authorizer, error) {
+ defer vlog.LogCallf("suffix=%.10s...", suffix)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
if suffix != "" {
return nil, nil, verror.New(verror.ErrUnknownSuffix, nil, suffix)
}
@@ -750,7 +752,7 @@
}
func (s *server) Serve(name string, obj interface{}, authorizer security.Authorizer) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("name=%.10s...,obj=,authorizer=", name)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
if obj == nil {
return verror.New(verror.ErrBadArg, s.ctx, "nil object")
}
@@ -774,7 +776,7 @@
}
func (s *server) ServeDispatcher(name string, disp rpc.Dispatcher) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("name=%.10s...,disp=", name)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
if disp == nil {
return verror.New(verror.ErrBadArg, s.ctx, "nil dispatcher")
}
@@ -797,7 +799,7 @@
}
func (s *server) AddName(name string) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("name=%.10s...", name)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
if len(name) == 0 {
return verror.New(verror.ErrBadArg, s.ctx, "name is empty")
}
@@ -812,7 +814,7 @@
}
func (s *server) RemoveName(name string) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("name=%.10s...", name)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
s.Lock()
defer s.Unlock()
if err := s.allowed(publishing, "RemoveName"); err != nil {
@@ -823,6 +825,7 @@
}
func (s *server) Stop() error {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
serverDebug := fmt.Sprintf("Dispatcher: %T, Status:[%v]", s.disp, s.Status())
defer vlog.LogCall()()
vlog.VI(1).Infof("Stop: %s", serverDebug)
@@ -1269,7 +1272,7 @@
// Send implements the rpc.Stream method.
func (fs *flowServer) Send(item interface{}) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("item=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// The empty response header indicates what follows is a streaming result.
if err := fs.enc.Encode(rpc.Response{}); err != nil {
return err
@@ -1279,7 +1282,7 @@
// Recv implements the rpc.Stream method.
func (fs *flowServer) Recv(itemptr interface{}) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("itemptr=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
var req rpc.Request
if err := fs.dec.Decode(&req); err != nil {
return err
diff --git a/profiles/internal/rpc/server_authorizer.go b/profiles/internal/rpc/server_authorizer.go
index 5478b29..cda735d 100644
--- a/profiles/internal/rpc/server_authorizer.go
+++ b/profiles/internal/rpc/server_authorizer.go
@@ -12,6 +12,7 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/verror"
+ "v.io/x/lib/vlog"
)
// TODO(ribrdb): Flip this to true once everything is updated and also update
@@ -66,6 +67,7 @@
}
func (a *serverAuthorizer) Authorize(ctx *context.T, call security.Call) error {
+ defer vlog.LogCallf("ctx=,call=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
if call.RemoteBlessings().IsZero() {
return verror.New(errNoBlessingsFromServer, ctx)
}
diff --git a/profiles/internal/rpc/stream/errors.go b/profiles/internal/rpc/stream/errors.go
index 4aae55c..a51ee5e 100644
--- a/profiles/internal/rpc/stream/errors.go
+++ b/profiles/internal/rpc/stream/errors.go
@@ -8,6 +8,7 @@
"net"
"v.io/v23/verror"
+ "v.io/x/lib/vlog"
)
const pkgPath = "v.io/x/ref/profiles/internal/rpc/stream"
@@ -48,7 +49,10 @@
return &NetError{err, timeout, temporary}
}
-func (t NetError) Err() error { return t.err }
-func (t NetError) Error() string { return t.err.Error() }
+func (t NetError) Err() error { return t.err }
+func (t NetError) Error() string {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+ return t.err.Error()
+}
func (t NetError) Timeout() bool { return t.timeout }
func (t NetError) Temporary() bool { return t.temp }
diff --git a/profiles/internal/rpc/stream/manager/manager.go b/profiles/internal/rpc/stream/manager/manager.go
index 85c081f..b5a3807 100644
--- a/profiles/internal/rpc/stream/manager/manager.go
+++ b/profiles/internal/rpc/stream/manager/manager.go
@@ -83,7 +83,9 @@
type DialTimeout time.Duration
func (DialTimeout) RPCStreamVCOpt() {}
-func (DialTimeout) RPCClientOpt() {}
+func (DialTimeout) RPCClientOpt() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+}
func dial(network, address string, timeout time.Duration) (net.Conn, error) {
if d, _, _ := rpc.RegisteredProtocol(network); d != nil {
diff --git a/profiles/internal/rpc/stream/vc/vc.go b/profiles/internal/rpc/stream/vc/vc.go
index 7846d4e..46d807f 100644
--- a/profiles/internal/rpc/stream/vc/vc.go
+++ b/profiles/internal/rpc/stream/vc/vc.go
@@ -72,7 +72,9 @@
type DischargeExpiryBuffer time.Duration
func (DischargeExpiryBuffer) RPCStreamListenerOpt() {}
-func (DischargeExpiryBuffer) RPCServerOpt() {}
+func (DischargeExpiryBuffer) RPCServerOpt() {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
+}
const DefaultServerDischargeExpiryBuffer = 20 * time.Second
diff --git a/profiles/internal/rt/runtime.go b/profiles/internal/rt/runtime.go
index 88d092c..475be9b 100644
--- a/profiles/internal/rt/runtime.go
+++ b/profiles/internal/rt/runtime.go
@@ -179,6 +179,7 @@
}
func (r *Runtime) Init(ctx *context.T) error {
+ defer vlog.LogCallf("ctx=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return r.initMgmt(ctx)
}
@@ -213,10 +214,12 @@
}
func (*Runtime) NewEndpoint(ep string) (naming.Endpoint, error) {
+ defer vlog.LogCallf("ep=%.10s...", ep)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return inaming.NewEndpoint(ep)
}
func (r *Runtime) NewServer(ctx *context.T, opts ...rpc.ServerOpt) (rpc.Server, error) {
+ defer vlog.LogCallf("ctx=,opts...=%v", opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// Create a new RoutingID (and StreamManager) for each server.
sm, err := newStreamManager()
if err != nil {
@@ -295,6 +298,7 @@
}
func (r *Runtime) WithNewStreamManager(ctx *context.T) (*context.T, error) {
+ defer vlog.LogCallf("ctx=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
newctx, err := r.setNewStreamManager(ctx)
if err != nil {
return ctx, err
@@ -320,6 +324,7 @@
}
func (r *Runtime) WithPrincipal(ctx *context.T, principal security.Principal) (*context.T, error) {
+ defer vlog.LogCallf("ctx=,principal=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
var err error
newctx := ctx
@@ -345,11 +350,13 @@
}
func (*Runtime) GetPrincipal(ctx *context.T) security.Principal {
+ defer vlog.LogCallf("ctx=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
p, _ := ctx.Value(principalKey).(security.Principal)
return p
}
func (r *Runtime) WithNewClient(ctx *context.T, opts ...rpc.ClientOpt) (*context.T, rpc.Client, error) {
+ defer vlog.LogCallf("ctx=,opts...=%v", opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
otherOpts := append([]rpc.ClientOpt{}, opts...)
p, _ := ctx.Value(principalKey).(security.Principal)
@@ -376,6 +383,7 @@
}
func (*Runtime) GetClient(ctx *context.T) rpc.Client {
+ defer vlog.LogCallf("ctx=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
cl, _ := ctx.Value(clientKey).(rpc.Client)
return cl
}
@@ -397,6 +405,7 @@
}
func (r *Runtime) WithNewNamespace(ctx *context.T, roots ...string) (*context.T, namespace.T, error) {
+ defer vlog.LogCallf("ctx=,roots...=%v", roots)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
newctx, ns, err := r.setNewNamespace(ctx, roots...)
if err != nil {
return ctx, nil, err
@@ -412,16 +421,19 @@
}
func (*Runtime) GetNamespace(ctx *context.T) namespace.T {
+ // nologcall
ns, _ := ctx.Value(namespaceKey).(namespace.T)
return ns
}
func (*Runtime) GetAppCycle(ctx *context.T) v23.AppCycle {
+ // nologcall
id, _ := ctx.Value(initKey).(*initData)
return id.appCycle
}
func (*Runtime) GetListenSpec(ctx *context.T) rpc.ListenSpec {
+ // nologcall
if id, _ := ctx.Value(initKey).(*initData); id.listenSpec != nil {
return id.listenSpec.Copy()
}
@@ -429,6 +441,7 @@
}
func (*Runtime) WithBackgroundContext(ctx *context.T) *context.T {
+ defer vlog.LogCallf("ctx=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// Note we add an extra context with a nil value here.
// This prevents users from travelling back through the
// chain of background contexts.
@@ -437,6 +450,7 @@
}
func (*Runtime) GetBackgroundContext(ctx *context.T) *context.T {
+ // nologcall
bctx, _ := ctx.Value(backgroundKey).(*context.T)
if bctx == nil {
// There should always be a background context. If we don't find
@@ -449,10 +463,12 @@
}
func (*Runtime) WithReservedNameDispatcher(ctx *context.T, d rpc.Dispatcher) *context.T {
+ defer vlog.LogCallf("ctx=,d=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return context.WithValue(ctx, reservedNameKey, d)
}
func (*Runtime) GetReservedNameDispatcher(ctx *context.T) rpc.Dispatcher {
+ // nologcall
if d, ok := ctx.Value(reservedNameKey).(rpc.Dispatcher); ok {
return d
}
diff --git a/profiles/internal/testing/mocks/naming/namespace.go b/profiles/internal/testing/mocks/naming/namespace.go
index cdfe4b7..5bcea0f 100644
--- a/profiles/internal/testing/mocks/naming/namespace.go
+++ b/profiles/internal/testing/mocks/naming/namespace.go
@@ -40,7 +40,7 @@
}
func (ns *namespaceMock) Mount(ctx *context.T, name, server string, _ time.Duration, opts ...naming.NamespaceOpt) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,server=%.10s...,opts...=%v", name, server, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
ns.Lock()
defer ns.Unlock()
for n, _ := range ns.mounts {
@@ -58,7 +58,7 @@
}
func (ns *namespaceMock) Unmount(ctx *context.T, name, server string, opts ...naming.NamespaceOpt) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,server=%.10s...,opts...=%v", name, server, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
ns.Lock()
defer ns.Unlock()
e := ns.mounts[name]
@@ -84,7 +84,7 @@
}
func (ns *namespaceMock) Delete(ctx *context.T, name string, removeSubtree bool, opts ...naming.NamespaceOpt) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,removeSubtree=%v,opts...=%v", name, removeSubtree, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
ns.Lock()
defer ns.Unlock()
e := ns.mounts[name]
@@ -104,7 +104,7 @@
}
func (ns *namespaceMock) Resolve(ctx *context.T, name string, opts ...naming.NamespaceOpt) (*naming.MountEntry, error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,opts...=%v", name, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
_, name = security.SplitPatternName(name)
if address, suffix := naming.SplitAddressName(name); len(address) > 0 {
return &naming.MountEntry{
@@ -125,49 +125,49 @@
}
func (ns *namespaceMock) ResolveToMountTable(ctx *context.T, name string, opts ...naming.NamespaceOpt) (*naming.MountEntry, error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,opts...=%v", name, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// TODO(mattr): Implement this method for tests that might need it.
panic("ResolveToMountTable not implemented")
return nil, nil
}
func (ns *namespaceMock) FlushCacheEntry(name string) bool {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("name=%.10s...", name)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return false
}
func (ns *namespaceMock) CacheCtl(ctls ...naming.CacheCtl) []naming.CacheCtl {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctls...=%v", ctls)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
return nil
}
func (ns *namespaceMock) Glob(ctx *context.T, pattern string, opts ...naming.NamespaceOpt) (chan naming.GlobReply, error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,pattern=%.10s...,opts...=%v", pattern, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
// TODO(mattr): Implement this method for tests that might need it.
panic("Glob not implemented")
return nil, nil
}
func (ns *namespaceMock) SetRoots(...string) error {
- defer vlog.LogCall()()
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
panic("Calling SetRoots on a mock namespace. This is not supported.")
return nil
}
func (ns *namespaceMock) Roots() []string {
- defer vlog.LogCall()()
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
panic("Calling Roots on a mock namespace. This is not supported.")
return nil
}
func (ns *namespaceMock) GetPermissions(ctx *context.T, name string, opts ...naming.NamespaceOpt) (perms access.Permissions, version string, err error) {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,opts...=%v", name, opts)("perms=,version=%.10s...,err=%v", &version, &err) // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
panic("Calling GetPermissions on a mock namespace. This is not supported.")
return nil, "", nil
}
func (ns *namespaceMock) SetPermissions(ctx *context.T, name string, perms access.Permissions, version string, opts ...naming.NamespaceOpt) error {
- defer vlog.LogCall()()
+ defer vlog.LogCallf("ctx=,name=%.10s...,perms=,version=%.10s...,opts...=%v", name, version, opts)("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
panic("Calling SetPermissions on a mock namespace. This is not supported.")
return nil
}
diff --git a/profiles/internal/vtrace/store.go b/profiles/internal/vtrace/store.go
index 583ae13..9c0d77b 100644
--- a/profiles/internal/vtrace/store.go
+++ b/profiles/internal/vtrace/store.go
@@ -13,6 +13,7 @@
"v.io/v23/uniqueid"
"v.io/v23/vtrace"
+ "v.io/x/lib/vlog"
"v.io/x/ref/lib/flags"
)
@@ -60,6 +61,7 @@
}
func (s *Store) ForceCollect(id uniqueid.Id) {
+ defer vlog.LogCallf("id=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
s.mu.Lock()
s.forceCollectLocked(id)
s.mu.Unlock()
@@ -83,6 +85,7 @@
// Merge merges a vtrace.Response into the current store.
func (s *Store) Merge(t vtrace.Response) {
+ defer vlog.LogCallf("t=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
s.mu.Lock()
defer s.mu.Unlock()
@@ -158,6 +161,7 @@
// TraceRecords returns TraceRecords for all traces saved in the store.
func (s *Store) TraceRecords() []vtrace.TraceRecord {
+ defer vlog.LogCall()() // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
s.mu.Lock()
defer s.mu.Unlock()
@@ -173,6 +177,7 @@
// TraceRecord returns a TraceRecord for a given Id. Returns
// nil if the given id is not present.
func (s *Store) TraceRecord(id uniqueid.Id) *vtrace.TraceRecord {
+ defer vlog.LogCallf("id=")("") // AUTO-GENERATED, DO NOT EDIT, MUST BE FIRST STATEMENT
s.mu.Lock()
defer s.mu.Unlock()
out := &vtrace.TraceRecord{}
diff --git a/profiles/internal/vtrace/vtrace.go b/profiles/internal/vtrace/vtrace.go
index ed55e70..2dfc987 100644
--- a/profiles/internal/vtrace/vtrace.go
+++ b/profiles/internal/vtrace/vtrace.go
@@ -46,17 +46,32 @@
return s
}
-func (s *span) ID() uniqueid.Id { return s.id }
-func (s *span) Parent() uniqueid.Id { return s.parent }
-func (s *span) Name() string { return s.name }
-func (s *span) Trace() uniqueid.Id { return s.trace }
+func (s *span) ID() uniqueid.Id {
+ // nologcall
+ return s.id
+}
+func (s *span) Parent() uniqueid.Id {
+ // nologcall
+ return s.parent
+}
+func (s *span) Name() string {
+ // nologcall
+ return s.name
+}
+func (s *span) Trace() uniqueid.Id {
+ // nologcall
+ return s.trace
+}
func (s *span) Annotate(msg string) {
+ // nologcall
s.store.annotate(s, msg)
}
func (s *span) Annotatef(format string, a ...interface{}) {
+ // nologcall
s.store.annotate(s, fmt.Sprintf(format, a...))
}
func (s *span) Finish() {
+ // nologcall
s.store.finish(s)
}
func (s *span) flags() vtrace.TraceFlags {
@@ -79,6 +94,7 @@
// disconnected from the activity ctx is performing. For example
// this might be used to start background tasks.
func (m manager) WithNewTrace(ctx *context.T) (*context.T, vtrace.Span) {
+ // nologcall
id, err := uniqueid.Random()
if err != nil {
vlog.Errorf("vtrace: Couldn't generate Trace Id, debug data may be lost: %v", err)
@@ -93,6 +109,7 @@
// req contains the parameters needed to connect this span with it's
// trace.
func (m manager) WithContinuedTrace(ctx *context.T, name string, req vtrace.Request) (*context.T, vtrace.Span) {
+ // nologcall
st := getStore(ctx)
if req.Flags&vtrace.CollectInMemory != 0 {
st.ForceCollect(req.TraceId)
@@ -104,6 +121,7 @@
// WithNewSpan derives a context with a new Span that can be used to
// trace and annotate operations across process boundaries.
func (m manager) WithNewSpan(ctx *context.T, name string) (*context.T, vtrace.Span) {
+ // nologcall
if curSpan := getSpan(ctx); curSpan != nil {
if curSpan.store == nil {
panic("nil store")
@@ -118,6 +136,7 @@
// Span finds the currently active span.
func (m manager) GetSpan(ctx *context.T) vtrace.Span {
+ // nologcall
if span := getSpan(ctx); span != nil {
return span
}
@@ -126,6 +145,7 @@
// Request generates a vtrace.Request from the active Span.
func (m manager) GetRequest(ctx *context.T) vtrace.Request {
+ // nologcall
if span := getSpan(ctx); span != nil {
return vtrace.Request{
SpanId: span.id,
@@ -138,6 +158,7 @@
// Response captures the vtrace.Response for the active Span.
func (m manager) GetResponse(ctx *context.T) vtrace.Response {
+ // nologcall
if span := getSpan(ctx); span != nil {
return vtrace.Response{
Flags: span.flags(),
@@ -149,6 +170,7 @@
// Store returns the current vtrace.Store.
func (m manager) GetStore(ctx *context.T) vtrace.Store {
+ // nologcall
if store := getStore(ctx); store != nil {
return store
}
diff --git a/services/wspr/internal/lib/simple_client.go b/services/wspr/internal/lib/simple_client.go
index a50fc67..a46fd82 100644
--- a/services/wspr/internal/lib/simple_client.go
+++ b/services/wspr/internal/lib/simple_client.go
@@ -14,7 +14,6 @@
"v.io/v23/security"
"v.io/v23/vdl"
"v.io/v23/vom"
- "v.io/x/lib/vlog"
)
type clientWithTimesCalled interface {
@@ -50,7 +49,6 @@
// StartCall Implements rpc.Client
func (c *simpleMockClient) StartCall(ctx *context.T, name, method string, args []interface{}, opts ...rpc.CallOpt) (rpc.ClientCall, error) {
- defer vlog.LogCall()()
results, ok := c.results[method]
if !ok {
return nil, fmt.Errorf("method %s not found", method)
@@ -90,7 +88,6 @@
// Close implements rpc.Client
func (*simpleMockClient) Close() {
- defer vlog.LogCall()()
}
// mockCall implements rpc.ClientCall
@@ -101,18 +98,15 @@
// Cancel implements rpc.ClientCall
func (*mockCall) Cancel() {
- defer vlog.LogCall()()
}
// CloseSend implements rpc.ClientCall
func (*mockCall) CloseSend() error {
- defer vlog.LogCall()()
return nil
}
// Finish implements rpc.ClientCall
func (mc *mockCall) Finish(resultptrs ...interface{}) error {
- defer vlog.LogCall()()
if got, want := len(resultptrs), len(mc.results); got != want {
return errors.New(fmt.Sprintf("wrong number of output results; expected resultptrs of size %d but got %d", want, got))
}
@@ -136,12 +130,10 @@
//Send implements rpc.Stream
func (*mockStream) Send(interface{}) error {
- defer vlog.LogCall()()
return nil
}
//Recv implements rpc.Stream
func (*mockStream) Recv(interface{}) error {
- defer vlog.LogCall()()
return nil
}
