diff --git a/CHANGES.rst b/CHANGES.rst index 0df7391d..aa51a13b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,7 @@ Changes by Version 0.21.10 (unreleased) -------------------- -- Nothing changed yet. +- Zipkin traces now include a server-side 'cn' annotation to identify callers. 0.21.9 (2016-03-14) diff --git a/tchannel/zipkin/zipkin_trace.py b/tchannel/zipkin/zipkin_trace.py index 59d4db3b..c5d60ba4 100644 --- a/tchannel/zipkin/zipkin_trace.py +++ b/tchannel/zipkin/zipkin_trace.py @@ -82,8 +82,13 @@ def before_receive_request(self, request): if not request.tracing.traceflags: return - ann = annotation.server_recv() - request.tracing.annotations.append(ann) + request.tracing.annotations.append(annotation.server_recv()) + + caller_name = request.headers.get('cn') + if caller_name: + request.tracing.annotations.append( + annotation.string('cn', caller_name), + ) def after_send_response(self, response): if not response.tracing.traceflags: