adds client type on kvrocks_command_seconds

Author: bseto

cmd/reader/client.go

@@ -24,5 +24,6 @@ type Client interface {
 
 	// Close closes the client connection
 	Close()
-}
 
+	Name() string
+}

cmd/reader/main.go

@@ -39,11 +39,6 @@ func intToAlphabetKey(n int64) string {
 	return string(result)
 }
 
-var (
-	hGetAllSeconds     = metrics.GetOrCreateHistogram(`kvrocks_command_seconds{command="hgetall"}`)
-	hGetAllErrorsTotal = metrics.GetOrCreateCounter(`kvrocks_command_errors_total{command="hgetall"}`)
-)
-
 func main() {
 	logger.InitLogger(true)
 	logger.InitNewLogger(true)
@@ -200,11 +195,12 @@ func hGetAll(
 	timeoutCtx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 	start := time.Now()
+	hGetAllSeconds := metrics.GetOrCreateHistogram(fmt.Sprintf(`kvrocks_command_seconds{command="hgetall",client="%s"}`, client.Name()))
 	defer hGetAllSeconds.UpdateDuration(start)
 
 	data, err := client.HGetAll(timeoutCtx, key)
 	if err != nil {
-		hGetAllErrorsTotal.Inc()
+		metrics.GetOrCreateCounter(fmt.Sprintf(`kvrocks_command_errors_total{command="hgetall",client="%s"}`, client.Name())).Inc()
 		return nil, err
 	}
 

cmd/reader/reader

@@ -23,6 +23,10 @@ func NewRedisClient(addrs []string, writeTimeout, readTimeout, dialTimeout time.
 	}
 }
 
+func (r *RedisClient) Name() string {
+	return "redis"
+}
+
 func (r *RedisClient) Hmget(ctx context.Context, key string, fields ...string) ([]interface{}, error) {
 	result, err := r.clusterClient.HMGet(ctx, key, fields...).Result()
 	return result, err

cmd/reader/redis.go

@@ -13,6 +13,10 @@ type RueidisClient struct {
 	client rueidis.Client
 }
 
+func (r *RueidisClient) Name() string {
+	return "rueidis"
+}
+
 func NewRueidisClient(options rueidis.ClientOption) (*RueidisClient, error) {
 	client, err := rueidis.NewClient(options)
 	if err != nil {
@@ -87,4 +91,3 @@ func (r *RueidisClient) HSetExpire(ctx context.Context, key string, cols []strin
 func (r *RueidisClient) Close() {
 	r.client.Close()
 }
-