From 00c7deef344414c20e199e2f7af42fc5d935eade Mon Sep 17 00:00:00 2001
From: iamqizhao <toqizhao@gmail.com>
Date: Thu, 1 Oct 2015 18:07:38 -0700
Subject: [PATCH 1/2] show deadline on server side trace
---
server.go | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/server.go b/server.go
index e817f386..08e2ea98 100644
--- a/server.go
+++ b/server.go
@@ -292,6 +292,9 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
defer traceInfo.tr.Finish()
traceInfo.firstLine.client = false
traceInfo.firstLine.remoteAddr = t.RemoteAddr()
+ if dl, ok := ctx.Deadline(); ok {
+ traceInfo.firstLine.deadline = dl.Sub(time.Now())
+ }
traceInfo.tr.LazyLog(&traceInfo.firstLine, false)
ctx = trace.NewContext(ctx, traceInfo.tr)
defer func() {
@@ -399,6 +402,9 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
ss.traceInfo.tr = trace.New("grpc.Recv."+methodFamily(stream.Method()), stream.Method())
ss.traceInfo.firstLine.client = false
ss.traceInfo.firstLine.remoteAddr = t.RemoteAddr()
+ if dl, ok := ctx.Deadline(); ok {
+ traceInfo.firstLine.deadline = dl.Sub(time.Now())
+ }
ss.traceInfo.tr.LazyLog(&ss.traceInfo.firstLine, false)
ss.ctx = trace.NewContext(ss.ctx, ss.traceInfo.tr)
defer func() {
From d12126f864d2660829b33a77bdf2cd3a578b9935 Mon Sep 17 00:00:00 2001
From: iamqizhao <toqizhao@gmail.com>
Date: Thu, 1 Oct 2015 18:08:09 -0700
Subject: [PATCH 2/2] show deadline on server side trace
---
server.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server.go b/server.go
index 08e2ea98..049e8099 100644
--- a/server.go
+++ b/server.go
@@ -403,7 +403,7 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
ss.traceInfo.firstLine.client = false
ss.traceInfo.firstLine.remoteAddr = t.RemoteAddr()
if dl, ok := ctx.Deadline(); ok {
- traceInfo.firstLine.deadline = dl.Sub(time.Now())
+ ss.traceInfo.firstLine.deadline = dl.Sub(time.Now())
}
ss.traceInfo.tr.LazyLog(&ss.traceInfo.firstLine, false)
ss.ctx = trace.NewContext(ss.ctx, ss.traceInfo.tr)