fix: health check problem (#4590)

core/stores/sqlx/metrics.go

@@ -41,6 +41,7 @@ var (
 
 type (
 	statGetter struct {
+		host      string
 		dbName    string
 		hash      string
 		poolStats func() sql.DBStats

core/stores/sqlx/sqlmanager.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/go-sql-driver/mysql"
-
+	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/syncx"
 )
 
@@ -27,19 +27,19 @@ func getCachedSqlConn(driverName, server string) (*sql.DB, error) {
 			return nil, err
 		}
 
-		if driverName == mysqlDriverName {
+		if cfg, e := mysql.ParseDSN(server); e != nil {
-			if cfg, err := mysql.ParseDSN(server); err != nil {
+			// if cannot parse, don't collect the metrics
-				// do nothing here
+			logx.Error(e)
-			} else {
+		} else {
-				checksum := sha256.Sum256([]byte(server))
+			checksum := sha256.Sum256([]byte(server))
-				connCollector.registerClient(&statGetter{
+			connCollector.registerClient(&statGetter{
-					dbName: cfg.DBName,
+				host:   cfg.Addr,
-					hash:   hex.EncodeToString(checksum[:]),
+				dbName: cfg.DBName,
-					poolStats: func() sql.DBStats {
+				hash:   hex.EncodeToString(checksum[:]),
-						return conn.Stats()
+				poolStats: func() sql.DBStats {
-					},
+					return conn.Stats()
-				})
+				},
-			}
+			})
 		}
 
 		return conn, nil

internal/health/health.go

@@ -111,6 +111,10 @@ func (p *comboHealthManager) IsReady() bool {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 
+	if len(p.probes) == 0 {
+		return false
+	}
+
 	for _, probe := range p.probes {
 		if !probe.IsReady() {
 			return false

internal/health/health_test.go

@@ -43,7 +43,7 @@ func TestComboHealthManager(t *testing.T) {
 		hm1 := NewHealthManager(probeName)
 		hm2 := NewHealthManager(probeName + "2")
 
-		assert.True(t, chm.IsReady())
+		assert.False(t, chm.IsReady())
 		chm.addProbe(hm1)
 		chm.addProbe(hm2)
 		assert.False(t, chm.IsReady())
@@ -57,7 +57,7 @@ func TestComboHealthManager(t *testing.T) {
 		chm := newComboHealthManager()
 		hm := NewHealthManager(probeName)
 
-		assert.True(t, chm.IsReady())
+		assert.False(t, chm.IsReady())
 		chm.addProbe(hm)
 		assert.False(t, chm.IsReady())
 		hm.MarkReady()
@@ -127,7 +127,7 @@ func TestCreateHttpHandler(t *testing.T) {
 	resp, err := http.Get(srv.URL)
 	assert.Nil(t, err)
 	_ = resp.Body.Close()
-	assert.Equal(t, http.StatusOK, resp.StatusCode)
+	assert.Equal(t, http.StatusServiceUnavailable, resp.StatusCode)
 
 	hm := NewHealthManager(probeName)
 	defaultHealthManager.addProbe(hm)

tools/goctl/api/gogen/handler_test.tpl

@@ -78,4 +78,4 @@ func Test{{.HandlerName}}(t *testing.T) {
 			assert.Contains(t, rr.Body.String(), tt.wantResp)
 		})
 	}
-}
+}

tools/goctl/api/gogen/logic_test.tpl

@@ -66,4 +66,4 @@ func Test{{.logic}}_{{.function}}(t *testing.T) {
             tt.checkResp({{if .hasResponse}}resp, {{end}}err)
         })
     }
-}
+}