diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-10-30 10:44:06 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-10-30 10:44:06 +0300 |
| commit | f0ca42f38c3cd484dc54faf0fbf66fb6496d6623 (patch) | |
| tree | 770bb7b65da33c2f2c86ff8603098f7926981ef0 | |
| parent | c2f43f9705c16e6ffd246a5569e4163303f598d6 (diff) | |
| parent | b2d8f6b490019a60f0c9e30e9261278d6c6e1e41 (diff) | |
Merge branch 'po-praefect-log-requests' into 'master'
Add gRPC intercept loggers
See merge request gitlab-org/gitaly!1573
| -rw-r--r-- | changelogs/unreleased/po-praefect-log-requests.yml | 5 | ||||
| -rw-r--r-- | internal/praefect/server.go | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/po-praefect-log-requests.yml b/changelogs/unreleased/po-praefect-log-requests.yml new file mode 100644 index 000000000..1bc5fb201 --- /dev/null +++ b/changelogs/unreleased/po-praefect-log-requests.yml @@ -0,0 +1,5 @@ +--- +title: Add gRPC intercept loggers to Praefect +merge_request: 1573 +author: +type: added diff --git a/internal/praefect/server.go b/internal/praefect/server.go index c689bec4d..7a4349260 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -7,6 +7,7 @@ import ( "net" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/middleware/cancelhandler" @@ -58,6 +59,7 @@ func NewServer(c *Coordinator, repl ReplMgr, grpcOpts []grpc.ServerOption, l *lo grpc.StreamInterceptor(grpc_middleware.ChainStreamServer( grpccorrelation.StreamServerCorrelationInterceptor(), // Must be above the metadata handler grpc_prometheus.StreamServerInterceptor, + grpc_logrus.StreamServerInterceptor(l), cancelhandler.Stream, // Should be below LogHandler grpctracing.StreamServerTracingInterceptor(), auth.StreamServerInterceptor(conf.Auth), @@ -69,6 +71,7 @@ func NewServer(c *Coordinator, repl ReplMgr, grpcOpts []grpc.ServerOption, l *lo grpccorrelation.UnaryServerCorrelationInterceptor(), // Must be above the metadata handler metadatahandler.UnaryInterceptor, grpc_prometheus.UnaryServerInterceptor, + grpc_logrus.UnaryServerInterceptor(l), cancelhandler.Unary, // Should be below LogHandler grpctracing.UnaryServerTracingInterceptor(), auth.UnaryServerInterceptor(conf.Auth), |