diff --git a/tools/keeper/api/common.go b/tools/keeper/api/common.go
index d02a30eb8b..26e38e8dd0 100644
--- a/tools/keeper/api/common.go
+++ b/tools/keeper/api/common.go
@@ -17,10 +17,7 @@ var commonLogger = log.GetLogger("CMN")
 
 func CreateDatabase(username string, password string, host string, port int, usessl bool, dbname string, databaseOptions map[string]interface{}) {
 	qid := util.GetQidOwn()
-
-	commonLogger := commonLogger.WithFields(
-		logrus.Fields{config.ReqIDKey: qid},
-	)
+	commonLogger := commonLogger.WithFields(logrus.Fields{config.ReqIDKey: qid})
 
 	ctx := context.Background()
 
@@ -43,7 +40,6 @@ func CreateDatabase(username string, password string, host string, port int, use
 		}
 		return
 	}
-	panic(err)
 }
 
 func generateCreateDBSql(dbname string, databaseOptions map[string]interface{}) string {
diff --git a/tools/keeper/api/report.go b/tools/keeper/api/report.go
index eb9c3856f8..876d99da2d 100644
--- a/tools/keeper/api/report.go
+++ b/tools/keeper/api/report.go
@@ -384,7 +384,7 @@ func insertClusterInfoSql(info ClusterInfo, ClusterID string, protocol int, ts s
 		sqls = append(sqls, fmt.Sprintf("insert into d_info_%s using d_info tags (%d, '%s', '%s') values ('%s', '%s')",
 			ClusterID+strconv.Itoa(dnode.DnodeID), dnode.DnodeID, dnode.DnodeEp, ClusterID, ts, dnode.Status))
 		dtotal++
-		if "ready" == dnode.Status {
+		if dnode.Status == "ready" {
 			dalive++
 		}
 	}
@@ -393,8 +393,8 @@ func insertClusterInfoSql(info ClusterInfo, ClusterID string, protocol int, ts s
 		sqls = append(sqls, fmt.Sprintf("insert into m_info_%s using m_info tags (%d, '%s', '%s') values ('%s', '%s')",
 			ClusterID+strconv.Itoa(mnode.MnodeID), mnode.MnodeID, mnode.MnodeEp, ClusterID, ts, mnode.Role))
 		mtotal++
-		//LEADER FOLLOWER CANDIDATE ERROR
-		if "ERROR" != mnode.Role {
+		// LEADER FOLLOWER CANDIDATE ERROR
+		if mnode.Role != "ERROR" {
 			malive++
 		}
 	}
diff --git a/tools/keeper/db/connector.go b/tools/keeper/db/connector.go
index a8f106e952..b55f449d25 100644
--- a/tools/keeper/db/connector.go
+++ b/tools/keeper/db/connector.go
@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
-	"github.com/taosdata/driver-go/v3/common"
 
 	_ "github.com/taosdata/driver-go/v3/taosRestful"
 	"github.com/taosdata/taoskeeper/infrastructure/config"
@@ -70,9 +69,13 @@ func NewConnectorWithDb(username, password, host string, port int, dbname string
 	return &Connector{db: db}, nil
 }
 
+type ReqIDKeyTy string
+
+const ReqIDKey ReqIDKeyTy = "taos_req_id"
+
 func (c *Connector) Exec(ctx context.Context, sql string, qid uint64) (int64, error) {
 	dbLogger := dbLogger.WithFields(logrus.Fields{config.ReqIDKey: qid})
-	ctx = context.WithValue(ctx, common.ReqIDKey, int64(qid))
+	ctx = context.WithValue(ctx, ReqIDKey, int64(qid))
 
 	dbLogger.Tracef("call adapter to execute sql:%s", sql)
 	startTime := time.Now()
@@ -120,7 +123,7 @@ func logData(data *Data, logger *logrus.Entry) {
 
 func (c *Connector) Query(ctx context.Context, sql string, qid uint64) (*Data, error) {
 	dbLogger := dbLogger.WithFields(logrus.Fields{config.ReqIDKey: qid})
-	ctx = context.WithValue(ctx, common.ReqIDKey, int64(qid))
+	ctx = context.WithValue(ctx, ReqIDKey, int64(qid))
 
 	dbLogger.Tracef("call adapter to execute query, sql:%s", sql)
 
diff --git a/tools/keeper/infrastructure/log/empty_test.go b/tools/keeper/infrastructure/log/empty_test.go
deleted file mode 100644
index 468c02173b..0000000000
--- a/tools/keeper/infrastructure/log/empty_test.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package log
-
-import (
-	"testing"
-)
-
-func TestEmpty(t *testing.T) {
-}
diff --git a/tools/keeper/infrastructure/log/log.go b/tools/keeper/infrastructure/log/log.go
index 0a54e99eb9..bd7b026897 100644
--- a/tools/keeper/infrastructure/log/log.go
+++ b/tools/keeper/infrastructure/log/log.go
@@ -13,7 +13,6 @@ import (
 	"github.com/sirupsen/logrus"
 	rotatelogs "github.com/taosdata/file-rotatelogs/v2"
 	"github.com/taosdata/taoskeeper/infrastructure/config"
-
 	"github.com/taosdata/taoskeeper/version"
 )
 
diff --git a/tools/keeper/monitor/empty_test.go b/tools/keeper/monitor/empty_test.go
deleted file mode 100644
index 689acfac4c..0000000000
--- a/tools/keeper/monitor/empty_test.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package monitor
-
-import (
-	"testing"
-)
-
-func TestEmpty(t *testing.T) {
-}
diff --git a/tools/keeper/monitor/monitor_test.go b/tools/keeper/monitor/monitor_test.go
index b2b860dcaa..16d0dbe5b2 100644
--- a/tools/keeper/monitor/monitor_test.go
+++ b/tools/keeper/monitor/monitor_test.go
@@ -11,10 +11,9 @@ import (
 	"github.com/taosdata/go-utils/web"
 	"github.com/taosdata/taoskeeper/api"
 	"github.com/taosdata/taoskeeper/db"
-	"github.com/taosdata/taoskeeper/util"
-
 	"github.com/taosdata/taoskeeper/infrastructure/config"
 	"github.com/taosdata/taoskeeper/infrastructure/log"
+	"github.com/taosdata/taoskeeper/util"
 )
 
 func TestStart(t *testing.T) {
@@ -35,7 +34,7 @@ func TestStart(t *testing.T) {
 	conf.RotationInterval = "1s"
 	StartMonitor("", conf, reporter)
 	time.Sleep(2 * time.Second)
-	for k, _ := range SysMonitor.outputs {
+	for k := range SysMonitor.outputs {
 		SysMonitor.Deregister(k)
 	}
 
diff --git a/tools/keeper/util/pool/antpool.go b/tools/keeper/util/pool/antpool.go
index 7a4ecd46de..73529469f5 100644
--- a/tools/keeper/util/pool/antpool.go
+++ b/tools/keeper/util/pool/antpool.go
@@ -1,8 +1,6 @@
 package pool
 
-import (
-	"github.com/panjf2000/ants/v2"
-)
+import "github.com/panjf2000/ants/v2"
 
 var GoroutinePool *ants.Pool