From 2d112c426706033404aa465d6595bb9b2c857f46 Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Wed, 10 May 2023 16:34:21 +0700 Subject: [PATCH 1/2] Fix Dial Options Signed-off-by: Nikita Skrynnik --- main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 9016204d..a9e642d6 100644 --- a/main.go +++ b/main.go @@ -227,16 +227,16 @@ func main() { tlsServerConfig := tlsconfig.MTLSServerConfig(source, source, tlsconfig.AuthorizeAny()) tlsServerConfig.MinVersion = tls.VersionTLS12 - dialOptions := []grpc.DialOption{ - grpc.WithBlock(), + dialOptions := append(tracing.WithTracingDial(), grpc.WithTransportCredentials( grpcfd.TransportCredentials(credentials.NewTLS(tlsClientConfig))), + grpc.WithBlock(), grpc.WithDefaultCallOptions( grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime))), ), grpcfd.WithChainStreamInterceptor(), grpcfd.WithChainUnaryInterceptor(), - } + ) var spiffeidMap genericsync.Map[spiffeid.ID, *genericsync.Map[string, struct{}]] From 78de14cb26d719d8989dbf4fe5d1a2e80b52bcea Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Thu, 11 May 2023 17:02:46 +0700 Subject: [PATCH 2/2] delete WaitForReady Signed-off-by: Nikita Skrynnik --- main.go | 1 - 1 file changed, 1 deletion(-) diff --git a/main.go b/main.go index a9e642d6..d0faf7a4 100644 --- a/main.go +++ b/main.go @@ -283,7 +283,6 @@ func main() { tracing.WithTracingDial(), grpc.WithBlock(), grpc.WithDefaultCallOptions( - grpc.WaitForReady(true), grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime)))), grpc.WithTransportCredentials( grpcfd.TransportCredentials(