From dcdfb6ed41ba5f8edb104d563c0c0828cd8173c6 Mon Sep 17 00:00:00 2001
From: Dmitrii Stepanov <d.stepanov@yadro.com>
Date: Wed, 31 May 2023 12:26:54 +0300
Subject: [PATCH] [#412] node: Use observability interceptors

Use metrics and tracing interceptors.

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
---
 cmd/frostfs-cli/modules/tree/client.go |  9 ++++++---
 cmd/frostfs-node/grpc.go               |  9 ++++++---
 pkg/services/tree/cache.go             |  9 ++++++---
 pkg/services/tree/sync.go              | 10 +++++++---
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/cmd/frostfs-cli/modules/tree/client.go b/cmd/frostfs-cli/modules/tree/client.go
index f25bff166..4f4f54657 100644
--- a/cmd/frostfs-cli/modules/tree/client.go
+++ b/cmd/frostfs-cli/modules/tree/client.go
@@ -5,10 +5,11 @@ import (
 	"strings"
 	"time"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/pkg/tracing"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"
+	metrics "git.frostfs.info/TrueCloudLab/frostfs-observability/metrics/grpc"
+	tracing "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing/grpc"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
@@ -26,10 +27,12 @@ func _client(ctx context.Context) (tree.TreeServiceClient, error) {
 	opts := []grpc.DialOption{
 		grpc.WithBlock(),
 		grpc.WithChainUnaryInterceptor(
-			tracing.NewGRPCUnaryClientInteceptor(),
+			metrics.NewUnaryClientInterceptor(),
+			tracing.NewUnaryClientInteceptor(),
 		),
 		grpc.WithChainStreamInterceptor(
-			tracing.NewGRPCStreamClientInterceptor(),
+			metrics.NewStreamClientInterceptor(),
+			tracing.NewStreamClientInterceptor(),
 		),
 	}
 
diff --git a/cmd/frostfs-node/grpc.go b/cmd/frostfs-node/grpc.go
index b0a587782..b62ae9c45 100644
--- a/cmd/frostfs-node/grpc.go
+++ b/cmd/frostfs-node/grpc.go
@@ -7,10 +7,11 @@ import (
 	"net"
 	"time"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/pkg/tracing"
 	grpcconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/grpc"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
+	metrics "git.frostfs.info/TrueCloudLab/frostfs-observability/metrics/grpc"
+	tracing "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing/grpc"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -22,10 +23,12 @@ func initGRPC(c *cfg) {
 		serverOpts := []grpc.ServerOption{
 			grpc.MaxSendMsgSize(maxMsgSize),
 			grpc.ChainUnaryInterceptor(
-				tracing.NewGRPCUnaryServerInterceptor(),
+				metrics.NewUnaryServerInterceptor(),
+				tracing.NewUnaryServerInterceptor(),
 			),
 			grpc.ChainStreamInterceptor(
-				tracing.NewGRPCStreamServerInterceptor(),
+				metrics.NewStreamServerInterceptor(),
+				tracing.NewStreamServerInterceptor(),
 			),
 		}
 
diff --git a/pkg/services/tree/cache.go b/pkg/services/tree/cache.go
index 3288083cc..97218da08 100644
--- a/pkg/services/tree/cache.go
+++ b/pkg/services/tree/cache.go
@@ -8,8 +8,9 @@ import (
 	"sync"
 	"time"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/pkg/tracing"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network"
+	metrics "git.frostfs.info/TrueCloudLab/frostfs-observability/metrics/grpc"
+	tracing "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing/grpc"
 	"github.com/hashicorp/golang-lru/v2/simplelru"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
@@ -90,10 +91,12 @@ func dialTreeService(ctx context.Context, netmapAddr string) (*grpc.ClientConn,
 	opts := []grpc.DialOption{
 		grpc.WithBlock(),
 		grpc.WithChainUnaryInterceptor(
-			tracing.NewGRPCUnaryClientInteceptor(),
+			metrics.NewUnaryClientInterceptor(),
+			tracing.NewUnaryClientInteceptor(),
 		),
 		grpc.WithChainStreamInterceptor(
-			tracing.NewGRPCStreamClientInterceptor(),
+			metrics.NewStreamClientInterceptor(),
+			tracing.NewStreamClientInterceptor(),
 		),
 	}
 
diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go
index ec51c6bc6..d132faf6e 100644
--- a/pkg/services/tree/sync.go
+++ b/pkg/services/tree/sync.go
@@ -11,11 +11,13 @@ import (
 	"sync"
 	"time"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/pkg/tracing"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network"
+	metrics "git.frostfs.info/TrueCloudLab/frostfs-observability/metrics/grpc"
+	tracing "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
+	tracing_grpc "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing/grpc"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
 	"github.com/panjf2000/ants/v2"
@@ -297,10 +299,12 @@ func (s *Service) synchronizeTree(ctx context.Context, cid cid.ID, from uint64,
 
 				cc, err := grpc.DialContext(egCtx, a.URIAddr(),
 					grpc.WithChainUnaryInterceptor(
-						tracing.NewGRPCUnaryClientInteceptor(),
+						metrics.NewUnaryClientInterceptor(),
+						tracing_grpc.NewUnaryClientInteceptor(),
 					),
 					grpc.WithChainStreamInterceptor(
-						tracing.NewGRPCStreamClientInterceptor(),
+						metrics.NewStreamClientInterceptor(),
+						tracing_grpc.NewStreamClientInterceptor(),
 					),
 					grpc.WithTransportCredentials(insecure.NewCredentials()))
 				if err != nil {