Skip to content

Commit 6c49080

Browse files
authored
Merge pull request #175 from mercari/fix-set-logger
Fix SetLogger implementation
2 parents c6bc9df + a5da94e commit 6c49080

File tree

13 files changed

+32
-70
lines changed

13 files changed

+32
-70
lines changed

_examples/01_minimum/federation/federation_grpc_federation.pb.go

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_examples/03_custom_resolver/federation/federation_grpc_federation.pb.go

+5-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_examples/09_multi_user/federation/federation_grpc_federation.pb.go

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_examples/11_multi_service/federation/other_grpc_federation.pb.go

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_examples/12_validation/federation/federation_grpc_federation.pb.go

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_examples/16_code_gen_plugin/federation/federation_grpc_federation.pb.go

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generator/templates/server.go.tmpl

+2-4
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,12 @@ func (s *{{ $serviceName }}) {{ .ResolverName }}(ctx context.Context, req *{{ .R
362362
{{- $hasMsgCustomResolver := .HasCustomResolver }}
363363
{{- if $hasMsgCustomResolver }}
364364
// `custom_resolver = true` in "grpc.federation.message" option.
365-
ctx = grpcfed.WithCustomResolverValue(ctx)
365+
ctx = grpcfed.WithLogger(ctx, grpcfed.Logger(ctx)) // create a new reference to logger.
366366
ret, err := s.resolver.{{ .CustomResolverName }}(ctx, req)
367367
if err != nil {
368368
grpcfed.RecordErrorToSpan(ctx, err)
369369
return nil, err
370370
}
371-
ctx = grpcfed.WithLogger(ctx, grpcfed.GetCustomResolverValue(ctx).Logger)
372371
{{- else }}
373372
ret := &{{ .ReturnType }}{}
374373
{{- end }}
@@ -382,7 +381,7 @@ func (s *{{ $serviceName }}) {{ .ResolverName }}(ctx context.Context, req *{{ .R
382381
{{- if .IsCustomResolverField }}
383382
{
384383
// (grpc.federation.field).custom_resolver = true
385-
ctx = grpcfed.WithCustomResolverValue(ctx)
384+
ctx = grpcfed.WithLogger(ctx, grpcfed.Logger(ctx)) // create a new reference to logger.
386385
var err error
387386
ret.{{ .Name }}, err = s.resolver.{{ .ResolverName }}(ctx, &{{ .RequestType }}{
388387
{{ .MessageArgumentName }}: req,
@@ -394,7 +393,6 @@ func (s *{{ $serviceName }}) {{ .ResolverName }}(ctx context.Context, req *{{ .R
394393
grpcfed.RecordErrorToSpan(ctx, err)
395394
return nil, err
396395
}
397-
ctx = grpcfed.WithLogger(ctx, grpcfed.GetCustomResolverValue(ctx).Logger)
398396
}
399397
{{- else if .IsOneofField }}
400398
{{ $name := .Name }}

generator/testdata/expected_custom_resolver.go

+3-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generator/testdata/expected_map.go

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generator/testdata/expected_minimum.go

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generator/testdata/expected_multi_user.go

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generator/testdata/expected_simple_aggregation.go

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)