mirror of
https://github.com/siderolabs/discovery-service.git
synced 2025-03-14 09:55:08 +00:00
b8da986b5a
Rework the gRPC logger by using hand-rolled simple version, rework version parsing to remove regexp matching. The baseline (via benchmark): ``` BenchmarkViaClientSimulator-32 2934 387398 ns/op 101921 B/op 832 allocs/op ``` The baseline + removed logging middleware: ``` BenchmarkViaClientSimulator-32 3543 331166 ns/op 73581 B/op 543 allocs/op ``` Reworked logging middleware: ``` BenchmarkViaClientSimulator-32 3394 334066 ns/op 77985 B/op 568 allocs/op ``` Plus reworked version parsing: ``` BenchmarkViaClientSimulator-32 3510 325714 ns/op 66215 B/op 561 allocs/op ``` So overall, baseline to this PR: * allocs 101921 -> 66215 B/op * alloc ops 832 -> 561 allocs/op Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
102 lines
2.2 KiB
Go
102 lines
2.2 KiB
Go
// Copyright (c) 2024 Sidero Labs, Inc.
|
|
//
|
|
// Use of this software is governed by the Business Source License
|
|
// included in the LICENSE file.
|
|
|
|
package server
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"go.uber.org/zap"
|
|
"go.uber.org/zap/zapcore"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/status"
|
|
)
|
|
|
|
func extractFields(req any) []zapcore.Field {
|
|
var result []zapcore.Field
|
|
|
|
if msg, ok := req.(interface {
|
|
GetClusterId() string
|
|
}); ok {
|
|
result = append(result, zap.String("cluster_id", msg.GetClusterId()))
|
|
}
|
|
|
|
if msg, ok := req.(interface {
|
|
GetAffiliateId() string
|
|
}); ok {
|
|
result = append(result, zap.String("affiliate_id", msg.GetAffiliateId()))
|
|
}
|
|
|
|
if msg, ok := req.(interface {
|
|
GetClientVersion() string
|
|
}); ok {
|
|
result = append(result, zap.String("client_version", msg.GetClientVersion()))
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// UnaryRequestLogger returns a new unary server interceptor that logs the requests.
|
|
func UnaryRequestLogger(logger *zap.Logger) grpc.UnaryServerInterceptor {
|
|
return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
|
|
startTime := time.Now()
|
|
|
|
resp, err := handler(ctx, req)
|
|
|
|
duration := time.Since(startTime)
|
|
code := status.Code(err)
|
|
|
|
level := zapcore.InfoLevel
|
|
|
|
if err != nil {
|
|
level = zapcore.ErrorLevel
|
|
}
|
|
|
|
logger.Log(level, info.FullMethod,
|
|
append(
|
|
[]zapcore.Field{
|
|
zap.Duration("duration", duration),
|
|
zap.Stringer("code", code),
|
|
zap.Error(err),
|
|
zap.Stringer("peer.address", PeerAddress(ctx)),
|
|
},
|
|
extractFields(req)...,
|
|
)...,
|
|
)
|
|
|
|
return resp, err
|
|
}
|
|
}
|
|
|
|
// StreamRequestLogger returns a new stream server interceptor that logs the requests.
|
|
func StreamRequestLogger(logger *zap.Logger) grpc.StreamServerInterceptor {
|
|
return func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
|
|
ctx := ss.Context()
|
|
|
|
startTime := time.Now()
|
|
|
|
err := handler(srv, ss)
|
|
|
|
duration := time.Since(startTime)
|
|
code := status.Code(err)
|
|
|
|
level := zapcore.InfoLevel
|
|
|
|
if err != nil {
|
|
level = zapcore.ErrorLevel
|
|
}
|
|
|
|
logger.Log(level, info.FullMethod,
|
|
zap.Duration("duration", duration),
|
|
zap.Stringer("code", code),
|
|
zap.Error(err),
|
|
zap.Stringer("peer.address", PeerAddress(ctx)),
|
|
)
|
|
|
|
return err
|
|
}
|
|
}
|