From 96096631d78122ffe63e88fe7092137889e41dad Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 3 Nov 2023 09:49:51 +0100 Subject: [PATCH] util: remove separate logging for Replication as the replication is moved to the new RPC server, removing its logging steps from the main cephcsi server logging. Signed-off-by: Madhu Rajanna --- internal/csi-common/utils.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/internal/csi-common/utils.go b/internal/csi-common/utils.go index a2bb4ab862d1..9b7553d961fb 100644 --- a/internal/csi-common/utils.go +++ b/internal/csi-common/utils.go @@ -28,7 +28,6 @@ import ( "github.com/ceph/ceph-csi/internal/util/log" "github.com/container-storage-interface/spec/lib/go/csi" - rp "github.com/csi-addons/replication-lib-utils/protosanitizer" "github.com/csi-addons/spec/lib/go/replication" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" @@ -193,18 +192,7 @@ func logGRPC( handler grpc.UnaryHandler, ) (interface{}, error) { log.ExtendedLog(ctx, "GRPC call: %s", info.FullMethod) - // TODO: remove the following check for next release - // refer to https://github.com/ceph/ceph-csi/issues/3314. - if isReplicationRequest(req) { - strippedMessage := protosanitizer.StripSecrets(req).String() - if !strings.Contains(strippedMessage, "***stripped***") { - strippedMessage = rp.StripReplicationSecrets(req).String() - } - - log.TraceLog(ctx, "GRPC request: %s", strippedMessage) - } else { - log.TraceLog(ctx, "GRPC request: %s", protosanitizer.StripSecrets(req)) - } + log.TraceLog(ctx, "GRPC request: %s", protosanitizer.StripSecrets(req)) resp, err := handler(ctx, req) if err != nil { klog.Errorf(log.Log(ctx, "GRPC error: %v"), err)