diff options
| author | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-12-27 13:10:28 +0300 |
|---|---|---|
| committer | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-12-27 13:10:28 +0300 |
| commit | 1a82d06e41054952e957b97e62325ea2853382ab (patch) | |
| tree | 1925f4d96dc3c87e3b9439d338c31abf68ec02fe | |
| parent | 7009d90dabb1f18a921af11fe12cb8640d7fa14a (diff) | |
| parent | d8cf8080c035f53217238bd8f6c0bc70a8142093 (diff) | |
Merge branch 'pks-structerr-fix-error-metadata-field' into 'master'
structerr: Fix error metadata log field colliding with normal error
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5220
Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | internal/gitaly/service/commit/check_objects_exist_test.go | 2 | ||||
| -rw-r--r-- | internal/structerr/fields_producer.go | 2 | ||||
| -rw-r--r-- | internal/structerr/fields_producer_test.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/internal/gitaly/service/commit/check_objects_exist_test.go b/internal/gitaly/service/commit/check_objects_exist_test.go index b98ef3d45..ab6d0383e 100644 --- a/internal/gitaly/service/commit/check_objects_exist_test.go +++ b/internal/gitaly/service/commit/check_objects_exist_test.go @@ -251,7 +251,7 @@ func TestCheckObjectsExist(t *testing.T) { metadata := map[string]any{} for _, entry := range hook.AllEntries() { - errorMetadata, ok := entry.Data["error.metadata"] + errorMetadata, ok := entry.Data["error_metadata"] if !ok { continue } diff --git a/internal/structerr/fields_producer.go b/internal/structerr/fields_producer.go index d4d6d16b4..367f149e7 100644 --- a/internal/structerr/fields_producer.go +++ b/internal/structerr/fields_producer.go @@ -18,7 +18,7 @@ func FieldsProducer(_ context.Context, err error) logrus.Fields { } return logrus.Fields{ - "error.metadata": metadata, + "error_metadata": metadata, } } diff --git a/internal/structerr/fields_producer_test.go b/internal/structerr/fields_producer_test.go index 9dc2eb108..27bde9a32 100644 --- a/internal/structerr/fields_producer_test.go +++ b/internal/structerr/fields_producer_test.go @@ -120,7 +120,7 @@ func TestFieldsProducer(t *testing.T) { var metadata []map[string]any for _, entry := range loggerHook.AllEntries() { - if untypedMetadata := entry.Data["error.metadata"]; untypedMetadata != nil { + if untypedMetadata := entry.Data["error_metadata"]; untypedMetadata != nil { require.IsType(t, untypedMetadata, map[string]any{}) metadata = append(metadata, untypedMetadata.(map[string]any)) } |