Merge branch 'master' into show_fields_default

pingcap · Feb 6, 2023 · 1690671 · 1690671
2 parents 7fc4239 + 9b9e15b
commit 1690671
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/telemetry/data_feature_usage.go b/telemetry/data_feature_usage.go
@@ -29,6 +29,7 @@ import (
 	"github.com/pingcap/tidb/util/memory"
 	"github.com/pingcap/tidb/util/sqlexec"
 	"github.com/tikv/client-go/v2/metrics"
+	"go.uber.org/zap"
 )
 
 // emptyClusterIndexUsage is empty ClusterIndexUsage, deprecated.
@@ -81,7 +82,7 @@ func getFeatureUsage(ctx context.Context, sctx sessionctx.Context) (*featureUsag
 	var err error
 	usage.NewClusterIndex, usage.ClusterIndex, err = getClusterIndexUsageInfo(ctx, sctx)
 	if err != nil {
-		logutil.BgLogger().Info(err.Error())
+		logutil.BgLogger().Info("Failed to get feature usage", zap.Error(err))
 		return nil, err
 	}
 

diff --git a/telemetry/data_slow_query.go b/telemetry/data_slow_query.go
@@ -64,7 +64,7 @@ var (
 func getSlowQueryStats() (*slowQueryStats, error) {
 	slowQueryBucket, err := getSlowQueryBucket()
 	if err != nil {
-		logutil.BgLogger().Info(err.Error())
+		logutil.BgLogger().Info("Failed to get Slow Query Stats", zap.Error(err))
 		return nil, err
 	}
 

diff --git a/telemetry/data_window.go b/telemetry/data_window.go
@@ -25,6 +25,7 @@ import (
 	promv1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	pmodel "github.com/prometheus/common/model"
 	"go.uber.org/atomic"
+	"go.uber.org/zap"
 )
 
 var (
@@ -253,7 +254,8 @@ func RotateSubWindow() {
 
 	err := readSQLMetric(time.Now(), &thisSubWindow.SQLUsage)
 	if err != nil {
-		logutil.BgLogger().Info("Error exists when getting the SQL Metric.")
+		logutil.BgLogger().Info("Error exists when getting the SQL Metric.",
+			zap.Error(err))
 	}
 
 	thisSubWindow.SQLUsage.SQLTotal = getSQLSum(&thisSubWindow.SQLUsage.SQLType)