Initialize Context Logger in default deps for mocks and tests

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

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/module_mock_initializer.tmpl b/codegen/templates/module_mock_initializer.tmpl
@@ -49,11 +49,12 @@ func InitializeDependenciesMock(
 	tree := &{{$classPkg}}.DependenciesTree{}
 
 	initializedDefaultDependencies := &zanzibar.DefaultDependencies{
-		Logger:  g.Logger,
-		Scope:   g.AllHostScope,
-		Config:  g.Config,
-		Channel: g.Channel,
-		Tracer:  g.Tracer,
+		ContextLogger: g.ContextLogger,
+		Logger:  	   g.Logger,
+		Scope:         g.AllHostScope,
+		Config:        g.Config,
+		Channel:       g.Channel,
+		Tracer:        g.Tracer,
 	}
 
 	{{range $idx, $className := $instance.DependencyOrder}}

diff --git a/codegen/templates/workflow_mock.tmpl b/codegen/templates/workflow_mock.tmpl
@@ -54,6 +54,8 @@ func New{{$workflowInterface}}Mock(t *testing.T) (workflow.{{$workflowInterface}
 	initializedDefaultDependencies := &zanzibar.DefaultDependencies {
 		Logger: zap.NewNop(),
 	}
+	initializedDefaultDependencies.ContextLogger = zanzibar.NewContextLogger(initializedDefaultDependencies.Logger)
+
 
 	{{range $idx, $className := $instance.DependencyOrder}}
 	{{- $moduleInstances := (index $instance.RecursiveDependencies $className)}}

diff --git a/...ple-gateway/build/endpoints/contacts/mock-workflow/contacts_savecontacts_workflow_mock.go b/...ple-gateway/build/endpoints/contacts/mock-workflow/contacts_savecontacts_workflow_mock.go
diff --git a/...le-gateway/build/endpoints/tchannel/baz/mock-workflow/simpleservice_call_workflow_mock.go b/...le-gateway/build/endpoints/tchannel/baz/mock-workflow/simpleservice_call_workflow_mock.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