From aaed083d82b2011374ccedaf57294962c849b31f Mon Sep 17 00:00:00 2001 From: Roman Loginov Date: Mon, 21 Oct 2024 11:04:45 +0300 Subject: [PATCH] [#520] Support the continuous use of interceptors We can always add interceptors to the grpc connection to the storage, since the actual use will be controlled by the configuration from the frostfs-observability library. Signed-off-by: Roman Loginov --- cmd/s3-gw/app.go | 16 +++++----------- docs/configuration.md | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/cmd/s3-gw/app.go b/cmd/s3-gw/app.go index 762e0d4e..52899c02 100644 --- a/cmd/s3-gw/app.go +++ b/cmd/s3-gw/app.go @@ -671,18 +671,12 @@ func getPools(ctx context.Context, logger *zap.Logger, cfg *viper.Viper) (*pool. prmTree.SetMaxRequestAttempts(cfg.GetInt(cfgTreePoolMaxAttempts)) - var apiGRPCDialOpts []grpc.DialOption - var treeGRPCDialOpts []grpc.DialOption - if cfg.GetBool(cfgTracingEnabled) { - interceptors := []grpc.DialOption{ - grpc.WithUnaryInterceptor(grpctracing.NewUnaryClientInteceptor()), - grpc.WithStreamInterceptor(grpctracing.NewStreamClientInterceptor()), - } - treeGRPCDialOpts = append(treeGRPCDialOpts, interceptors...) - apiGRPCDialOpts = append(apiGRPCDialOpts, interceptors...) + interceptors := []grpc.DialOption{ + grpc.WithUnaryInterceptor(grpctracing.NewUnaryClientInteceptor()), + grpc.WithStreamInterceptor(grpctracing.NewStreamClientInterceptor()), } - prm.SetGRPCDialOptions(apiGRPCDialOpts...) - prmTree.SetGRPCDialOptions(treeGRPCDialOpts...) + prm.SetGRPCDialOptions(interceptors...) + prmTree.SetGRPCDialOptions(interceptors...) p, err := pool.NewPool(prm) if err != nil { diff --git a/docs/configuration.md b/docs/configuration.md index df3d022f..205a9017 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -547,7 +547,7 @@ tracing: | Parameter | Type | SIGHUP reload | Default value | Description | |--------------|----------|---------------|---------------|---------------------------------------------------------------------------------------------------------------------------------| -| `enabled` | `bool` | no | `false` | Flag to enable the service. | +| `enabled` | `bool` | yes | `false` | Flag to enable the service. | | `exporter` | `string` | yes | `` | Type of tracing exporter. | | `endpoint` | `string` | yes | `` | Address that service listener binds to. | | `trusted_ca` | `string` | yes | | Path to certificate of a certification authority in pem format, that issued the TLS certificate of the telemetry remote server. |