remove unnecessary RecordErrorToSpan process (#232)

mercari · Aug 19, 2024 · 739457f · 739457f
1 parent 5b9d3d8
commit 739457f
Show file tree

Hide file tree

Showing 24 changed files with 0 additions and 44 deletions.
diff --git a/_examples/02_simple/federation/federation_grpc_federation.pb.go b/_examples/02_simple/federation/federation_grpc_federation.pb.go
diff --git a/_examples/03_custom_resolver/federation/federation_grpc_federation.pb.go b/_examples/03_custom_resolver/federation/federation_grpc_federation.pb.go
diff --git a/_examples/04_timeout/federation/federation_grpc_federation.pb.go b/_examples/04_timeout/federation/federation_grpc_federation.pb.go
diff --git a/_examples/06_alias/federation/federation_grpc_federation.pb.go b/_examples/06_alias/federation/federation_grpc_federation.pb.go
diff --git a/_examples/07_autobind/federation/federation_grpc_federation.pb.go b/_examples/07_autobind/federation/federation_grpc_federation.pb.go
diff --git a/_examples/08_literal/federation/federation_grpc_federation.pb.go b/_examples/08_literal/federation/federation_grpc_federation.pb.go
diff --git a/_examples/09_multi_user/federation/federation_grpc_federation.pb.go b/_examples/09_multi_user/federation/federation_grpc_federation.pb.go
diff --git a/_examples/10_oneof/federation/federation_grpc_federation.pb.go b/_examples/10_oneof/federation/federation_grpc_federation.pb.go
diff --git a/_examples/13_map/federation/federation_grpc_federation.pb.go b/_examples/13_map/federation/federation_grpc_federation.pb.go
diff --git a/_examples/14_condition/federation/federation_grpc_federation.pb.go b/_examples/14_condition/federation/federation_grpc_federation.pb.go
diff --git a/_examples/17_error_handler/federation/federation_grpc_federation.pb.go b/_examples/17_error_handler/federation/federation_grpc_federation.pb.go
diff --git a/_examples/19_retry/federation/federation_grpc_federation.pb.go b/_examples/19_retry/federation/federation_grpc_federation.pb.go
diff --git a/generator/templates/error_handler.go.tmpl b/generator/templates/error_handler.go.tmpl
@@ -154,23 +154,19 @@ if handleErr != nil {
 	grpcfed.Logger(ctx).ErrorContext(ctx, "failed to handle error", slog.String("error", handleErr.Error()))
 	// If it fails during error handling, return the original error.
 	if err := s.errorHandler(ctx, {{ $def.ServiceName }}_DependentMethod_{{ $def.DependentMethodName }}, err); err != nil {
-		grpcfed.RecordErrorToSpan(ctx, err)
 		return nil, grpcfed.NewErrorWithLogAttrs(err, slog.LevelError, grpcfed.LogAttrs(ctx))
 	}
 } else if stat != nil {
 	if err := s.errorHandler(ctx, {{ $def.ServiceName }}_DependentMethod_{{ $def.DependentMethodName }}, stat.status.Err()); err != nil {
-		grpcfed.RecordErrorToSpan(ctx, err)
 		return nil, grpcfed.NewErrorWithLogAttrs(err, stat.logLevel, grpcfed.LogAttrs(ctx))
 	}
 } else {
 	if err := s.errorHandler(ctx, {{ $def.ServiceName }}_DependentMethod_{{ $def.DependentMethodName }}, err); err != nil {
-		grpcfed.RecordErrorToSpan(ctx, err)
 		return nil, grpcfed.NewErrorWithLogAttrs(err, slog.LevelError, grpcfed.LogAttrs(ctx))
 	}
 }
 {{- else }}
 if err := s.errorHandler(ctx, {{ $def.ServiceName }}_DependentMethod_{{ $def.DependentMethodName }}, err); err != nil {
-	grpcfed.RecordErrorToSpan(ctx, err)
 	return nil, grpcfed.NewErrorWithLogAttrs(err, slog.LevelError, grpcfed.LogAttrs(ctx))
 }
 {{- end }}

diff --git a/generator/testdata/expected_alias.go b/generator/testdata/expected_alias.go
diff --git a/generator/testdata/expected_autobind.go b/generator/testdata/expected_autobind.go
diff --git a/generator/testdata/expected_condition.go b/generator/testdata/expected_condition.go
diff --git a/generator/testdata/expected_create_post.go b/generator/testdata/expected_create_post.go
diff --git a/generator/testdata/expected_custom_resolver.go b/generator/testdata/expected_custom_resolver.go
diff --git a/generator/testdata/expected_error_handler.go b/generator/testdata/expected_error_handler.go
diff --git a/generator/testdata/expected_map.go b/generator/testdata/expected_map.go
diff --git a/generator/testdata/expected_multi_user.go b/generator/testdata/expected_multi_user.go
diff --git a/generator/testdata/expected_oneof.go b/generator/testdata/expected_oneof.go
diff --git a/generator/testdata/expected_resolver_overlaps.go b/generator/testdata/expected_resolver_overlaps.go
diff --git a/generator/testdata/expected_simple_aggregation.go b/generator/testdata/expected_simple_aggregation.go