marcel/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd.git synced 2026-02-20 01:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(migrate): migrate otelgrpc pkg interceptor to stats handler(#18258) (#18366)

Browse Source 
Signed-off-by: Jack-R-lantern <tjdfkr2421@gmail.com>
This commit is contained in:
Cayde6
2025-07-10 05:29:24 +09:00
committed by GitHub
parent 9e25f93e03
commit 6ead52c21c
8 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/server.go
View File

@@ -514,8 +514,7 @@ func (server *ArgoCDServer) Listen() (*Listeners, error) {
var dOpts []grpc.DialOption
dOpts = append(dOpts, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(apiclient.MaxGRPCMessageSize)))
dOpts = append(dOpts, grpc.WithUserAgent(fmt.Sprintf("%s/%s", common.ArgoCDUserAgentName, common.GetVersion().Version)))
dOpts = append(dOpts, grpc.WithUnaryInterceptor(grpc_util.OTELUnaryClientInterceptor()))
dOpts = append(dOpts, grpc.WithStreamInterceptor(grpc_util.OTELStreamClientInterceptor()))
dOpts = append(dOpts, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
if server.useTLS() {
// The following sets up the dial Options for grpc-gateway to talk to gRPC server over TLS.
// grpc-gateway is just translating HTTP/HTTPS requests as gRPC requests over localhost,
@@ -947,7 +946,6 @@ func (server *ArgoCDServer) newGRPCServer() (*grpc.Server, application.AppResour
// NOTE: notice we do not configure the gRPC server here with TLS (e.g. grpc.Creds(creds))
// This is because TLS handshaking occurs in cmux handling
sOpts = append(sOpts, grpc.ChainStreamInterceptor(
otelgrpc.StreamServerInterceptor(), //nolint:staticcheck // TODO: ignore SA1019 for depreciation: see https://github.com/argoproj/argo-cd/issues/18258
logging.StreamServerInterceptor(grpc_util.InterceptorLogger(server.log)),
serverMetrics.StreamServerInterceptor(),
grpc_auth.StreamServerInterceptor(server.Authenticate),
@@ -961,7 +959,6 @@ func (server *ArgoCDServer) newGRPCServer() (*grpc.Server, application.AppResour
))
sOpts = append(sOpts, grpc.ChainUnaryInterceptor(
bug21955WorkaroundInterceptor,
otelgrpc.UnaryServerInterceptor(), //nolint:staticcheck // TODO: ignore SA1019 for depreciation: see https://github.com/argoproj/argo-cd/issues/18258
logging.UnaryServerInterceptor(grpc_util.InterceptorLogger(server.log)),
serverMetrics.UnaryServerInterceptor(),
grpc_auth.UnaryServerInterceptor(server.Authenticate),
@@ -973,6 +970,7 @@ func (server *ArgoCDServer) newGRPCServer() (*grpc.Server, application.AppResour
grpc_util.ErrorCodeGitUnaryServerInterceptor(),
recovery.UnaryServerInterceptor(recovery.WithRecoveryHandler(grpc_util.LoggerRecoveryHandler(server.log))),
))
sOpts = append(sOpts, grpc.StatsHandler(otelgrpc.NewServerHandler()))
grpcS := grpc.NewServer(sOpts...)
versionpkg.RegisterVersionServiceServer(grpcS, server.serviceSet.VersionService)