Use context logger for http endpoint logs

uber · Sep 6, 2018 · ad19f7b · ad19f7b
1 parent eed7630
commit ad19f7b
Show file tree

Hide file tree

Showing 47 changed files with 220 additions and 190 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/endpoint.tmpl b/codegen/templates/endpoint.tmpl
@@ -131,7 +131,7 @@ func (h *{{$handlerName}}) HandleRequest(
 	{{end}}
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -143,7 +143,7 @@ func (h *{{$handlerName}}) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := {{$workflowPkg}}.New{{$workflowInterface}}(h.Dependencies)
@@ -161,7 +161,7 @@ func (h *{{$handlerName}}) HandleRequest(
 	response, cliRespHeaders, err := w.Handle(ctx, req.Header, &requestBody)
 
 	// log downstream response to endpoint
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -178,7 +178,7 @@ func (h *{{$handlerName}}) HandleRequest(
 		if traceKey, ok := req.Header.Get("{{$traceKey}}"); ok {
 			zfields = append(zfields, zap.String("{{$traceKey}}", traceKey))
 		}
-		req.Logger.Debug("downstream service response", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "downstream service response", zfields...)
 	}
 
 	{{end -}}

diff --git a/codegen/test_data/endpoints/bar_bar_method_argnotstruct.gogen b/codegen/test_data/endpoints/bar_bar_method_argnotstruct.gogen
@@ -77,7 +77,7 @@ func (h *BarArgNotStructHandler) HandleRequest(
 	}
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -87,7 +87,7 @@ func (h *BarArgNotStructHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarArgNotStructWorkflow(h.Dependencies)

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithheaders.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithheaders.gogen
@@ -87,7 +87,7 @@ func (h *BarArgWithHeadersHandler) HandleRequest(
 	}
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -97,7 +97,7 @@ func (h *BarArgWithHeadersHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarArgWithHeadersWorkflow(h.Dependencies)
@@ -108,7 +108,7 @@ func (h *BarArgWithHeadersHandler) HandleRequest(
 	response, cliRespHeaders, err := w.Handle(ctx, req.Header, &requestBody)
 
 	// log downstream response to endpoint
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -123,7 +123,7 @@ func (h *BarArgWithHeadersHandler) HandleRequest(
 		if traceKey, ok := req.Header.Get("trace-key"); ok {
 			zfields = append(zfields, zap.String("trace-key", traceKey))
 		}
-		req.Logger.Debug("downstream service response", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "downstream service response", zfields...)
 	}
 
 	if err != nil {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithmanyqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithmanyqueryparams.gogen
@@ -320,7 +320,7 @@ func (h *BarArgWithManyQueryParamsHandler) HandleRequest(
 	}
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -330,7 +330,7 @@ func (h *BarArgWithManyQueryParamsHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarArgWithManyQueryParamsWorkflow(h.Dependencies)
@@ -341,7 +341,7 @@ func (h *BarArgWithManyQueryParamsHandler) HandleRequest(
 	response, cliRespHeaders, err := w.Handle(ctx, req.Header, &requestBody)
 
 	// log downstream response to endpoint
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -356,7 +356,7 @@ func (h *BarArgWithManyQueryParamsHandler) HandleRequest(
 		if traceKey, ok := req.Header.Get("trace-key"); ok {
 			zfields = append(zfields, zap.String("trace-key", traceKey))
 		}
-		req.Logger.Debug("downstream service response", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "downstream service response", zfields...)
 	}
 
 	if err != nil {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithnestedqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithnestedqueryparams.gogen
@@ -163,7 +163,7 @@ func (h *BarArgWithNestedQueryParamsHandler) HandleRequest(
 	}
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -173,7 +173,7 @@ func (h *BarArgWithNestedQueryParamsHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarArgWithNestedQueryParamsWorkflow(h.Dependencies)
@@ -184,7 +184,7 @@ func (h *BarArgWithNestedQueryParamsHandler) HandleRequest(
 	response, cliRespHeaders, err := w.Handle(ctx, req.Header, &requestBody)
 
 	// log downstream response to endpoint
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -199,7 +199,7 @@ func (h *BarArgWithNestedQueryParamsHandler) HandleRequest(
 		if traceKey, ok := req.Header.Get("trace-key"); ok {
 			zfields = append(zfields, zap.String("trace-key", traceKey))
 		}
-		req.Logger.Debug("downstream service response", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "downstream service response", zfields...)
 	}
 
 	if err != nil {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithparams.gogen
@@ -84,7 +84,7 @@ func (h *BarArgWithParamsHandler) HandleRequest(
 	requestBody.Params.UserUUID = req.Params.ByName("user-uuid")
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -94,7 +94,7 @@ func (h *BarArgWithParamsHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarArgWithParamsWorkflow(h.Dependencies)
@@ -105,7 +105,7 @@ func (h *BarArgWithParamsHandler) HandleRequest(
 	response, cliRespHeaders, err := w.Handle(ctx, req.Header, &requestBody)
 
 	// log downstream response to endpoint
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -120,7 +120,7 @@ func (h *BarArgWithParamsHandler) HandleRequest(
 		if traceKey, ok := req.Header.Get("trace-key"); ok {
 			zfields = append(zfields, zap.String("trace-key", traceKey))
 		}
-		req.Logger.Debug("downstream service response", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "downstream service response", zfields...)
 	}
 
 	if err != nil {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithqueryheader.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithqueryheader.gogen
@@ -81,7 +81,7 @@ func (h *BarArgWithQueryHeaderHandler) HandleRequest(
 	}
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -91,7 +91,7 @@ func (h *BarArgWithQueryHeaderHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarArgWithQueryHeaderWorkflow(h.Dependencies)
@@ -102,7 +102,7 @@ func (h *BarArgWithQueryHeaderHandler) HandleRequest(
 	response, cliRespHeaders, err := w.Handle(ctx, req.Header, &requestBody)
 
 	// log downstream response to endpoint
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -117,7 +117,7 @@ func (h *BarArgWithQueryHeaderHandler) HandleRequest(
 		if traceKey, ok := req.Header.Get("trace-key"); ok {
 			zfields = append(zfields, zap.String("trace-key", traceKey))
 		}
-		req.Logger.Debug("downstream service response", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "downstream service response", zfields...)
 	}
 
 	if err != nil {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithqueryparams.gogen
@@ -114,7 +114,7 @@ func (h *BarArgWithQueryParamsHandler) HandleRequest(
 	requestBody.Bar = barQuery
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -124,7 +124,7 @@ func (h *BarArgWithQueryParamsHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarArgWithQueryParamsWorkflow(h.Dependencies)
@@ -135,7 +135,7 @@ func (h *BarArgWithQueryParamsHandler) HandleRequest(
 	response, cliRespHeaders, err := w.Handle(ctx, req.Header, &requestBody)
 
 	// log downstream response to endpoint
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -150,7 +150,7 @@ func (h *BarArgWithQueryParamsHandler) HandleRequest(
 		if traceKey, ok := req.Header.Get("trace-key"); ok {
 			zfields = append(zfields, zap.String("trace-key", traceKey))
 		}
-		req.Logger.Debug("downstream service response", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "downstream service response", zfields...)
 	}
 
 	if err != nil {

diff --git a/codegen/test_data/endpoints/bar_bar_method_helloworld.gogen b/codegen/test_data/endpoints/bar_bar_method_helloworld.gogen
@@ -74,7 +74,7 @@ func (h *BarHelloWorldHandler) HandleRequest(
 ) {
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -83,7 +83,7 @@ func (h *BarHelloWorldHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarHelloWorldWorkflow(h.Dependencies)

diff --git a/codegen/test_data/endpoints/bar_bar_method_missingarg.gogen b/codegen/test_data/endpoints/bar_bar_method_missingarg.gogen
@@ -72,7 +72,7 @@ func (h *BarMissingArgHandler) HandleRequest(
 ) {
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -81,7 +81,7 @@ func (h *BarMissingArgHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarMissingArgWorkflow(h.Dependencies)

diff --git a/codegen/test_data/endpoints/bar_bar_method_norequest.gogen b/codegen/test_data/endpoints/bar_bar_method_norequest.gogen
@@ -72,7 +72,7 @@ func (h *BarNoRequestHandler) HandleRequest(
 ) {
 
 	// log endpoint request to downstream services
-	if ce := req.Logger.Check(zapcore.DebugLevel, "stub"); ce != nil {
+	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
@@ -81,7 +81,7 @@ func (h *BarNoRequestHandler) HandleRequest(
 				zfields = append(zfields, zap.String(k, val))
 			}
 		}
-		req.Logger.Debug("endpoint request to downstream", zfields...)
+		h.Dependencies.Default.ContextLogger.Debug(ctx, "endpoint request to downstream", zfields...)
 	}
 
 	w := workflow.NewBarNoRequestWorkflow(h.Dependencies)