Merge bf1d354 into 831d98b

uber · Apr 9, 2020 · a0f8961 · a0f8961
2 parents 831d98b + bf1d354
commit a0f8961
Show file tree

Hide file tree

Showing 30 changed files with 185 additions and 95 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/http_client.tmpl b/codegen/templates/http_client.tmpl
@@ -11,6 +11,7 @@ import (
 
 	"github.com/pkg/errors"
 	zanzibar "github.com/uber/zanzibar/runtime"
+	"github.com/uber/zanzibar/runtime/jsonwrapper"
 
 	module "{{$instance.PackageInfo.ModulePackagePath}}"
 	{{range $idx, $pkg := .IncludedPackages -}}
@@ -48,6 +49,7 @@ type Client interface {
 type {{$clientName}} struct {
 	clientID string
 	httpClient   *zanzibar.HTTPClient
+	jsonWrapper   jsonwrapper.JSONWrapper
 	circuitBreakerDisabled bool
 	requestUUIDHeaderKey string
 
@@ -101,7 +103,7 @@ func {{$exportName}}(deps *module.Dependencies) Client {
 		calleeName: calleeName,
 		{{end -}}
 		httpClient: zanzibar.NewHTTPClientContext(
-			deps.Default.Logger, deps.Default.ContextMetrics,
+			deps.Default.Logger, deps.Default.ContextMetrics, deps.Default.JSONWrapper,
 			"{{$clientID}}",
 			map[string]string{
 				{{range $serviceMethod, $methodName := $exposedMethods -}}

diff --git a/codegen/templates/module_initializer.tmpl b/codegen/templates/module_initializer.tmpl
@@ -48,6 +48,7 @@ func InitializeDependencies(
 		Channel:        g.Channel,
 
 		GRPCClientDispatcher: g.GRPCClientDispatcher,
+		JSONWrapper:		g.JSONWrapper,
 	}
 
 	{{range $idx, $className := $instance.DependencyOrder}}

diff --git a/codegen/templates/module_mock_initializer.tmpl b/codegen/templates/module_mock_initializer.tmpl
@@ -53,15 +53,16 @@ func InitializeDependenciesMock(
 	{{ end -}}
 
 	initializedDefaultDependencies := &zanzibar.DefaultDependencies{
-		ContextExtractor: g.ContextExtractor,
-		ContextMetrics: g.ContextMetrics,
-		ContextLogger: g.ContextLogger,
-		Logger:  	   g.Logger,
-		Scope:         g.RootScope,
-		Config:        g.Config,
-		Channel:       g.Channel,
-		Tracer:        g.Tracer,
+		ContextExtractor:     g.ContextExtractor,
+		ContextMetrics:       g.ContextMetrics,
+		ContextLogger:        g.ContextLogger,
+		Logger:               g.Logger,
+		Scope:                g.RootScope,
+		Config:               g.Config,
+		Channel:              g.Channel,
+		Tracer:               g.Tracer,
 		GRPCClientDispatcher: g.GRPCClientDispatcher,
+		JSONWrapper:          g.JSONWrapper,
 	}
 
 	{{range $idx, $className := $instance.DependencyOrder}}

diff --git a/examples/example-gateway/app.go b/examples/example-gateway/app.go
@@ -23,6 +23,8 @@ package app
 import (
 	"net/textproto"
 
+	"github.com/uber/zanzibar/runtime/jsonwrapper"
+
 	"go.uber.org/zap"
 
 	"context"
@@ -34,6 +36,7 @@ import (
 var AppOptions = &zanzibar.Options{
 	GetContextScopeExtractors: getContextScopeTagExtractors,
 	GetContextFieldExtractors: getContextLogFieldExtractors,
+	JSONWrapper:               jsonwrapper.NewDefaultJSONWrapper(),
 }
 
 func getContextScopeTagExtractors() []zanzibar.ContextScopeTagsExtractor {

diff --git a/examples/example-gateway/build/app/demo/services/xyz/mock-service/mock_init.go b/examples/example-gateway/build/app/demo/services/xyz/mock-service/mock_init.go
diff --git a/examples/example-gateway/build/app/demo/services/xyz/module/init.go b/examples/example-gateway/build/app/demo/services/xyz/module/init.go
diff --git a/examples/example-gateway/build/clients/bar/bar.go b/examples/example-gateway/build/clients/bar/bar.go
diff --git a/examples/example-gateway/build/clients/contacts/contacts.go b/examples/example-gateway/build/clients/contacts/contacts.go
diff --git a/examples/example-gateway/build/clients/corge-http/corge-http.go b/examples/example-gateway/build/clients/corge-http/corge-http.go
diff --git a/examples/example-gateway/build/clients/google-now/google-now.go b/examples/example-gateway/build/clients/google-now/google-now.go
diff --git a/examples/example-gateway/build/clients/multi/multi.go b/examples/example-gateway/build/clients/multi/multi.go
diff --git a/examples/example-gateway/build/clients/withexceptions/withexceptions.go b/examples/example-gateway/build/clients/withexceptions/withexceptions.go
diff --git a/examples/example-gateway/build/services/echo-gateway/mock-service/mock_init.go b/examples/example-gateway/build/services/echo-gateway/mock-service/mock_init.go
diff --git a/examples/example-gateway/build/services/echo-gateway/module/init.go b/examples/example-gateway/build/services/echo-gateway/module/init.go
diff --git a/examples/example-gateway/build/services/example-gateway/mock-service/mock_init.go b/examples/example-gateway/build/services/example-gateway/mock-service/mock_init.go
diff --git a/examples/example-gateway/build/services/example-gateway/module/init.go b/examples/example-gateway/build/services/example-gateway/module/init.go