Creating a common DefaultDependencies struct

codegen/templates/dependency_struct.tmpl

@@ -8,24 +8,17 @@ import (
 	{{end -}}
 	{{end}}
 
-	"github.com/uber-go/tally"
-	"go.uber.org/zap"
+	zanzibar "github.com/uber/zanzibar/runtime"
 )
 
 // Dependencies contains dependencies for the {{$instance.InstanceName}} {{$instance.ClassName}} module
 type Dependencies struct {
-	Default *DefaultDependencies
+	Default *zanzibar.DefaultDependencies
 	{{range $classType, $moduleInstances := $instance.ResolvedDependencies -}}
 	{{$classType | pascal}} *{{$classType | pascal}}Dependencies
 	{{end -}}
 }
 
-// DefaultDependencies contains default dependencies, such as logger and scope.
-type DefaultDependencies struct {
-	Logger *zap.Logger
-	Scope  tally.Scope
-}
-
 {{range $classType, $moduleInstances := $instance.ResolvedDependencies -}}
 // {{$classType | pascal}}Dependencies contains {{$classType}} dependencies
 type {{$classType | pascal}}Dependencies struct {

codegen/templates/module_initializer.tmpl

@@ -10,7 +10,7 @@ import (
 	{{end -}}
 	{{end}}
 
-	"github.com/uber/zanzibar/runtime"
+	zanzibar "github.com/uber/zanzibar/runtime"
 )
 
 // DependenciesTree contains all deps for this service.
@@ -37,17 +37,21 @@ func InitializeDependencies(
 ) (*DependenciesTree, *Dependencies) {
 	tree := &DependenciesTree{}
 
+	initializedDefaultDependencies := &zanzibar.DefaultDependencies{
+		Logger:  gateway.Logger,
+		Scope:   gateway.AllHostScope,
+		Config:  gateway.Config,
+		Channel: gateway.Channel,
+	}
+
 	{{range $idx, $className := $instance.DependencyOrder}}
 	{{- $moduleInstances := (index $instance.RecursiveDependencies $className)}}
 	initialized{{$className | pascal}}Dependencies := &{{$className | title}}DependenciesNodes{}
 	tree.{{$className | title}} = initialized{{$className | pascal}}Dependencies
 
 	{{- range $idx, $dependency := $moduleInstances}}
 	initialized{{$className | pascal}}Dependencies.{{$dependency.PackageInfo.QualifiedInstanceName}} = {{$dependency.PackageInfo.ImportPackageAlias}}.{{$dependency.PackageInfo.ExportName}}(gateway, &{{$dependency.PackageInfo.ModulePackageAlias}}.Dependencies{
-		Default: &{{$dependency.PackageInfo.ModulePackageAlias}}.DefaultDependencies{
-			Logger: gateway.Logger,
-			Scope:  gateway.AllHostScope,
-		},
+		Default: initializedDefaultDependencies,
 		{{- range $className, $moduleInstances := $dependency.ResolvedDependencies}}
 		{{$className | pascal}}: &{{$dependency.PackageInfo.ModulePackageAlias}}.{{$className | pascal}}Dependencies{
 			{{- range $idy, $subDependency := $moduleInstances}}
@@ -60,10 +64,7 @@ func InitializeDependencies(
 	{{end}}
 
 	return tree, &Dependencies{
-		Default: &DefaultDependencies{
-			Logger: gateway.Logger,
-			Scope:  gateway.AllHostScope,
-		},
+		Default: initializedDefaultDependencies,
 		{{- range $className, $moduleInstances := $instance.ResolvedDependencies}}
 		{{$className | pascal}}: &{{$className | pascal}}Dependencies{
 			{{- range $idy, $subDependency := $moduleInstances}}