aboutsummaryrefslogtreecommitdiff
path: root/netty
diff options
context:
space:
mode:
authorzpencer <spencerfang@google.com>2018-04-03 13:39:11 -0700
committerGitHub <noreply@github.com>2018-04-03 13:39:11 -0700
commitb1d91b9f60c33019ffe36073b4b2a4dbbe95ec67 (patch)
treec2fd58a380695f2055f4dd48c72249388e0c77f6 /netty
parent724e32fe57db8ba21a180632cb144d5af0a814c4 (diff)
downloadgrpc-grpc-java-b1d91b9f60c33019ffe36073b4b2a4dbbe95ec67.tar.gz
core,services: binary log should use real peer socket and call id (#4266)
The peer socket is read from TRANSPORT_ATTR_REMOTE_ADDR from the stream attributes. We only log the peer on receive initial metadata. The call id assumes census is available. The call ID read from the context via SERVER_CALL_ID_CONTEXT_KEY on server side, and read from CallOptions via CLIENT_CALL_ID_CALLOPTION_KEY on client side. The value is copied from CONTEXT_SPAN_KEY which is set by census. Pass around CallId with two longs, not a byte[].
Diffstat (limited to 'netty')
-rw-r--r--netty/src/main/java/io/grpc/netty/NettyServer.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/netty/src/main/java/io/grpc/netty/NettyServer.java b/netty/src/main/java/io/grpc/netty/NettyServer.java
index 2e3dcaf5c..8da3c2820 100644
--- a/netty/src/main/java/io/grpc/netty/NettyServer.java
+++ b/netty/src/main/java/io/grpc/netty/NettyServer.java
@@ -370,7 +370,6 @@ class NettyServer implements InternalServer, WithLogId {
}
}
});
-
return ret;
}