Make gRPC ping time and timeout into parameters

Signed-off-by: Arve Knudsen <[email protected]>

CHANGELOG.md

@@ -7,7 +7,8 @@
 * [CHANGE] Added CHANGELOG.md and Pull Request template to reference the changelog
 * [CHANGE] Remove `cortex_` prefix for metrics registered in the ring. #46
 * [CHANGE] Rename `kv/kvtls` to `crypto/tls`. #39
+* [CHANGE] grpcclient: Make ping time and timeout into configuration parameters. #56
 * [ENHANCEMENT] Add middleware package. #38
 * [ENHANCEMENT] Add the ring package #45
 * [ENHANCEMENT] Add limiter package. #41
-* [ENHANCEMENT] Add grpcclient, grpcencoding and grpcutil packages. #39
+* [ENHANCEMENT] Add grpcclient, grpcencoding and grpcutil packages. #39

grpcclient/grpcclient.go

@@ -23,6 +23,15 @@ type Config struct {
 	GRPCCompression string  `yaml:"grpc_compression"`
 	RateLimit       float64 `yaml:"rate_limit"`
 	RateLimitBurst  int     `yaml:"rate_limit_burst"`
+	// PingTime is the number of seconds after which the client will ping the server in case of inactivity.
+	//
+	// See `google.golang.org/grpc/keepalive.ClientParameters.Time` for reference.
+	PingTime int64 `yaml:"ping_time"`
+	// PingTimeOut is the number of seconds the client waits after pinging the server, and if no activity is seen
+	// after that, the connection is closed.
+	//
+	// See `google.golang.org/grpc/keepalive.ClientParameters.Timeout` for reference.
+	PingTimeout int64 `yaml:"ping_timeout"`
 
 	BackoffOnRatelimits bool           `yaml:"backoff_on_ratelimits"`
 	BackoffConfig       backoff.Config `yaml:"backoff_config"`
@@ -95,8 +104,8 @@ func (cfg *Config) DialOption(unaryClientInterceptors []grpc.UnaryClientIntercep
 		grpc.WithUnaryInterceptor(middleware.ChainUnaryClient(unaryClientInterceptors...)),
 		grpc.WithStreamInterceptor(middleware.ChainStreamClient(streamClientInterceptors...)),
 		grpc.WithKeepaliveParams(keepalive.ClientParameters{
-			Time:                time.Second * 20,
-			Timeout:             time.Second * 10,
+			Time:                time.Duration(cfg.PingTime) * time.Second,
+			Timeout:             time.Duration(cfg.PingTimeout) * time.Second,
 			PermitWithoutStream: true,
 		}),
 	), nil