From cd4326596a7f0cd9a9cbc5a6c1271ab2561668b3 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 10 Sep 2015 15:01:18 -0700 Subject: [PATCH] Add context.RequestID to event stream This PR adds a "request ID" to each event generated, the 'docker events' stream now looks like this: ``` 2015-09-10T15:02:50.000000000-07:00 [reqid: c01e3534ddca] de7c5d4ca927253cf4e978ee9c4545161e406e9b5a14617efb52c658b249174a: (from ubuntu) create ``` Note the `[reqID: c01e3534ddca]` part, that's new. Each HTTP request will generate its own unique ID. So, if you do a `docker build` you'll see a series of events all with the same reqID. This allow for log processing tools to determine which events are all related to the same http request. I didn't propigate the context to all possible funcs in the daemon, I decided to just do the ones that needed it in order to get the reqID into the events. I'd like to have people review this direction first, and if we're ok with it then I'll make sure we're consistent about when we pass around the context - IOW, make sure that all funcs at the same level have a context passed in even if they don't call the log funcs - this will ensure we're consistent w/o passing it around for all calls unnecessarily. ping @icecrime @calavera @crosbymichael Signed-off-by: Doug Davis --- jsonmessage/jsonmessage.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jsonmessage/jsonmessage.go b/jsonmessage/jsonmessage.go index 451c6a9..4620483 100644 --- a/jsonmessage/jsonmessage.go +++ b/jsonmessage/jsonmessage.go @@ -92,6 +92,7 @@ func (p *JSONProgress) String() string { // the created time, where it from, status, ID of the // message. It's used for docker events. type JSONMessage struct { + RequestID string `json:"reqid,omitempty"` Stream string `json:"stream,omitempty"` Status string `json:"status,omitempty"` Progress *JSONProgress `json:"progressDetail,omitempty"` @@ -127,6 +128,9 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error { } else if jm.Time != 0 { fmt.Fprintf(out, "%s ", time.Unix(jm.Time, 0).Format(timeutils.RFC3339NanoFixed)) } + if jm.RequestID != "" { + fmt.Fprintf(out, "[reqid: %s] ", jm.RequestID) + } if jm.ID != "" { fmt.Fprintf(out, "%s: ", jm.ID) }