Merge "veyron2/ipc: Server context should have a method to return a context.T."
diff --git a/runtimes/google/ipc/glob.go b/runtimes/google/ipc/glob.go
index 2e5dddd..6e89d01 100644
--- a/runtimes/google/ipc/glob.go
+++ b/runtimes/google/ipc/glob.go
@@ -322,6 +322,7 @@
}
}
+func (c *mutableContext) Context() context.T { return c.T }
func (c *mutableContext) Timestamp() time.Time { return c.M.Timestamp }
func (c *mutableContext) Method() string { return c.M.Method }
func (c *mutableContext) MethodTags() []interface{} { return c.M.MethodTags }
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index ba7258a..6fbdd4e 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -1169,6 +1169,9 @@
//nologcall
return fs.tags
}
+func (fs *flowServer) Context() context.T {
+ return fs.T
+}
// TODO(cnicolaou): remove Name from ipc.ServerContext and all of
// its implementations
