fix: fix

Signed-off-by: yuluo-yx <[email protected]>

cmd/run.go

@@ -195,7 +195,7 @@ func (o *runOption) startMonitor() (err error) {
 	execer := fakeruntime.NewDefaultExecerWithContext(o.context)
 	go func(socketURL, plugin string) {
 		if err = execer.RunCommandWithIO(plugin, "", os.Stdout, os.Stderr, nil, "server", "--socket", socketURL); err != nil {
-			runLogger.Info("failed to start ", socketURL, " error: ", err.Error())
+			runLogger.Info("failed to start", "socketURL", socketURL, " error", err.Error())
 		}
 	}(sockFile, monitorBin)
 
@@ -284,7 +284,7 @@ func (o *runOption) runSuiteWithDuration(loader testing.Loader) (err error) {
 				defer sem.Release(1)
 				defer wait.Done()
 				defer func() {
-					runLogger.Info("routing end with ", time.Since(now))
+					runLogger.Info("routing end with", "time", time.Since(now))
 				}()
 
 				dataContext := getDefaultContext()

cmd/server.go

@@ -233,7 +233,7 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 			reflection.Register(gRPCServer)
 		}
 		server.RegisterRunnerServer(s, remoteServer)
-		serverLogger.Info("gRPC server listening at ", lis.Addr())
+		serverLogger.Info("gRPC server listening at", "addr", lis.Addr())
 		s.Serve(lis)
 	}()
 
@@ -285,7 +285,7 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 
 		debugHandler(mux, remoteServer)
 		o.httpServer.WithHandler(mux)
-		serverLogger.Info("HTTP server listening at ", httplis.Addr())
+		serverLogger.Info("HTTP server listening at", "addr", httplis.Addr())
 		serverLogger.Info("Server is running.")
 		err = o.httpServer.Serve(httplis)
 		err = util.IgnoreErrServerClosed(err)
