chore: Add new logs and support time format display (#136)

Author: youjie23

commands/verify/verify.go

@@ -20,6 +20,7 @@ package verify
 import (
 	"context"
 	"fmt"
+	"github.com/apache/skywalking-infra-e2e/internal/constant"
 	"sync"
 	"time"
 
@@ -219,7 +220,7 @@ func verifyCasesSerially(verify *config.Verify, verifyInfo *verifyInfo) (err err
 
 		if v.GetExpected() == "" {
 			res[idx].Skip = false
-			res[idx].Msg = fmt.Sprintf("failed to verify %v", caseName(v))
+			res[idx].Msg = fmt.Sprintf("%s failed to verify %v", formatVerificationTime(), caseName(v))
 			res[idx].Err = fmt.Errorf("the expected data file for %v is not specified", caseName(v))
 
 			printer.Warning(res[idx].Msg)
@@ -233,9 +234,9 @@ func verifyCasesSerially(verify *config.Verify, verifyInfo *verifyInfo) (err err
 		for current := 0; current <= verifyInfo.retryCount; current++ {
 			if d, e := verifySingleCase(v.GetExpected(), v.GetActual(), v.Query); e == nil {
 				if current == 0 {
-					res[idx].Msg = fmt.Sprintf("verified %v \n", caseName(v))
+					res[idx].Msg = fmt.Sprintf("%s verified %v \n", formatVerificationTime(), caseName(v))
 				} else {
-					res[idx].Msg = fmt.Sprintf("verified %v, retried %d time(s)\n", caseName(v), current)
+					res[idx].Msg = fmt.Sprintf("%s verified %v, retried %d time(s)\n", formatVerificationTime(), caseName(v), current)
 				}
 				res[idx].Skip = false
 				printer.Success(res[idx].Msg)
@@ -244,11 +245,12 @@ func verifyCasesSerially(verify *config.Verify, verifyInfo *verifyInfo) (err err
 				if current == 0 {
 					printer.UpdateText(fmt.Sprintf("failed to verify %v, will continue retry:", caseName(v)))
 				} else {
-					printer.UpdateText(fmt.Sprintf("failed to verify %v, retry [%d/%d]", caseName(v), current, verifyInfo.retryCount))
+					printer.UpdateText(fmt.Sprintf("failed to verify %v, retry [%d/%d]", caseName(v), current,
+						verifyInfo.retryCount))
 				}
 				time.Sleep(verifyInfo.interval)
 			} else {
-				res[idx].Msg = fmt.Sprintf("failed to verify %v, retried %d time(s)", caseName(v), current)
+				res[idx].Msg = fmt.Sprintf("%s failed to verify %v, retried %d time(s)", formatVerificationTime(), caseName(v), current)
 				if d != "" {
 					res[idx].Msg += fmt.Sprintf(", the actual data is:\n%s\n", d)
 				}
@@ -267,6 +269,10 @@ func verifyCasesSerially(verify *config.Verify, verifyInfo *verifyInfo) (err err
 	return nil
 }
 
+func formatVerificationTime() string {
+	return time.Now().Format(constant.LogTimestampFormat)
+}
+
 func caseName(v *config.VerifyCase) string {
 	if v.Name == "" {
 		if v.Actual != "" {

internal/components/trigger/http.go

@@ -99,6 +99,7 @@ func (h *httpAction) Do() chan error {
 				if !sent && (err == nil || h.times == h.executedCount) {
 					result <- err
 					sent = true
+					logger.Log.Infof("trigger has sent result after executed %d requests with err: %v", h.executedCount, err)
 				}
 				if h.times != math.MaxInt32 && h.executedCount >= h.times {
 					logger.Log.Infof("trigger has completed %d requests and will stop.", h.executedCount)

internal/constant/log.go

@@ -0,0 +1,23 @@
+// Licensed to Apache Software Foundation (ASF) under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Apache Software Foundation (ASF) licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package constant
+
+const (
+	LogTimestampFormat = "2006-01-02 15:04:05"
+)

internal/logger/log.go

@@ -18,6 +18,7 @@
 package logger
 
 import (
+	"github.com/apache/skywalking-infra-e2e/internal/constant"
 	"os"
 
 	"github.com/sirupsen/logrus"
@@ -32,7 +33,9 @@ func init() {
 	Log.Level = logrus.InfoLevel
 	Log.SetOutput(os.Stdout)
 	Log.SetFormatter(&logrus.TextFormatter{
-		DisableTimestamp:       true,
+		DisableTimestamp:       false,
+		FullTimestamp:          true,
+		TimestampFormat:        constant.LogTimestampFormat,
 		DisableLevelTruncation: true,
 		ForceColors:            true,
 	})