address comment

uber · Mar 14, 2018 · c003657 · c003657
1 parent 47d6471
commit c003657
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 51 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(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 	{{if ne .RequestType ""}}
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	{{- end -}}
 
 	{{if (ne (len $reqHeaderMapKeys) 0) }}

diff --git a/codegen/test_data/endpoints/bar_bar_method_argnotstruct.gogen b/codegen/test_data/endpoints/bar_bar_method_argnotstruct.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/zap"
@@ -82,7 +81,7 @@ func (h *BarArgNotStructHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	req.Logger.Debug("Endpoint request to downstream", zfields...)
 
 	workflow := BarArgNotStructEndpoint{

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithheaders.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithheaders.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/thriftrw/ptr"
@@ -91,7 +90,7 @@ func (h *BarArgWithHeadersHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	var headerOk bool
 	var headerValue string
 	headerValue, headerOk = req.Header.Get("X-Uuid")

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithmanyqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithmanyqueryparams.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/thriftrw/ptr"
@@ -213,7 +212,7 @@ func (h *BarArgWithManyQueryParamsHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	req.Logger.Debug("Endpoint request to downstream", zfields...)
 
 	workflow := BarArgWithManyQueryParamsEndpoint{

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithnestedqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithnestedqueryparams.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/thriftrw/ptr"
@@ -157,7 +156,7 @@ func (h *BarArgWithNestedQueryParamsHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	req.Logger.Debug("Endpoint request to downstream", zfields...)
 
 	workflow := BarArgWithNestedQueryParamsEndpoint{

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithparams.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/zap"
@@ -88,7 +87,7 @@ func (h *BarArgWithParamsHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	req.Logger.Debug("Endpoint request to downstream", zfields...)
 
 	workflow := BarArgWithParamsEndpoint{

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithqueryheader.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithqueryheader.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/thriftrw/ptr"
@@ -85,7 +84,7 @@ func (h *BarArgWithQueryHeaderHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	req.Logger.Debug("Endpoint request to downstream", zfields...)
 
 	workflow := BarArgWithQueryHeaderEndpoint{

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithqueryparams.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/thriftrw/ptr"
@@ -99,7 +98,7 @@ func (h *BarArgWithQueryParamsHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	var headerOk bool
 	var headerValue string
 	headerValue, headerOk = req.Header.Get("X-Token")

diff --git a/codegen/test_data/endpoints/bar_bar_method_normal.gogen b/codegen/test_data/endpoints/bar_bar_method_normal.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/zap"
@@ -91,7 +90,7 @@ func (h *BarNormalHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	req.Logger.Debug("Endpoint request to downstream", zfields...)
 
 	workflow := BarNormalEndpoint{

diff --git a/codegen/test_data/endpoints/bar_bar_method_toomanyargs.gogen b/codegen/test_data/endpoints/bar_bar_method_toomanyargs.gogen
@@ -25,7 +25,6 @@ package barendpoint
 
 import (
 	"context"
-	"fmt"
 
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/zap"
@@ -88,7 +87,7 @@ func (h *BarTooManyArgsHandler) HandleRequest(
 		zap.String("endpoint", h.endpoint.EndpointName),
 	}
 
-	zfields = append(zfields, zap.String("body", fmt.Sprintf("%#v", requestBody)))
+	zfields = append(zfields, zap.String("body", requestBody.String()))
 	var headerOk bool
 	var headerValue string
 	headerValue, headerOk = req.Header.Get("X-Token")

diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argnotstruct.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argnotstruct.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithheaders.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithheaders.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithmanyqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithmanyqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithnestedqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithnestedqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryheader.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryheader.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_call.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_call.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_compare.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_compare.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_trans.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_trans.go