@@ -359,7 +359,7 @@ func debugHandler(mux *runtime.ServeMux, remoteServer server.RunnerServer) {
 		sub := pathParams["sub"]
 		extName := r.URL.Query().Get("name")
 		if extName != "" && remoteServer != nil {
-			serverLogger.Info("get pprof of extension:", extName)
+			serverLogger.Info("get pprof of extension", "name", extName)
 
 			ctx := metadata.NewIncomingContext(r.Context(), metadata.New(map[string]string{
 				server.HeaderKeyStoreName: extName,

pkg/generator/converter_jmeter.go

@@ -55,7 +55,7 @@ func (c *jmeterConverter) buildJmeterTestPlan(testSuite *testing.TestSuite) (res
 	for _, item := range testSuite.Items {
 		item.Request.RenderAPI(testSuite.API)
 		if reqRenderErr := item.Request.Render(emptyCtx, ""); reqRenderErr != nil {
-			genLogger.Info("Error rendering request: ", reqRenderErr)
+			genLogger.Info("Error rendering request", "error", reqRenderErr)
 		}
 
 		api, err := url.Parse(item.Request.API)

pkg/mock/in_memory.go

@@ -18,12 +18,13 @@ package mock
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/linuxsuren/api-testing/pkg/version"
 	"io"
 	"net"
 	"net/http"
 	"strings"
 
+	"github.com/linuxsuren/api-testing/pkg/version"
+
 	"github.com/linuxsuren/api-testing/pkg/logging"
 	"github.com/linuxsuren/api-testing/pkg/render"
 	"github.com/linuxsuren/api-testing/pkg/util"
@@ -129,7 +130,7 @@ func (s *inMemoryServer) startObject(obj Object) {
 
 				_, _ = w.Write(data)
 			} else {
-				memLogger.Info("failed to read from body", err)
+				memLogger.Info("failed to read from body", "error", err)
 			}
 		case http.MethodDelete:
 			// delete an item
@@ -155,7 +156,7 @@ func (s *inMemoryServer) startObject(obj Object) {
 
 				_, _ = w.Write(data)
 			} else {
-				memLogger.Info("failed to read from body", err)
+				memLogger.Info("failed to read from body", "error", err)
 			}
 		case http.MethodPut:
 			if data, err := io.ReadAll(req.Body); err == nil {
@@ -176,7 +177,7 @@ func (s *inMemoryServer) startObject(obj Object) {
 
 				_, _ = w.Write(data)
 			} else {
-				memLogger.Info("failed to read from body", err)
+				memLogger.Info("failed to read from body", "error", err)
 			}
 		default:
 			w.WriteHeader(http.StatusBadRequest)

pkg/oauth/server.go

@@ -21,6 +21,7 @@ import (
 	"net/http"
 
 	"context"
+
 	"github.com/linuxsuren/api-testing/pkg/logging"
 	"github.com/linuxsuren/api-testing/pkg/util"
 
@@ -71,7 +72,7 @@ func (a *auth) Callback(w http.ResponseWriter, r *http.Request, pathParams map[s
 		http.Error(w, "Code not found", http.StatusBadRequest)
 		return
 	}
-	oauthLogger.Info("get code", code)
+	oauthLogger.Info("get code", "code" code)
 
 	sslcli := util.TlsAwareHTTPClient(a.skipTlsVerify)
 	ctx := context.WithValue(r.Context(), oauth2.HTTPClient, sslcli)
@@ -90,9 +91,9 @@ func (a *auth) getUserInfo(w http.ResponseWriter, r *http.Request, token *oauth2
 	// get userInfo, save it to session
 	if userInfo, err := GetUserInfo(a.provider, token.AccessToken, a.skipTlsVerify); err == nil {
 		accessToken[token.AccessToken] = userInfo
-		oauthLogger.Info(userInfo.Name, "has login")
+		oauthLogger.Info("has login", "username", userInfo.Name)
 	} else {
-		oauthLogger.Info("failed to get userinfo", err)
+		oauthLogger.Info("failed to get userinfo", "error", err)
 	}
 
 	http.Redirect(w, r, "/?access_token="+token.AccessToken, http.StatusFound)
@@ -115,7 +116,7 @@ var deviceAuthResponseMap = map[string]*oauth2.DeviceAuthResponse{}
 func (a *auth) RequestLocalCode(w http.ResponseWriter, r *http.Request, pathParams map[string]string) {
 	response, err := a.config.DeviceAuth(context.Background())
 	if err != nil {
-		oauthLogger.Info("failed to get device auth", err)
+		oauthLogger.Info("failed to get device auth", "error", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -127,7 +128,7 @@ func (a *auth) RequestLocalCode(w http.ResponseWriter, r *http.Request, pathPara
 
 func (a *auth) RequestCode(w http.ResponseWriter, r *http.Request, pathParams map[string]string) {
 	ref := r.Header.Get("Referer")
-	oauthLogger.Info("callback host", r.Host)
+	oauthLogger.Info("callback host", "host", r.Host)
 
 	if ref == "" {
 		a.config.RedirectURL = fmt.Sprintf("https://%s/oauth2/callback", r.Host)

pkg/oauth/user.go

@@ -18,11 +18,12 @@ package oauth
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/linuxsuren/api-testing/pkg/logging"
 	"io"
 	"net/http"
 	"strings"
 
+	"github.com/linuxsuren/api-testing/pkg/logging"
+
 	"github.com/linuxsuren/api-testing/pkg/util"
 )
 
@@ -84,7 +85,7 @@ func GetUserInfo(server OAuthProvider, token string, skipTlsVerify bool) (userIn
 	}
 	defer resp.Body.Close()
 
-	userLogger.Info("getting userinfo from", server.GetName())
+	userLogger.Info("getting userinfo from", "name", server.GetName())
 	if resp.StatusCode == http.StatusOK {
 		var data []byte
 		if data, err = io.ReadAll(resp.Body); err != nil {

pkg/runner/expr_function.go

@@ -90,20 +90,20 @@ func ExprFuncHTTPReady(params ...interface{}) (res interface{}, err error) {
 				unstruct := make(map[string]interface{})
 
 				if err = json.Unmarshal(data, &unstruct); err != nil {
-					runnerLogger.Info("failed to unmarshal the response data ", err)
+					runnerLogger.Info("failed to unmarshal the response data ", "error", err)
 					return
 				}
 
 				unstruct["data"] = unstruct
 				var program *vm.Program
 				if program, err = expr.Compile(exprText, expr.Env(unstruct)); err != nil {
-					runnerLogger.Info("failed to compile ", exprText, "error: ", err)
+					runnerLogger.Info("failed to compile ", "text", exprText, "error: ", err)
 					return
 				}
 
 				var result interface{}
 				if result, err = expr.Run(program, unstruct); err != nil {
-					runnerLogger.Info("failed to Run ", exprText, "error: ", err)
+					runnerLogger.Info("failed to Run", "text", exprText, "error: ", err)
 					return
 				}
 
@@ -120,7 +120,7 @@ func ExprFuncHTTPReady(params ...interface{}) (res interface{}, err error) {
 			return
 		}
 
-		runnerLogger.Info("waiting for", api)
+		runnerLogger.Info("waiting for", "api", api)
 		time.Sleep(1 * time.Second)
 	}
 	err = fmt.Errorf("failed to wait for the API ready in %d times", retry)

pkg/runner/grpc.go

@@ -381,7 +381,7 @@ func compileProto(ctx context.Context, r *gRPCTestCaseRunner) (fileLinker linker
 		return
 	}
 
-	grpcRunnerLogger.Info("proto import files", importPath)
+	grpcRunnerLogger.Info("proto import files", "files", importPath)
 	compiler := protocompile.Compiler{
 		Resolver: protocompile.WithStandardImports(
 			&protocompile.SourceResolver{

pkg/runner/grpc_test.go

@@ -272,7 +272,7 @@ func runServer(t *testing.T, s *grpc.Server) net.Listener {
 	l, err := net.Listen("tcp", "127.0.0.1:0")
 	assert.NoError(t, err, "Listen port")
 
-	runnerLogger.Info("listening at", l.Addr().(*net.TCPAddr).Port)
+	runnerLogger.Info("listening at", "port", l.Addr().(*net.TCPAddr).Port)
 	go s.Serve(l)
 	return l
 }

pkg/runner/http.go

@@ -317,7 +317,7 @@ func verifyResponseBodyData(caseName string, expect testing.Response, responseTy
 
 	verifier := NewBodyVerify(responseType, expect)
 	if verifier == nil {
-		runnerLogger.Info("no body verify support with ", responseType)
+		runnerLogger.Info("no body verify support with", "response type", responseType)
 		return
 	}
 

pkg/runner/reporter_memory.go

@@ -58,7 +58,7 @@ func (r *memoryTestReporter) PutRecord(record *ReportRecord) {
 		Name: r.monitorTarget,
 	})
 	if err != nil {
-		runnerLogger.Info("failed to get resource usage:", err)
+		runnerLogger.Info("failed to get resource usage", "error", err)
 	} else {
 		r.resourceUsages = append(r.resourceUsages, ResourceUsage{
 			Memory: usage.Memory,

pkg/runner/writer_github_pr_comment.go

@@ -20,12 +20,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/linuxsuren/api-testing/pkg/logging"
 	"io"
 	"net/http"
 	"os"
 	"strings"
 
+	"github.com/linuxsuren/api-testing/pkg/logging"
+
 	"github.com/linuxsuren/api-testing/pkg/apispec"
 	"github.com/linuxsuren/api-testing/pkg/util"
 )
@@ -153,7 +154,7 @@ func (w *githubPRCommentWriter) createOrUpdate(content string, id int) (err erro
 		Body: content,
 	}
 
-	githubLogger.Info("comment id", id)
+	githubLogger.Info("comment id", "id", id)
 	var data []byte
 	if data, err = json.Marshal(co); err != nil {
 		err = fmt.Errorf("failed to marshal body when createOrupdate comment: %v", err)

pkg/server/fake_server.go

@@ -62,7 +62,7 @@ func NewFakeClient(ctx context.Context, version string, err error) (RunnerClient
 	RegisterRunnerServer(baseServer, NewServer(version, err))
 	go func() {
 		if err := baseServer.Serve(lis); err != nil {
-			fakeLogger.Info("error serving server: ", err)
+			fakeLogger.Info("error serving server", "error", err)
 		}
 	}()
 
@@ -71,13 +71,13 @@ func NewFakeClient(ctx context.Context, version string, err error) (RunnerClient
 			return lis.Dial()
 		}), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
-		fakeLogger.Info("error connecting to server: ", err)
+		fakeLogger.Info("error connecting to server", "error", err)
 	}
 
 	closer := func() {
 		err := lis.Close()
 		if err != nil {
-			fakeLogger.Info("error closing listener: ", err)
+			fakeLogger.Info("error closing listener", "error", err)
 		}
 		baseServer.Stop()
 	}

pkg/server/remote_server.go

@@ -150,7 +150,7 @@ func (s *server) getSuiteFromTestTask(task *TestTask) (suite *testing.TestSuite,
 
 		if targetTestcase != nil {
 			parentCases := findParentTestCases(targetTestcase, suite)
-			remoteServerLogger.Info("find %d parent cases\n", len(parentCases))
+			remoteServerLogger.Info("find parent cases", "num", len(parentCases))
 			suite.Items = append(parentCases, *targetTestcase)
 		} else {
 			err = fmt.Errorf("cannot found testcase %s", task.CaseName)
@@ -182,7 +182,7 @@ func (s *server) getLoader(ctx context.Context) (loader testing.Writer) {
 
 			var err error
 			if loader, err = s.getLoaderByStoreName(storeName); err != nil {
-				remoteServerLogger.Info("failed to get loader", storeName, err)
+				remoteServerLogger.Info("failed to get loader", "name", storeName, "error", err)
 				loader = testing.NewNonWriter()
 			}
 		}
@@ -212,8 +212,8 @@ func (s *server) Run(ctx context.Context, task *TestTask) (reply *TestResult, er
 		return
 	}
 
-	remoteServerLogger.Info("prepare to run: ", suite.Name, " with level: ", task.Level)
-	remoteServerLogger.Info("task kind: ", task.Kind, len(suite.Items), "to run")
+	remoteServerLogger.Info("prepare to run", "name", suite.Name, " with level: ", task.Level)
+	remoteServerLogger.Info("task kind to run", "kind", task.Kind, "lens", len(suite.Items))
 	dataContext := map[string]interface{}{}
 
 	if err = suite.Render(dataContext); err != nil {
@@ -653,7 +653,7 @@ func (s *server) GetSuggestedAPIs(ctx context.Context, in *TestSuiteIdentity) (r
 		return
 	}
 
-	remoteServerLogger.Info("Finding APIs from", in.Name, "with loader", reflect.TypeOf(loader))
+	remoteServerLogger.Info("Finding APIs from", "name", in.Name, "with loader", reflect.TypeOf(loader))
 
 	suiteRunner := runner.GetTestSuiteRunner(suite)
 	var result []*testing.TestCase
@@ -866,7 +866,7 @@ func findParentTestCases(testcase *testing.TestCase, suite *testing.TestSuite) (
 		findExpectNames(testcase.Request.API, expectNames)
 		findExpectNames(testcase.Request.Body.String(), expectNames)
 
-		remoteServerLogger.Info("expect test case names", expectNames.GetAll())
+		remoteServerLogger.Info("expect test case names", "name", expectNames.GetAll())
 		for _, item := range suite.Items {
 			if expectNames.Exist(item.Name) {
 				testcases = append(testcases, item)

pkg/server/store_ext_manager.go

@@ -17,11 +17,12 @@ package server
 
 import (
 	"fmt"
-	"github.com/linuxsuren/api-testing/pkg/logging"
 	"os"
 	"strings"
 	"syscall"
 
+	"github.com/linuxsuren/api-testing/pkg/logging"
+
 	fakeruntime "github.com/linuxsuren/go-fake-runtime"
 )
 
@@ -82,7 +83,7 @@ func (s *storeExtManager) Start(name, socket string) (err error) {
 }
 
 func (s *storeExtManager) StopAll() error {
-	serverLogger.Info("stop", len(s.processs), "extensions")
+	serverLogger.Info("stop", "extensions", len(s.processs))
 	for _, p := range s.processs {
 		if p != nil {
 			p.Signal(syscall.SIGTERM)

pkg/testing/loader_file.go

@@ -19,7 +19,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/linuxsuren/api-testing/pkg/logging"
 	"io"
 	"net/http"
 	"net/url"
@@ -29,6 +28,8 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/linuxsuren/api-testing/pkg/logging"
+
 	"github.com/linuxsuren/api-testing/pkg/util"
 )
 
@@ -164,13 +165,13 @@ func (l *fileLoader) ListTestSuite() (suites []TestSuite, err error) {
 		var data []byte
 		var loadErr error
 		if data, loadErr = loadData(target); err != nil {
-			loaderLogger.Info("failed to load data", loadErr)
+			loaderLogger.Info("failed to load data", "error", loadErr)
 			continue
 		}
 
 		var testSuite *TestSuite
 		if testSuite, loadErr = Parse(data); loadErr != nil {
-			loaderLogger.Info("failed to parse data", loadErr, "from", target)
+			loaderLogger.Info("failed to parse data", "error", loadErr, "from", target)
 			continue
 		}
 		suites = append(suites, *testSuite)
@@ -216,7 +217,7 @@ func (l *fileLoader) CreateSuite(name, api string) (err error) {
 
 		newSuiteFile := path.Join(l.parent, fmt.Sprintf("%s.yaml", name))
 		if newSuiteFile, err = filepath.Abs(newSuiteFile); err == nil {
-			loaderLogger.Info("new suite file:", newSuiteFile)
+			loaderLogger.Info("new suite file", "file", newSuiteFile)
 
 			suite := &TestSuite{
 				Name: name,