Add gRPC parameters to the veneur-proxy configuration. (#983)

stripe · Aug 25, 2022 · 7cb32d9 · 7cb32d9
1 parent ef06038
commit 7cb32d9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/proxy/config.go b/proxy/config.go
@@ -12,8 +12,16 @@ type Config struct {
 	DiscoveryInterval time.Duration `yaml:"discovery_interval"`
 	ForwardAddresses  []string      `yaml:"forward_addresses"`
 	ForwardService    string        `yaml:"forward_service"`
-	GrpcAddress       string        `yaml:"grpc_address"`
-	Http              struct {
+	GrpcServer        struct {
+		ConnectionTimeout     time.Duration `yaml:"connection_timeout"`
+		MaxConnectionIdle     time.Duration `yaml:"max_connection_idle"`
+		MaxConnectionAge      time.Duration `yaml:"max_connection_age"`
+		MaxConnectionAgeGrace time.Duration `yaml:"max_connection_age_grace"`
+		PingTimeout           time.Duration `yaml:"ping_timeout"`
+		KeepaliveTimeout      time.Duration `yaml:"keepalive_timeout"`
+	} `yaml:"grpc_server"`
+	GrpcAddress string `yaml:"grpc_address"`
+	Http        struct {
 		EnableConfig    bool `yaml:"enable_config"`
 		EnableProfiling bool `yaml:"enable_profiling"`
 	} `yaml:"http"`

diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -16,6 +16,7 @@ import (
 	"github.com/stripe/veneur/v14/proxy/handlers"
 	"github.com/stripe/veneur/v14/scopedstatsd"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/keepalive"
 )
 
 type CreateParams struct {
@@ -58,10 +59,19 @@ func Create(params *CreateParams) *Proxy {
 		forwardAddresses:  params.Config.ForwardAddresses,
 		forwardService:    params.Config.ForwardService,
 		grpcAddress:       params.Config.GrpcAddress,
-		grpcServer: grpc.NewServer(grpc.StatsHandler(&grpcstats.StatsHandler{
-			IsClient: false,
-			Statsd:   params.Statsd,
-		})),
+		grpcServer: grpc.NewServer(
+			grpc.ConnectionTimeout(params.Config.GrpcServer.ConnectionTimeout),
+			grpc.KeepaliveParams(keepalive.ServerParameters{
+				MaxConnectionIdle:     params.Config.GrpcServer.MaxConnectionIdle,
+				MaxConnectionAge:      params.Config.GrpcServer.MaxConnectionAge,
+				MaxConnectionAgeGrace: params.Config.GrpcServer.MaxConnectionAgeGrace,
+				Time:                  params.Config.GrpcServer.PingTimeout,
+				Timeout:               params.Config.GrpcServer.KeepaliveTimeout,
+			}),
+			grpc.StatsHandler(&grpcstats.StatsHandler{
+				IsClient: false,
+				Statsd:   params.Statsd,
+			})),
 		handlers: &handlers.Handlers{
 			Destinations:       params.Destinations,
 			HealthcheckContext: params.HealthcheckContext,