Skip to content

Commit

Permalink
Add context logger
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacob Greenleaf committed Aug 24, 2018
1 parent 0f16a51 commit 7ffd245
Show file tree
Hide file tree
Showing 17 changed files with 253 additions and 109 deletions.
17 changes: 9 additions & 8 deletions codegen/template_bundle/template_files.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codegen/templates/http_client.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func (c *{{$clientName}}) {{$methodName}}(
}
{{- end}}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return {{if eq .ResponseType ""}}nil, err{{else}}defaultRes, nil, err{{end}}
}
Expand Down
11 changes: 6 additions & 5 deletions codegen/templates/module_initializer.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ func InitializeDependencies(
tree := &DependenciesTree{}

initializedDefaultDependencies := &zanzibar.DefaultDependencies{
Logger: g.Logger,
Scope: g.AllHostScope,
Tracer: g.Tracer,
Config: g.Config,
Channel: g.Channel,
Logger: g.Logger,
ContextLogger: g.ContextLogger,
Scope: g.AllHostScope,
Tracer: g.Tracer,
Config: g.Config,
Channel: g.Channel,
}

{{range $idx, $className := $instance.DependencyOrder}}
Expand Down
58 changes: 29 additions & 29 deletions codegen/test_data/clients/bar.gogen
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func (c *barClient) ArgNotStruct(
return nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -335,7 +335,7 @@ func (c *barClient) ArgWithHeaders(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -468,7 +468,7 @@ func (c *barClient) ArgWithManyQueryParams(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -561,7 +561,7 @@ func (c *barClient) ArgWithNestedQueryParams(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -616,7 +616,7 @@ func (c *barClient) ArgWithParams(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -668,7 +668,7 @@ func (c *barClient) ArgWithQueryHeader(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -737,7 +737,7 @@ func (c *barClient) ArgWithQueryParams(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -788,7 +788,7 @@ func (c *barClient) Hello(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -847,7 +847,7 @@ func (c *barClient) MissingArg(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -907,7 +907,7 @@ func (c *barClient) NoRequest(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -968,7 +968,7 @@ func (c *barClient) Normal(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1029,7 +1029,7 @@ func (c *barClient) NormalRecur(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1089,7 +1089,7 @@ func (c *barClient) TooManyArgs(
return defaultRes, nil, err
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1163,7 +1163,7 @@ func (c *barClient) EchoBinary(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1219,7 +1219,7 @@ func (c *barClient) EchoBool(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1275,7 +1275,7 @@ func (c *barClient) EchoDouble(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1331,7 +1331,7 @@ func (c *barClient) EchoEnum(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1387,7 +1387,7 @@ func (c *barClient) EchoI16(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1443,7 +1443,7 @@ func (c *barClient) EchoI32(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1499,7 +1499,7 @@ func (c *barClient) EchoI32Map(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1555,7 +1555,7 @@ func (c *barClient) EchoI64(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1611,7 +1611,7 @@ func (c *barClient) EchoI8(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1667,7 +1667,7 @@ func (c *barClient) EchoString(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1723,7 +1723,7 @@ func (c *barClient) EchoStringList(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1779,7 +1779,7 @@ func (c *barClient) EchoStringMap(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1835,7 +1835,7 @@ func (c *barClient) EchoStringSet(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1891,7 +1891,7 @@ func (c *barClient) EchoStructList(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -1947,7 +1947,7 @@ func (c *barClient) EchoStructSet(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down Expand Up @@ -2003,7 +2003,7 @@ func (c *barClient) EchoTypedef(
return defaultRes, nil, headerErr
}

res, err := req.Do(ctx)
res, err := req.Do()
if err != nil {
return defaultRes, nil, err
}
Expand Down
Loading

0 comments on commit 7ffd245

Please sign in to comment.