From 56d7f2fb6fe9565d649d883167d79da88ac53c03 Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Tue, 16 Jul 2024 10:54:32 +0100 Subject: [PATCH] Migrate from legacy gRPC call --- static/metrics/cluster/client/client.go | 2 +- static/server/server_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/metrics/cluster/client/client.go b/static/metrics/cluster/client/client.go index c34da9d4f06d..34477bae6cce 100644 --- a/static/metrics/cluster/client/client.go +++ b/static/metrics/cluster/client/client.go @@ -66,7 +66,7 @@ func New(cfg Config, addr string) (ScrapingServiceClient, error) { return nil, err } opts = append(opts, grpcDialOpts...) - conn, err := grpc.Dial(addr, opts...) + conn, err := grpc.NewClient(addr, opts...) if err != nil { return nil, err } diff --git a/static/server/server_test.go b/static/server/server_test.go index effa46b72efa..2594e8918eda 100644 --- a/static/server/server_test.go +++ b/static/server/server_test.go @@ -32,7 +32,7 @@ func TestServer(t *testing.T) { // Validate gRPC creds := grpc.WithTransportCredentials(insecure.NewCredentials()) - cc, err := grpc.Dial(srv.GRPCAddress().String(), creds) + cc, err := grpc.NewClient(srv.GRPCAddress().String(), creds) require.NoError(t, err) _, err = grpc_health_v1.NewHealthClient(cc).Check(context.Background(), &grpc_health_v1.HealthCheckRequest{}) require.NoError(t, err) @@ -55,7 +55,7 @@ func TestServer_InMemory(t *testing.T) { grpcDialer := grpc.WithContextDialer(func(ctx context.Context, s string) (net.Conn, error) { return srv.DialContext(ctx, "", s) }) - cc, err := grpc.Dial(flags.GRPC.InMemoryAddr, grpc.WithTransportCredentials(insecure.NewCredentials()), grpcDialer) + cc, err := grpc.NewClient(flags.GRPC.InMemoryAddr, grpc.WithTransportCredentials(insecure.NewCredentials()), grpcDialer) require.NoError(t, err) _, err = grpc_health_v1.NewHealthClient(cc).Check(context.Background(), &grpc_health_v1.HealthCheckRequest{}) require.NoError(t, err) @@ -124,7 +124,7 @@ func TestServer_TLS(t *testing.T) { // Validate gRPC TLS creds := credentials.NewTLS(&tls.Config{InsecureSkipVerify: true}) - cc, err := grpc.Dial(srv.GRPCAddress().String(), grpc.WithTransportCredentials(creds)) + cc, err := grpc.NewClient(srv.GRPCAddress().String(), grpc.WithTransportCredentials(creds)) require.NoError(t, err) _, err = grpc_health_v1.NewHealthClient(cc).Check(context.Background(), &grpc_health_v1.HealthCheckRequest{}) require.NoError(t, err)