diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-09-15 13:59:03 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-09-18 15:05:40 +0300 |
| commit | 3325e4553b54ec597b8f3a3c4006a9cb28a2eb2b (patch) | |
| tree | 197192667cf17889fa1bab7fd842448b5253e9b2 /internal/limiter | |
| parent | bdc3d567f4c6ad96898d41dd4e66af13401847d6 (diff) | |
global: Replace `logrus.Fields` with a wrapper type
Introduce our own wrapper type for the `logrus.Fields` type. This allows
us to get rid of the logrus import in many places and thus is another
step towards getting rid of the `logrus` dependency altogether in our
code base.
Diffstat (limited to 'internal/limiter')
| -rw-r--r-- | internal/limiter/monitor_test.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/internal/limiter/monitor_test.go b/internal/limiter/monitor_test.go index 44b98cec1..ca4c23b3d 100644 --- a/internal/limiter/monitor_test.go +++ b/internal/limiter/monitor_test.go @@ -7,7 +7,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" - "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" promconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" "gitlab.com/gitlab-org/gitaly/v16/internal/log" @@ -104,7 +103,7 @@ queued{grpc_method="unknown",grpc_service="unknown",system="gitaly"} 1 stats := log.CustomFieldsFromContext(ctx) require.NotNil(t, stats) - require.Equal(t, logrus.Fields{ + require.Equal(t, log.Fields{ "limit.limiting_type": TypePerRPC, "limit.limiting_key": fullMethod, "limit.concurrency_queue_ms": int64(1000), @@ -177,7 +176,7 @@ queued{grpc_method="unknown",grpc_service="unknown",system="gitaly"} 1 stats := log.CustomFieldsFromContext(ctx) require.NotNil(t, stats) - require.Equal(t, logrus.Fields{ + require.Equal(t, log.Fields{ "limit.limiting_type": TypePerRPC, "limit.limiting_key": fullMethod, "limit.concurrency_queue_ms": int64(1000), @@ -230,7 +229,7 @@ queued{grpc_method="unknown",grpc_service="unknown",system="gitaly"} 0 stats := log.CustomFieldsFromContext(ctx) require.NotNil(t, stats) - require.Equal(t, logrus.Fields{ + require.Equal(t, log.Fields{ "limit.limiting_type": TypePerRPC, "limit.limiting_key": fullMethod, "limit.concurrency_queue_ms": int64(1000), @@ -286,7 +285,7 @@ gitaly_pack_objects_queued 1 stats := log.CustomFieldsFromContext(ctx) require.NotNil(t, stats) - require.Equal(t, logrus.Fields{ + require.Equal(t, log.Fields{ "limit.limiting_type": TypePackObjects, "limit.limiting_key": "1234", "limit.concurrency_queue_ms": int64(1000), @@ -361,7 +360,7 @@ gitaly_pack_objects_queued 1 stats := log.CustomFieldsFromContext(ctx) require.NotNil(t, stats) - require.Equal(t, logrus.Fields{ + require.Equal(t, log.Fields{ "limit.limiting_type": TypePackObjects, "limit.limiting_key": "1234", "limit.concurrency_queue_ms": int64(1000), @@ -417,7 +416,7 @@ gitaly_pack_objects_queued 0 stats := log.CustomFieldsFromContext(ctx) require.NotNil(t, stats) - require.Equal(t, logrus.Fields{ + require.Equal(t, log.Fields{ "limit.limiting_type": TypePackObjects, "limit.limiting_key": "1234", "limit.concurrency_queue_ms": int64(1000), |