Skip to content

Commit 4220dfa

Browse files
authored
*: refine tikv/client-go log to print context information(such as conn id) as much as possible (#45559)
close #45558
1 parent cf7ae4c commit 4220dfa

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

DEPS.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6924,13 +6924,13 @@ def go_deps():
69246924
name = "com_github_tikv_client_go_v2",
69256925
build_file_proto_mode = "disable_global",
69266926
importpath = "github.com/tikv/client-go/v2",
6927-
sha256 = "2dcd0fa5258d9cf2dedf7a5d6066c9c221707c269f895824b05a5be4af721263",
6928-
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20230726071354-76d6d93e9856",
6927+
sha256 = "41aee514dad7b095f70a59843b8db9424b54cb1f11baf4f0608e2120768a0ab9",
6928+
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20230731032349-719e6456f7d5",
69296929
urls = [
6930-
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230726071354-76d6d93e9856.zip",
6931-
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230726071354-76d6d93e9856.zip",
6932-
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230726071354-76d6d93e9856.zip",
6933-
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230726071354-76d6d93e9856.zip",
6930+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230731032349-719e6456f7d5.zip",
6931+
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230731032349-719e6456f7d5.zip",
6932+
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230731032349-719e6456f7d5.zip",
6933+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230731032349-719e6456f7d5.zip",
69346934
],
69356935
)
69366936
go_repository(

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ require (
9999
github.com/stretchr/testify v1.8.4
100100
github.com/tdakkota/asciicheck v0.2.0
101101
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
102-
github.com/tikv/client-go/v2 v2.0.8-0.20230726071354-76d6d93e9856
102+
github.com/tikv/client-go/v2 v2.0.8-0.20230731032349-719e6456f7d5
103103
github.com/tikv/pd/client v0.0.0-20230724080549-de985b8e0afc
104104
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966
105105
github.com/twmb/murmur3 v1.1.6

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,8 +991,8 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf
991991
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU=
992992
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
993993
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
994-
github.com/tikv/client-go/v2 v2.0.8-0.20230726071354-76d6d93e9856 h1:AYVpm9Oi0FSl2fgcFWmIT8A4jxWNloskwc8QrLgkaJY=
995-
github.com/tikv/client-go/v2 v2.0.8-0.20230726071354-76d6d93e9856/go.mod h1:J17iHkj8buCLDF7lgKJLX5jq5aGozrbpa7+Ln6g8Xjc=
994+
github.com/tikv/client-go/v2 v2.0.8-0.20230731032349-719e6456f7d5 h1:eHCUYIb9bH3TePiwnLTf40kFHSmiIO3oRg4gfzeowvQ=
995+
github.com/tikv/client-go/v2 v2.0.8-0.20230731032349-719e6456f7d5/go.mod h1:J17iHkj8buCLDF7lgKJLX5jq5aGozrbpa7+Ln6g8Xjc=
996996
github.com/tikv/pd/client v0.0.0-20230724080549-de985b8e0afc h1:IUg0j2nWoGYj3FQ3vA3vg97fPSpJEZQrDpgF8RkMLEU=
997997
github.com/tikv/pd/client v0.0.0-20230724080549-de985b8e0afc/go.mod h1:wfHRc4iYaqJiOQZCHcrF+r4hYnkGDaYWDfcicee//pc=
998998
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=

util/logutil/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ go_library(
1616
"@com_github_opentracing_opentracing_go//log",
1717
"@com_github_pingcap_errors//:errors",
1818
"@com_github_pingcap_log//:log",
19+
"@com_github_tikv_client_go_v2//tikv",
1920
"@org_uber_go_zap//:zap",
2021
"@org_uber_go_zap//buffer",
2122
"@org_uber_go_zap//zapcore",

util/logutil/log.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
tlog "github.com/opentracing/opentracing-go/log"
2828
"github.com/pingcap/errors"
2929
"github.com/pingcap/log"
30+
"github.com/tikv/client-go/v2/tikv"
3031
"go.uber.org/zap"
3132
"go.uber.org/zap/zapcore"
3233
)
@@ -118,6 +119,7 @@ func InitLogger(cfg *LogConfig, opts ...zap.Option) error {
118119
}
119120

120121
initGRPCLogger(gl)
122+
tikv.SetLogContextKey(CtxLogKey)
121123
return nil
122124
}
123125

0 commit comments

Comments
 (0)