Skip to content

Commit

Permalink
telemetry: Log error reason for failure to get SQL Metric (#40778) (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
ti-chi-bot committed Feb 16, 2023
1 parent 7f00a6e commit 5998e6f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion telemetry/data_feature_usage.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -74,7 +75,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
}

Expand Down
2 changes: 1 addition & 1 deletion telemetry/data_slow_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 3 additions & 1 deletion telemetry/data_window.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 5998e6f

Please sign in to comment.