diff options
| author | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-12-06 14:10:21 +0300 |
|---|---|---|
| committer | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-12-06 14:10:21 +0300 |
| commit | 4e0ba5e766b4cb54e70d4e543d1ce27235a7d6b8 (patch) | |
| tree | 6eb04807a473b8962d478b035fe3a5781c07ffb4 | |
| parent | 5d3e067bb9389a8a02f695046f5651210f2762e5 (diff) | |
| parent | 2bb85b808cd04ca443eb560dfa6c1df2232f3d36 (diff) | |
Merge branch 'pks-structerr-fix-async-logging-flake' into 'master'
structerr: Fix test flake caused by async logging
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5139
Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | internal/structerr/fields_producer_test.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/internal/structerr/fields_producer_test.go b/internal/structerr/fields_producer_test.go index ef6bbee45..9dc2eb108 100644 --- a/internal/structerr/fields_producer_test.go +++ b/internal/structerr/fields_producer_test.go @@ -11,7 +11,6 @@ import ( "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v15/internal/grpcstats" "gitlab.com/gitlab-org/gitaly/v15/internal/log" "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper" "google.golang.org/grpc" @@ -44,15 +43,12 @@ func TestFieldsProducer(t *testing.T) { service := &mockService{} server := grpc.NewServer( - grpc.StatsHandler(log.PerRPCLogHandler{ - Underlying: &grpcstats.PayloadBytes{}, - }), grpcmw.WithUnaryServerChain( grpcmwlogrus.UnaryServerInterceptor( logrus.NewEntry(logger), grpcmwlogrus.WithMessageProducer( log.MessageProducer( - log.PropagationMessageProducer(grpcmwlogrus.DefaultMessageProducer), + grpcmwlogrus.DefaultMessageProducer, FieldsProducer, ), ), |