From a65a382f29c8678c82d2bf9e362f1a8ec92383e6 Mon Sep 17 00:00:00 2001 From: dmathieu <42@dmathieu.com> Date: Wed, 3 Jul 2024 16:39:23 +0200 Subject: [PATCH 1/2] use logtest.AssertRecordEqual in logrus bridge --- bridges/otellogrus/hook_test.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bridges/otellogrus/hook_test.go b/bridges/otellogrus/hook_test.go index 9a468b34f8b..bb840ed62ff 100644 --- a/bridges/otellogrus/hook_test.go +++ b/bridges/otellogrus/hook_test.go @@ -432,11 +432,6 @@ func assertRecords(t *testing.T, want, got []logtest.EmittedRecord) { assert.Equal(t, len(want), len(got)) for i, j := range want { - assert.Equal(t, j.Timestamp(), got[i].Timestamp()) - assert.Equal(t, j.ObservedTimestamp(), got[i].ObservedTimestamp()) - assert.Equal(t, j.Severity(), got[i].Severity()) - assert.Equal(t, j.SeverityText(), got[i].SeverityText()) - assertBody(t, j.Body(), got[i].Body()) - assertAttributes(t, j, got[i]) + logtest.AssertRecordEqual(t, j.Record, got[i].Record) } } From e454daaaa22bde025dd48d09d21b0737782f0c52 Mon Sep 17 00:00:00 2001 From: dmathieu <42@dmathieu.com> Date: Wed, 3 Jul 2024 16:44:34 +0200 Subject: [PATCH 2/2] remove unused assertBody and assertAttributes --- bridges/otellogrus/hook_test.go | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/bridges/otellogrus/hook_test.go b/bridges/otellogrus/hook_test.go index bb840ed62ff..271ee0f7373 100644 --- a/bridges/otellogrus/hook_test.go +++ b/bridges/otellogrus/hook_test.go @@ -400,32 +400,6 @@ func assertKeyValues(t *testing.T, want, got []log.KeyValue) { } } -func assertBody(t *testing.T, want log.Value, got log.Value) { - t.Helper() - if !got.Equal(want) { - t.Errorf("Body value is not equal:\nwant: %v\ngot: %v", want, got) - } -} - -func assertAttributes(t *testing.T, want, got logtest.EmittedRecord) { - t.Helper() - - var wantAttr []log.KeyValue - want.WalkAttributes(func(kv log.KeyValue) bool { - wantAttr = append(wantAttr, kv) - return true - }) - var gotAttr []log.KeyValue - got.WalkAttributes(func(kv log.KeyValue) bool { - gotAttr = append(gotAttr, kv) - return true - }) - - if !slices.EqualFunc(wantAttr, gotAttr, log.KeyValue.Equal) { - t.Errorf("Attributes are not equal:\nwant: %v\ngot: %v", want, got) - } -} - func assertRecords(t *testing.T, want, got []logtest.EmittedRecord) { t.Helper()