refactor unit test, refactor option

logging/logrus/options.go

@@ -212,21 +212,6 @@ func DefaultMessageProducer(ctx context.Context, format string, level logrus.Lev
 	if err != nil {
 		fields[logrus.ErrorKey] = err
 	}
-	entry := ctxlogrus.Extract(ctx).WithContext(ctx).WithFields(fields)
-	switch level {
-	case logrus.TraceLevel:
-		entry.Tracef(format)
-	case logrus.DebugLevel:
-		entry.Debugf(format)
-	case logrus.InfoLevel:
-		entry.Infof(format)
-	case logrus.WarnLevel:
-		entry.Warningf(format)
-	case logrus.ErrorLevel:
-		entry.Errorf(format)
-	case logrus.FatalLevel:
-		entry.Fatalf(format)
-	case logrus.PanicLevel:
-		entry.Panicf(format)
-	}
+
+	ctxlogrus.Extract(ctx).WithContext(ctx).WithFields(fields).Logf(level, format)
 }

logging/logrus/options_test.go

@@ -30,25 +30,14 @@ func TestDefaultMessageProducer(t *testing.T) {
 		code   codes.Code
 		err    error
 		fields logrus.Fields
-
-		verify func(*testing.T, *logrus.Entry)
 	}{
 		{
 			label:  "should emit info message without error",
 			format: "test",
 			level:  logrus.InfoLevel,
 			code:   codes.OK,
-			fields: logrus.Fields{},
-			verify: func(t *testing.T, e *logrus.Entry) {
-				t.Helper()
-
-				require.NotNil(t, e)
-
-				assert.Equal(t, "test", e.Message)
-				assert.Equal(t, logrus.Fields{
-					"foo": "bar",
-				}, e.Data)
-				assert.Equal(t, logrus.InfoLevel, e.Level)
+			fields: logrus.Fields{
+				"foo": "bar",
 			},
 		},
 		{
@@ -57,36 +46,18 @@ func TestDefaultMessageProducer(t *testing.T) {
 			level:  logrus.InfoLevel,
 			code:   codes.NotFound,
 			err:    errNotFound,
-			fields: logrus.Fields{},
-			verify: func(t *testing.T, e *logrus.Entry) {
-				t.Helper()
-
-				require.NotNil(t, e)
-
-				assert.Equal(t, "test", e.Message)
-				assert.Equal(t, logrus.Fields{
-					"foo":   "bar",
-					"error": errNotFound,
-				}, e.Data)
-				assert.Equal(t, logrus.InfoLevel, e.Level)
+			fields: logrus.Fields{
+				"foo":           "bar",
+				logrus.ErrorKey: errNotFound,
 			},
 		},
 		{
 			label:  "should emit trace message without error",
 			format: "test",
 			level:  logrus.TraceLevel,
 			code:   codes.OK,
-			fields: logrus.Fields{},
-			verify: func(t *testing.T, e *logrus.Entry) {
-				t.Helper()
-
-				require.NotNil(t, e)
-
-				assert.Equal(t, "test", e.Message)
-				assert.Equal(t, logrus.Fields{
-					"foo": "bar",
-				}, e.Data)
-				assert.Equal(t, logrus.TraceLevel, e.Level)
+			fields: logrus.Fields{
+				"foo": "bar",
 			},
 		},
 	}
@@ -104,11 +75,15 @@ func TestDefaultMessageProducer(t *testing.T) {
 
 			ctx := ctxlogrus.ToContext(context.Background(), logrusEntry)
 
-			DefaultMessageProducer(ctx, tc.format, tc.level, tc.code, tc.err, tc.fields)
+			DefaultMessageProducer(ctx, tc.format, tc.level, tc.code, tc.err, logrus.Fields{})
 
 			lastEntry := hook.LastEntry()
 
-			tc.verify(t, lastEntry)
+			require.NotNil(t, lastEntry)
+
+			assert.Equal(t, "test", lastEntry.Message)
+			assert.Equal(t, tc.fields, lastEntry.Data)
+			assert.Equal(t, tc.level, lastEntry.Level)
 		})
 	}
 }