From 813290b2c03139287314af01af39deb355931e30 Mon Sep 17 00:00:00 2001 From: George Blue Date: Fri, 9 Apr 2021 12:16:22 +0100 Subject: [PATCH] fix: log 'X-Broker-API-Request-Identity' header value (#156) PR #148 started to read this header, but the value was not logged. To be consistent with the correlation ID header (which is logged) we should log the request ID too. --- handlers/bind.go | 2 +- handlers/deprovision.go | 2 +- handlers/get_binding.go | 2 +- handlers/get_instance.go | 2 +- handlers/last_binding_operation.go | 2 +- handlers/last_operation.go | 2 +- handlers/provision.go | 2 +- handlers/unbind.go | 2 +- handlers/update.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/handlers/bind.go b/handlers/bind.go index 00186dd9..b6f5abca 100644 --- a/handlers/bind.go +++ b/handlers/bind.go @@ -26,7 +26,7 @@ func (h APIHandler) Bind(w http.ResponseWriter, req *http.Request) { logger := h.logger.Session(bindLogKey, lager.Data{ instanceIDLogKey: instanceID, bindingIDLogKey: bindingID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) version := getAPIVersion(req) asyncAllowed := false diff --git a/handlers/deprovision.go b/handlers/deprovision.go index 01131e07..b779a4c4 100644 --- a/handlers/deprovision.go +++ b/handlers/deprovision.go @@ -20,7 +20,7 @@ func (h APIHandler) Deprovision(w http.ResponseWriter, req *http.Request) { logger := h.logger.Session(deprovisionLogKey, lager.Data{ instanceIDLogKey: instanceID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) details := domain.DeprovisionDetails{ PlanID: req.FormValue("plan_id"), diff --git a/handlers/get_binding.go b/handlers/get_binding.go index 4206c918..65d5e2d0 100644 --- a/handlers/get_binding.go +++ b/handlers/get_binding.go @@ -23,7 +23,7 @@ func (h APIHandler) GetBinding(w http.ResponseWriter, req *http.Request) { logger := h.logger.Session(getBindLogKey, lager.Data{ instanceIDLogKey: instanceID, bindingIDLogKey: bindingID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) requestId := fmt.Sprintf("%v", req.Context().Value(middlewares.RequestIdentityKey)) diff --git a/handlers/get_instance.go b/handlers/get_instance.go index 3499ef9b..9d024f74 100644 --- a/handlers/get_instance.go +++ b/handlers/get_instance.go @@ -22,7 +22,7 @@ func (h APIHandler) GetInstance(w http.ResponseWriter, req *http.Request) { logger := h.logger.Session(getInstanceLogKey, lager.Data{ instanceIDLogKey: instanceID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) requestId := fmt.Sprintf("%v", req.Context().Value(middlewares.RequestIdentityKey)) diff --git a/handlers/last_binding_operation.go b/handlers/last_binding_operation.go index ffbae14b..962a7cba 100644 --- a/handlers/last_binding_operation.go +++ b/handlers/last_binding_operation.go @@ -27,7 +27,7 @@ func (h APIHandler) LastBindingOperation(w http.ResponseWriter, req *http.Reques logger := h.logger.Session(lastBindingOperationLogKey, lager.Data{ instanceIDLogKey: instanceID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) requestId := fmt.Sprintf("%v", req.Context().Value(middlewares.RequestIdentityKey)) diff --git a/handlers/last_operation.go b/handlers/last_operation.go index 21f86b3a..79374209 100644 --- a/handlers/last_operation.go +++ b/handlers/last_operation.go @@ -25,7 +25,7 @@ func (h APIHandler) LastOperation(w http.ResponseWriter, req *http.Request) { logger := h.logger.Session(lastOperationLogKey, lager.Data{ instanceIDLogKey: instanceID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) logger.Info("starting-check-for-operation") diff --git a/handlers/provision.go b/handlers/provision.go index a041a47a..7085563a 100644 --- a/handlers/provision.go +++ b/handlers/provision.go @@ -28,7 +28,7 @@ func (h *APIHandler) Provision(w http.ResponseWriter, req *http.Request) { logger := h.logger.Session(provisionLogKey, lager.Data{ instanceIDLogKey: instanceID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) requestId := fmt.Sprintf("%v", req.Context().Value(middlewares.RequestIdentityKey)) diff --git a/handlers/unbind.go b/handlers/unbind.go index 35bc2d51..0b128642 100644 --- a/handlers/unbind.go +++ b/handlers/unbind.go @@ -22,7 +22,7 @@ func (h APIHandler) Unbind(w http.ResponseWriter, req *http.Request) { logger := h.logger.Session(unbindLogKey, lager.Data{ instanceIDLogKey: instanceID, bindingIDLogKey: bindingID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) requestId := fmt.Sprintf("%v", req.Context().Value(middlewares.RequestIdentityKey)) diff --git a/handlers/update.go b/handlers/update.go index f95b0a3e..34bc673c 100644 --- a/handlers/update.go +++ b/handlers/update.go @@ -22,7 +22,7 @@ func (h APIHandler) Update(w http.ResponseWriter, req *http.Request) { logger := h.logger.Session(updateLogKey, lager.Data{ instanceIDLogKey: instanceID, - }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey)) + }, utils.DataForContext(req.Context(), middlewares.CorrelationIDKey, middlewares.RequestIdentityKey)) requestId := fmt.Sprintf("%v", req.Context().Value(middlewares.RequestIdentityKey))