Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

telemetry: Log error reason for failure to get SQL Metric (#40778) #41137

Merged
merged 2 commits into from
Mar 29, 2023
Merged

telemetry: Log error reason for failure to get SQL Metric (#40778) #41137

merged 2 commits into from
Mar 29, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #40778

What problem does this PR solve?

Issue Number: close #40777

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

With this PR:

[2023/01/26 10:57:37.536 +01:00] [INFO] [data_window.go:257] ["Error exists when getting the SQL Metric."] [error="[domain:9009]Prometheus address is not set in PD and etcd"]

Without this PR:

[2023/01/26 10:38:30.918 +01:00] [INFO] [data_window.go:256] ["Error exists when getting the SQL Metric."]
[2023/01/26 10:39:30.920 +01:00] [INFO] [data_window.go:256] ["Error exists when getting the SQL Metric."]
[2023/01/26 10:40:30.922 +01:00] [INFO] [data_window.go:256] ["Error exists when getting the SQL Metric."]
[2023/01/26 10:41:30.931 +01:00] [INFO] [data_window.go:256] ["Error exists when getting the SQL Metric."]

@dveeden @ti-chi-bot
telemetry: Log error reason for failure to get SQL Metric
61e2c09
@dveeden @ti-chi-bot
telemetry: Use zap.Error() instead of err.Error()
d1103c8 
With JSON formatted logs:
```
$ jq 'select(.error) | select(.error | contains("Prometheus"))' tidb.log
{
  "level": "INFO",
  "time": "2023/01/27 10:00:35.554 +01:00",
  "caller": "data_slow_query.go:67",
  "message": "Failed to get Slow Query Stats",
  "error": "[domain:9009]Prometheus address is not set in PD and etcd"
}
{
  "level": "INFO",
  "time": "2023/01/27 10:01:36.223 +01:00",
  "caller": "data_window.go:257",
  "message": "Error exists when getting the SQL Metric.",
  "error": "[domain:9009]Prometheus address is not set in PD and etcd"
}
{
  "level": "INFO",
  "time": "2023/01/27 10:02:36.225 +01:00",
  "caller": "data_window.go:257",
  "message": "Error exists when getting the SQL Metric.",
  "error": "[domain:9009]Prometheus address is not set in PD and etcd"
}
```
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 7, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YangKeao
  • dveeden

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 7, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 7, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added the type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. label Feb 7, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 17, 2023
sunxiaoguang
sunxiaoguang reviewed Mar 18, 2023
View reviewed changes
telemetry/data_feature_usage.go
@@ -61,7 +62,7 @@ func getFeatureUsage(ctx sessionctx.Context) (*featureUsage, error) {
var err error
usage.NewClusterIndex, usage.ClusterIndex, err = getClusterIndexUsageInfo(ctx)
if err != nil {
logutil.BgLogger().Info(err.Error())
logutil.BgLogger().Info("Failed to get feature usage", zap.Error(err))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about make it more clear, for example something like: 'Failed to get cluster index usage'?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just realized this is a cherry-pick. Please ignore this comment

sunxiaoguang
sunxiaoguang reviewed Mar 18, 2023
View reviewed changes
Copy link
Contributor

@sunxiaoguang sunxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM

@ti-chi-bot
Copy link
Member Author

@sunxiaoguang: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

YangKeao
YangKeao approved these changes Mar 28, 2023
View reviewed changes
Copy link
Member

@YangKeao YangKeao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 28, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 28, 2023
@tiancaiamao
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: d1103c8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 28, 2023
@YangKeao
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot merged commit b317f6d into pingcap:release-6.1 Mar 29, 2023
@VelocityLight VelocityLight removed the cherry-pick-approved Cherry pick PR approved by release team. label Apr 12, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YangKeao YangKeao YangKeao approved these changes

@sunxiaoguang sunxiaoguang sunxiaoguang approved these changes

@dveeden dveeden dveeden approved these changes

@breezewish breezewish Awaiting requested review from breezewish

@hawkingrei hawkingrei Awaiting requested review from hawkingrei

Assignees

@dveeden dveeden

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @tiancaiamao @YangKeao @dveeden @sunxiaoguang @VelocityLight