From 11c1386ee3da7d5ff67c699415a82b008870ea0d Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Mon, 11 Nov 2024 13:58:23 +0800 Subject: [PATCH] update Signed-off-by: Weizhen Wang --- DEPS.bzl | 42 ++++++++++++------- WORKSPACE | 17 ++++---- bindinfo/main_test.go | 2 +- br/pkg/backup/main_test.go | 2 +- br/pkg/checksum/main_test.go | 2 +- br/pkg/conn/main_test.go | 2 +- br/pkg/lightning/checkpoints/main_test.go | 2 +- br/pkg/lightning/common/main_test.go | 2 +- br/pkg/lightning/mydump/main_test.go | 2 +- br/pkg/metautil/main_test.go | 2 +- br/pkg/mock/mock_cluster_test.go | 2 +- br/pkg/pdutil/main_test.go | 2 +- br/pkg/restore/main_test.go | 2 +- br/pkg/rtree/main_test.go | 2 +- br/pkg/streamhelper/integration_test.go | 4 +- br/pkg/summary/main_test.go | 2 +- br/pkg/trace/main_test.go | 2 +- br/pkg/utils/main_test.go | 2 +- ...m_github_grpc_ecosystem_grpc_gateway.patch | 4 +- cmd/ddltest/main_test.go | 2 +- config/main_test.go | 2 +- ddl/failtest/main_test.go | 2 +- ddl/label/main_test.go | 2 +- ddl/main_test.go | 2 +- ddl/metadatalocktest/main_test.go | 2 +- ddl/util/main_test.go | 2 +- distsql/main_test.go | 2 +- domain/globalconfigsync/globalconfig_test.go | 2 +- domain/infosync/info_test.go | 2 +- domain/main_test.go | 2 +- dumpling/export/main_test.go | 2 +- executor/aggfuncs/main_test.go | 2 +- executor/analyzetest/main_test.go | 2 +- executor/autoidtest/main_test.go | 2 +- executor/distsqltest/main_test.go | 2 +- executor/fktest/main_test.go | 2 +- executor/issuetest/main_test.go | 2 +- executor/kvtest/main_test.go | 2 +- executor/main_test.go | 2 +- executor/memtest/main_test.go | 2 +- executor/oomtest/oom_test.go | 2 +- executor/seqtest/main_test.go | 2 +- executor/showtest/main_test.go | 2 +- executor/simpletest/main_test.go | 2 +- executor/splittest/main_test.go | 2 +- executor/test/explain/main_test.go | 2 +- executor/tiflashtest/main_test.go | 2 +- expression/aggregation/main_test.go | 2 +- expression/main_test.go | 2 +- extension/main_test.go | 2 +- go.mod | 10 ++--- go.sum | 22 +++++----- infoschema/main_test.go | 2 +- infoschema/perfschema/main_test.go | 2 +- kv/main_test.go | 2 +- meta/autoid/main_test.go | 2 +- meta/main_test.go | 2 +- metrics/main_test.go | 2 +- owner/main_test.go | 2 +- planner/cascades/main_test.go | 2 +- planner/core/main_test.go | 2 +- planner/funcdep/main_test.go | 2 +- planner/implementation/main_test.go | 2 +- planner/memo/main_test.go | 2 +- planner/util/main_test.go | 2 +- plugin/conn_ip_example/main_test.go | 2 +- plugin/main_test.go | 2 +- privilege/privileges/main_test.go | 2 +- server/main_test.go | 2 +- session/main_test.go | 2 +- session/session_test/main_test.go | 2 +- sessionctx/binloginfo/main_test.go | 2 +- sessionctx/main_test.go | 2 +- sessionctx/stmtctx/main_test.go | 2 +- sessionctx/variable/main_test.go | 2 +- sessiontxn/isolation/main_test.go | 2 +- sessiontxn/staleread/main_test.go | 2 +- sessiontxn/txn_context_test.go | 2 +- statistics/handle/main_test.go | 2 +- statistics/main_test.go | 2 +- store/copr/copr_test/main_test.go | 2 +- store/copr/main_test.go | 2 +- store/driver/error/error_test.go | 2 +- store/driver/main_test.go | 2 +- store/driver/txn/main_test.go | 2 +- store/gcworker/main_test.go | 2 +- store/helper/main_test.go | 2 +- store/main_test.go | 2 +- store/mockstore/main_test.go | 2 +- store/mockstore/mockcopr/main_test.go | 2 +- .../unistore/cophandler/main_test.go | 2 +- .../mockstore/unistore/lockstore/main_test.go | 2 +- store/mockstore/unistore/main_test.go | 2 +- store/mockstore/unistore/tikv/main_test.go | 2 +- .../unistore/util/lockwaiter/main_test.go | 2 +- structure/main_test.go | 2 +- table/main_test.go | 2 +- table/tables/main_test.go | 2 +- table/temptable/main_test.go | 2 +- tablecodec/main_test.go | 2 +- tablecodec/rowindexcodec/main_test.go | 2 +- telemetry/cte_test/cte_test.go | 2 +- telemetry/main_test.go | 2 +- tests/graceshutdown/main_test.go | 2 +- tests/readonlytest/main_test.go | 2 +- tests/realtikvtest/brietest/main_test.go | 2 +- tests/realtikvtest/testkit.go | 4 +- tidb-server/main_test.go | 2 +- ttl/cache/main_test.go | 2 +- ttl/session/main_test.go | 2 +- ttl/sqlbuilder/main_test.go | 2 +- types/main_test.go | 2 +- types/parser_driver/main_test.go | 2 +- util/admin/main_test.go | 2 +- util/arena/main_test.go | 2 +- util/benchdaily/main_test.go | 2 +- util/bitmap/main_test.go | 2 +- util/checksum/main_test.go | 2 +- util/codec/main_test.go | 2 +- util/collate/main_test.go | 2 +- util/cteutil/main_test.go | 2 +- util/dbterror/main_test.go | 2 +- util/deadlockhistory/main_test.go | 2 +- util/disjointset/main_test.go | 2 +- util/disk/main_test.go | 2 +- util/execdetails/main_test.go | 2 +- util/expensivequery/expensivequerey_test.go | 2 +- util/fastrand/main_test.go | 2 +- util/format/main_test.go | 2 +- util/generatedexpr/main_test.go | 2 +- util/hack/main_test.go | 2 +- util/keydecoder/main_test.go | 2 +- util/kvcache/main_test.go | 2 +- util/localpool/main_test.go | 2 +- util/logutil/main_test.go | 2 +- util/main_test.go | 2 +- util/mathutil/main_test.go | 2 +- util/mock/main_test.go | 2 +- util/mvmap/main_test.go | 2 +- util/paging/main_test.go | 2 +- util/parser/main_test.go | 2 +- util/plancodec/main_test.go | 2 +- util/printer/main_test.go | 2 +- util/profile/main_test.go | 2 +- util/ranger/main_test.go | 2 +- util/resourcegrouptag/main_test.go | 2 +- util/rowDecoder/main_test.go | 2 +- util/rowcodec/main_test.go | 2 +- util/selection/main_test.go | 2 +- util/sem/main_test.go | 2 +- util/set/main_test.go | 2 +- util/slice/main_test.go | 2 +- util/sqlexec/main_test.go | 2 +- util/stmtsummary/main_test.go | 2 +- util/stringutil/main_test.go | 2 +- util/sys/linux/main_test.go | 2 +- util/sys/storage/main_test.go | 2 +- util/systimemon/main_test.go | 2 +- util/texttree/main_test.go | 2 +- util/timeutil/main_test.go | 2 +- util/topsql/collector/main_test.go | 2 +- util/topsql/main_test.go | 2 +- util/topsql/reporter/main_test.go | 2 +- util/topsql/stmtstats/main_test.go | 2 +- util/tracing/main_test.go | 2 +- util/vitess/main_test.go | 2 +- 166 files changed, 215 insertions(+), 206 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index cfc540be2a10f..0b09f0ff53ccf 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -372,6 +372,7 @@ def go_deps(): sum = "h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ=", version = "v4.1.1", ) + go_repository( name = "com_github_census_instrumentation_opencensus_proto", build_file_proto_mode = "disable_global", @@ -1388,6 +1389,7 @@ def go_deps(): sum = "h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=", version = "v4.4.2", ) + go_repository( name = "com_github_golang_mock", build_file_proto_mode = "disable_global", @@ -1399,12 +1401,8 @@ def go_deps(): name = "com_github_golang_protobuf", build_file_proto_mode = "disable_global", importpath = "github.com/golang/protobuf", - patch_args = ["-p1"], - patches = [ - "//build/patches:com_github_golang_protobuf.patch", - ], - sum = "h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=", - version = "v1.5.3", + sum = "h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=", + version = "v1.5.4", ) go_repository( name = "com_github_golang_snappy", @@ -1522,8 +1520,8 @@ def go_deps(): name = "com_github_google_go_cmp", build_file_proto_mode = "disable_global", importpath = "github.com/google/go-cmp", - sum = "h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=", - version = "v0.6.0", + sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=", + version = "v0.5.9", ) go_repository( name = "com_github_google_go_querystring", @@ -1574,6 +1572,7 @@ def go_deps(): sum = "h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=", version = "v0.1.4", ) + go_repository( name = "com_github_google_uuid", build_file_proto_mode = "disable_global", @@ -4209,6 +4208,7 @@ def go_deps(): sum = "h1:4OpSiPMMGV3XmtPqskBU/RwYpj3yMFjtMLj/exi425Q=", version = "v2.0.1", ) + go_repository( name = "com_google_cloud_go_dataqna", build_file_proto_mode = "disable", @@ -5055,6 +5055,7 @@ def go_deps(): sum = "h1:XItAMIhOojXFQMgrxjnd2EIIHun/d5qL0Pf7FzVTkFg=", version = "v0.1.0", ) + go_repository( name = "io_k8s_api", build_file_proto_mode = "disable", @@ -5189,6 +5190,7 @@ def go_deps(): sum = "h1:CFMFNoz+CGprjFAFy+RJFrfEe4GBia3RRm2a4fREvCA=", version = "v1.0.1", ) + go_repository( name = "io_opentelemetry_go_otel_metric", build_file_proto_mode = "disable_global", @@ -5308,6 +5310,7 @@ def go_deps(): sum = "h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=", version = "v0.0.0-20230822172742-b8732ec3820d", ) + go_repository( name = "org_golang_google_grpc", build_file_proto_mode = "disable_global", @@ -5333,8 +5336,8 @@ def go_deps(): name = "org_golang_x_crypto", build_file_proto_mode = "disable_global", importpath = "golang.org/x/crypto", - sum = "h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=", - version = "v0.24.0", + sum = "h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=", + version = "v0.23.0", ) go_repository( name = "org_golang_x_exp", @@ -5382,8 +5385,8 @@ def go_deps(): name = "org_golang_x_net", build_file_proto_mode = "disable_global", importpath = "golang.org/x/net", - sum = "h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=", - version = "v0.26.0", + sum = "h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=", + version = "v0.25.0", ) go_repository( name = "org_golang_x_oauth2", @@ -5424,8 +5427,8 @@ def go_deps(): name = "org_golang_x_text", build_file_proto_mode = "disable_global", importpath = "golang.org/x/text", - sum = "h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=", - version = "v0.16.0", + sum = "h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=", + version = "v0.15.0", ) go_repository( name = "org_golang_x_time", @@ -5438,8 +5441,8 @@ def go_deps(): name = "org_golang_x_tools", build_file_proto_mode = "disable_global", importpath = "golang.org/x/tools", - sum = "h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=", - version = "v0.21.1-0.20240508182429-e35e4ccd0d2d", + sum = "h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=", + version = "v0.15.0", ) go_repository( name = "org_golang_x_xerrors", @@ -5560,6 +5563,13 @@ def go_deps(): sum = "h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=", version = "v1.2.0", ) + go_repository( + name = "org_uber_go_mock", + build_file_proto_mode = "disable", + importpath = "go.uber.org/mock", + sum = "h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=", + version = "v0.4.0", + ) go_repository( name = "org_uber_go_multierr", build_file_proto_mode = "disable_global", diff --git a/WORKSPACE b/WORKSPACE index bdcc94ae675be..1a26f9e0e7e73 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,21 +4,20 @@ http_archive( name = "io_bazel_rules_go", sha256 = "d6ab6b57e48c09523e93050f13698f708428cfd5e619252e369d377af6597707", urls = [ - "http://bazel-cache.pingcap.net:8080/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip", - "http://ats.apps.svc/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip", "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip", + "https://ats.apps.svc/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip", ], ) http_archive( name = "bazel_gazelle", - sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf", + sha256 = "d3fa66a39028e97d76f9e2db8f1b0c11c099e8e01bf363a923074784e451f809", urls = [ - "http://bazel-cache.pingcap.net:8080/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz", - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz", - "http://ats.apps.svc/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz", + "http://bazel-cache.pingcap.net:8080/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", + "http://ats.apps.svc/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", ], ) @@ -39,7 +38,7 @@ go_download_sdk( "https://mirrors.aliyun.com/golang/{}", "https://dl.google.com/go/{}", ], - version = "1.19.12", + version = "1.19.13", ) go_register_toolchains( diff --git a/bindinfo/main_test.go b/bindinfo/main_test.go index 65d9859fbea21..aa82e4c7998cc 100644 --- a/bindinfo/main_test.go +++ b/bindinfo/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/br/pkg/backup/main_test.go b/br/pkg/backup/main_test.go index 7c6c43a5743c4..03b3e2c73daea 100644 --- a/br/pkg/backup/main_test.go +++ b/br/pkg/backup/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/klauspost/compress/zstd.(*blockDec).startDecoder"), goleak.IgnoreTopFunction("github.com/pingcap/goleveldb/leveldb.(*DB).mpoolDrain"), diff --git a/br/pkg/checksum/main_test.go b/br/pkg/checksum/main_test.go index f81a602724a92..1a6589d31b913 100644 --- a/br/pkg/checksum/main_test.go +++ b/br/pkg/checksum/main_test.go @@ -23,7 +23,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/klauspost/compress/zstd.(*blockDec).startDecoder"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), diff --git a/br/pkg/conn/main_test.go b/br/pkg/conn/main_test.go index f6df9f2c568a4..a31428bef0ca1 100644 --- a/br/pkg/conn/main_test.go +++ b/br/pkg/conn/main_test.go @@ -23,7 +23,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/br/pkg/lightning/checkpoints/main_test.go b/br/pkg/lightning/checkpoints/main_test.go index 2d281fb84dd1e..a602127696d63 100644 --- a/br/pkg/lightning/checkpoints/main_test.go +++ b/br/pkg/lightning/checkpoints/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/klauspost/compress/zstd.(*blockDec).startDecoder"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/br/pkg/lightning/common/main_test.go b/br/pkg/lightning/common/main_test.go index be6188947f62c..8adf839e5f779 100644 --- a/br/pkg/lightning/common/main_test.go +++ b/br/pkg/lightning/common/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), } diff --git a/br/pkg/lightning/mydump/main_test.go b/br/pkg/lightning/mydump/main_test.go index d4a29a47175d3..30f12c270ca3d 100644 --- a/br/pkg/lightning/mydump/main_test.go +++ b/br/pkg/lightning/mydump/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), goleak.IgnoreTopFunction("github.com/klauspost/compress/zstd.(*blockDec).startDecoder"), diff --git a/br/pkg/metautil/main_test.go b/br/pkg/metautil/main_test.go index 2b87f6047b950..0e215aa6e5331 100644 --- a/br/pkg/metautil/main_test.go +++ b/br/pkg/metautil/main_test.go @@ -23,7 +23,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), } diff --git a/br/pkg/mock/mock_cluster_test.go b/br/pkg/mock/mock_cluster_test.go index 37f24e8a7eca6..9d94261568412 100644 --- a/br/pkg/mock/mock_cluster_test.go +++ b/br/pkg/mock/mock_cluster_test.go @@ -13,7 +13,7 @@ import ( func TestSmoke(t *testing.T) { defer goleak.VerifyNone( t, - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/klauspost/compress/zstd.(*blockDec).startDecoder"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), diff --git a/br/pkg/pdutil/main_test.go b/br/pkg/pdutil/main_test.go index 8af7ac001aaa4..42bd76b1ab388 100644 --- a/br/pkg/pdutil/main_test.go +++ b/br/pkg/pdutil/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/br/pkg/restore/main_test.go b/br/pkg/restore/main_test.go index a71c8db57c79f..7b6638e56ed0c 100644 --- a/br/pkg/restore/main_test.go +++ b/br/pkg/restore/main_test.go @@ -27,7 +27,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/klauspost/compress/zstd.(*blockDec).startDecoder"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), diff --git a/br/pkg/rtree/main_test.go b/br/pkg/rtree/main_test.go index dc57d20e599d0..23ffa41059682 100644 --- a/br/pkg/rtree/main_test.go +++ b/br/pkg/rtree/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/br/pkg/streamhelper/integration_test.go b/br/pkg/streamhelper/integration_test.go index 4b989dc4ab2ba..f6f2fb1504e00 100644 --- a/br/pkg/streamhelper/integration_test.go +++ b/br/pkg/streamhelper/integration_test.go @@ -50,8 +50,8 @@ func runEtcd(t *testing.T) (*embed.Etcd, *clientv3.Client) { cfg := embed.NewConfig() cfg.Dir = t.TempDir() clientURL := getRandomLocalAddr() - cfg.LCUrls = []url.URL{clientURL} - cfg.LPUrls = []url.URL{getRandomLocalAddr()} + cfg.ListenClientUrls = []url.URL{clientURL} + cfg.ListenPeerUrls = []url.URL{getRandomLocalAddr()} cfg.LogLevel = "fatal" etcd, err := embed.StartEtcd(cfg) if err != nil { diff --git a/br/pkg/summary/main_test.go b/br/pkg/summary/main_test.go index e167e079b78ff..9150de5865620 100644 --- a/br/pkg/summary/main_test.go +++ b/br/pkg/summary/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/br/pkg/trace/main_test.go b/br/pkg/trace/main_test.go index 299dc7a11398f..0c69a7c12f4d9 100644 --- a/br/pkg/trace/main_test.go +++ b/br/pkg/trace/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/br/pkg/utils/main_test.go b/br/pkg/utils/main_test.go index f1a0e7c1e39e5..516eb946fdfc7 100644 --- a/br/pkg/utils/main_test.go +++ b/br/pkg/utils/main_test.go @@ -23,7 +23,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), } diff --git a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch index 304063a90cb27..db8e4120035a1 100644 --- a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch +++ b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch @@ -63,13 +63,13 @@ index c4d18f624..41d5319fb 100644 - "@io_bazel_rules_go//proto/wkt:field_mask_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", -+ "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", ++ "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", + "@com_github_golang_protobuf//ptypes:go_default_library", + "@com_github_golang_protobuf//ptypes/any:go_default_library", + "@com_github_golang_protobuf//ptypes/duration:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", -+ "@org_golang_google_genproto//googleapis/api/httpbody:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//httpbody", + "@org_golang_google_genproto//protobuf/field_mask:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//grpclog:go_default_library", diff --git a/cmd/ddltest/main_test.go b/cmd/ddltest/main_test.go index 7f6815d4f6340..9761c0df01e5c 100644 --- a/cmd/ddltest/main_test.go +++ b/cmd/ddltest/main_test.go @@ -33,7 +33,7 @@ func TestMain(m *testing.M) { os.Exit(1) } opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/config/main_test.go b/config/main_test.go index 3458dc358ad86..31fc1fa72ff31 100644 --- a/config/main_test.go +++ b/config/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/ddl/failtest/main_test.go b/ddl/failtest/main_test.go index c136cb0fa6b94..7b008bf9883ac 100644 --- a/ddl/failtest/main_test.go +++ b/ddl/failtest/main_test.go @@ -35,7 +35,7 @@ func TestMain(m *testing.M) { ddl.SetWaitTimeWhenErrorOccurred(time.Microsecond) opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/ddl/label/main_test.go b/ddl/label/main_test.go index 559584b77f407..2458b19b20e51 100644 --- a/ddl/label/main_test.go +++ b/ddl/label/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/ddl/main_test.go b/ddl/main_test.go index 3418d16a23ece..91ec89c79009f 100644 --- a/ddl/main_test.go +++ b/ddl/main_test.go @@ -59,7 +59,7 @@ func TestMain(m *testing.M) { } opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/txnkv/transaction.keepAlive"), diff --git a/ddl/metadatalocktest/main_test.go b/ddl/metadatalocktest/main_test.go index 4a52dad904905..93854188d63d8 100644 --- a/ddl/metadatalocktest/main_test.go +++ b/ddl/metadatalocktest/main_test.go @@ -35,7 +35,7 @@ func TestMain(m *testing.M) { ddl.SetWaitTimeWhenErrorOccurred(time.Microsecond) opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/ddl/util/main_test.go b/ddl/util/main_test.go index ae8004db124ba..247e3c0e91f0e 100644 --- a/ddl/util/main_test.go +++ b/ddl/util/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/distsql/main_test.go b/distsql/main_test.go index 10e6ed474ce70..33aa940acde49 100644 --- a/distsql/main_test.go +++ b/distsql/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/domain/globalconfigsync/globalconfig_test.go b/domain/globalconfigsync/globalconfig_test.go index d6013f2887693..874334b89837b 100644 --- a/domain/globalconfigsync/globalconfig_test.go +++ b/domain/globalconfigsync/globalconfig_test.go @@ -35,7 +35,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/domain/infosync/info_test.go b/domain/infosync/info_test.go index b3e95415cc9f8..95120a777abd2 100644 --- a/domain/infosync/info_test.go +++ b/domain/infosync/info_test.go @@ -39,7 +39,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/domain/main_test.go b/domain/main_test.go index f236b8461fa12..6714037d9bd4b 100644 --- a/domain/main_test.go +++ b/domain/main_test.go @@ -26,7 +26,7 @@ func TestMain(m *testing.M) { server.RunInGoTest = true testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/dumpling/export/main_test.go b/dumpling/export/main_test.go index da19d470dc94f..1049fda523cf1 100644 --- a/dumpling/export/main_test.go +++ b/dumpling/export/main_test.go @@ -48,7 +48,7 @@ func TestMain(m *testing.M) { registry.MustRegister(collectors.NewGoCollector()) opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), } diff --git a/executor/aggfuncs/main_test.go b/executor/aggfuncs/main_test.go index 09b07cea808ec..0c0ed25104cda 100644 --- a/executor/aggfuncs/main_test.go +++ b/executor/aggfuncs/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/executor/analyzetest/main_test.go b/executor/analyzetest/main_test.go index 5ebf42dc764a2..713ca5941822a 100644 --- a/executor/analyzetest/main_test.go +++ b/executor/analyzetest/main_test.go @@ -22,7 +22,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), } diff --git a/executor/autoidtest/main_test.go b/executor/autoidtest/main_test.go index 1dc33b2085dd4..edde1b16dc012 100644 --- a/executor/autoidtest/main_test.go +++ b/executor/autoidtest/main_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"), diff --git a/executor/distsqltest/main_test.go b/executor/distsqltest/main_test.go index 6bdc92f1e5cc6..1ef29dda80cce 100644 --- a/executor/distsqltest/main_test.go +++ b/executor/distsqltest/main_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"), diff --git a/executor/fktest/main_test.go b/executor/fktest/main_test.go index 00c470717f529..2f2633b88f192 100644 --- a/executor/fktest/main_test.go +++ b/executor/fktest/main_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"), diff --git a/executor/issuetest/main_test.go b/executor/issuetest/main_test.go index daecbf2f06859..25d37b71f892e 100644 --- a/executor/issuetest/main_test.go +++ b/executor/issuetest/main_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/executor/kvtest/main_test.go b/executor/kvtest/main_test.go index 592d8ba5276bf..20ca5537d3627 100644 --- a/executor/kvtest/main_test.go +++ b/executor/kvtest/main_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/executor/main_test.go b/executor/main_test.go index 512eced5b50fa..fcdf1e4226abb 100644 --- a/executor/main_test.go +++ b/executor/main_test.go @@ -55,7 +55,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"), diff --git a/executor/memtest/main_test.go b/executor/memtest/main_test.go index a3b3edb4ff962..d3818ceadab95 100644 --- a/executor/memtest/main_test.go +++ b/executor/memtest/main_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/executor/oomtest/oom_test.go b/executor/oomtest/oom_test.go index 8a9f2c0263d76..14303912e7e24 100644 --- a/executor/oomtest/oom_test.go +++ b/executor/oomtest/oom_test.go @@ -36,7 +36,7 @@ func TestMain(m *testing.M) { testsetup.SetupForCommonTest() registerHook() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/executor/seqtest/main_test.go b/executor/seqtest/main_test.go index 299cc69a8a26f..5352c37d438e4 100644 --- a/executor/seqtest/main_test.go +++ b/executor/seqtest/main_test.go @@ -29,7 +29,7 @@ func TestMain(m *testing.M) { conf.TiKVClient.AsyncCommit.AllowedClockDrift = 0 }) opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/pingcap/tidb/executor.readProjectionInput"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), diff --git a/executor/showtest/main_test.go b/executor/showtest/main_test.go index cc9e1f5aecbb3..c37cfd90b5d5a 100644 --- a/executor/showtest/main_test.go +++ b/executor/showtest/main_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"), diff --git a/executor/simpletest/main_test.go b/executor/simpletest/main_test.go index 6772de87c1301..0c1f676b3ad8d 100644 --- a/executor/simpletest/main_test.go +++ b/executor/simpletest/main_test.go @@ -22,7 +22,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/txnkv/transaction.keepAlive"), } diff --git a/executor/splittest/main_test.go b/executor/splittest/main_test.go index c7f44e57f49d5..c850261d76213 100644 --- a/executor/splittest/main_test.go +++ b/executor/splittest/main_test.go @@ -22,7 +22,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), } goleak.VerifyTestMain(m, opts...) diff --git a/executor/test/explain/main_test.go b/executor/test/explain/main_test.go index 365c88b4af771..6de9cc4926f22 100644 --- a/executor/test/explain/main_test.go +++ b/executor/test/explain/main_test.go @@ -22,7 +22,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/txnkv/transaction.keepAlive"), } diff --git a/executor/tiflashtest/main_test.go b/executor/tiflashtest/main_test.go index 708cb54bb0283..96a8fc14b388c 100644 --- a/executor/tiflashtest/main_test.go +++ b/executor/tiflashtest/main_test.go @@ -38,7 +38,7 @@ func TestMain(m *testing.M) { goleak.Cleanup(func(_ int) { view.Stop() }), - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"), diff --git a/expression/aggregation/main_test.go b/expression/aggregation/main_test.go index 11504899f250f..44a7ad54767d6 100644 --- a/expression/aggregation/main_test.go +++ b/expression/aggregation/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/expression/main_test.go b/expression/main_test.go index 1875fcaf9869d..c8de67bd61649 100644 --- a/expression/main_test.go +++ b/expression/main_test.go @@ -52,7 +52,7 @@ func TestMain(m *testing.M) { testDataMap.LoadTestSuiteData("testdata", "expression_suite") opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/extension/main_test.go b/extension/main_test.go index 7ffc36a917470..a2600e2ad71ca 100644 --- a/extension/main_test.go +++ b/extension/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/go.mod b/go.mod index 1a2f863c664c0..4c972e311baaa 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/gogo/protobuf v1.3.2 github.com/golang/mock v1.6.0 - github.com/golang/protobuf v1.5.3 + github.com/golang/protobuf v1.5.4 github.com/golang/snappy v0.0.4 github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 github.com/golangci/golangci-lint v1.50.1 @@ -111,14 +111,14 @@ require ( go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/exp v0.0.0-20221023144134-a1e5550cf13e - golang.org/x/net v0.26.0 + golang.org/x/net v0.25.0 golang.org/x/oauth2 v0.11.0 golang.org/x/sync v0.7.0 golang.org/x/sys v0.21.0 golang.org/x/term v0.21.0 - golang.org/x/text v0.16.0 + golang.org/x/text v0.15.0 golang.org/x/time v0.2.0 - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d + golang.org/x/tools v0.15.0 google.golang.org/api v0.128.0 google.golang.org/grpc v1.59.0 gopkg.in/yaml.v2 v2.4.0 @@ -244,7 +244,7 @@ require ( go.opentelemetry.io/otel/sdk v1.0.1 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect go.opentelemetry.io/proto/otlp v0.9.0 // indirect - golang.org/x/crypto v0.24.0 // indirect + golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect diff --git a/go.sum b/go.sum index 7759bf7387cac..1714db75e24d6 100644 --- a/go.sum +++ b/go.sum @@ -393,8 +393,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -429,8 +429,8 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -1116,8 +1116,8 @@ golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1219,8 +1219,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1338,8 +1338,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1417,8 +1417,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= +golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/infoschema/main_test.go b/infoschema/main_test.go index 09a412679f664..1d1b99c743ec1 100644 --- a/infoschema/main_test.go +++ b/infoschema/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/infoschema/perfschema/main_test.go b/infoschema/perfschema/main_test.go index 950b95993b536..4633b2f201852 100644 --- a/infoschema/perfschema/main_test.go +++ b/infoschema/perfschema/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/kv/main_test.go b/kv/main_test.go index 3d161d7ce0704..b7a2f3d8cf567 100644 --- a/kv/main_test.go +++ b/kv/main_test.go @@ -25,7 +25,7 @@ func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/meta/autoid/main_test.go b/meta/autoid/main_test.go index 7eb312e043e3a..40a7da98f94d7 100644 --- a/meta/autoid/main_test.go +++ b/meta/autoid/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/meta/main_test.go b/meta/main_test.go index 3e4abdaa12624..57e1b739ae0bc 100644 --- a/meta/main_test.go +++ b/meta/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), diff --git a/metrics/main_test.go b/metrics/main_test.go index 887847a12ba86..78595382d8e0b 100644 --- a/metrics/main_test.go +++ b/metrics/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/owner/main_test.go b/owner/main_test.go index b1e1355258582..fe648e2ff817b 100644 --- a/owner/main_test.go +++ b/owner/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), diff --git a/planner/cascades/main_test.go b/planner/cascades/main_test.go index 8e3fb1f656b17..c0e826a6fa134 100644 --- a/planner/cascades/main_test.go +++ b/planner/cascades/main_test.go @@ -47,7 +47,7 @@ func TestMain(m *testing.M) { testDataMap.GenerateOutputIfNeeded() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/planner/core/main_test.go b/planner/core/main_test.go index b3ad18514e9f2..c14791af9c4b8 100644 --- a/planner/core/main_test.go +++ b/planner/core/main_test.go @@ -57,7 +57,7 @@ func TestMain(m *testing.M) { planSuiteUnexportedData = testDataMap["plan_suite_unexported"] opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"), diff --git a/planner/funcdep/main_test.go b/planner/funcdep/main_test.go index 6d95dd208e1b7..0e5b0a59c8f46 100644 --- a/planner/funcdep/main_test.go +++ b/planner/funcdep/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/planner/implementation/main_test.go b/planner/implementation/main_test.go index 57f40ea9f20ac..14e9aa0fff203 100644 --- a/planner/implementation/main_test.go +++ b/planner/implementation/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/planner/memo/main_test.go b/planner/memo/main_test.go index 28382d1c818ec..4d205c61caafb 100644 --- a/planner/memo/main_test.go +++ b/planner/memo/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/planner/util/main_test.go b/planner/util/main_test.go index 7f62901b5534c..59738797650c6 100644 --- a/planner/util/main_test.go +++ b/planner/util/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/plugin/conn_ip_example/main_test.go b/plugin/conn_ip_example/main_test.go index 33e3beaa207d4..71350c1da3692 100644 --- a/plugin/conn_ip_example/main_test.go +++ b/plugin/conn_ip_example/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/plugin/main_test.go b/plugin/main_test.go index 9c7fbeda0f42e..dd1ac858afbd3 100644 --- a/plugin/main_test.go +++ b/plugin/main_test.go @@ -25,7 +25,7 @@ func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/privilege/privileges/main_test.go b/privilege/privileges/main_test.go index f591389958fd5..47bce6f139bb3 100644 --- a/privilege/privileges/main_test.go +++ b/privilege/privileges/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/server/main_test.go b/server/main_test.go index cdf12551934db..f336bc2a7afa7 100644 --- a/server/main_test.go +++ b/server/main_test.go @@ -57,7 +57,7 @@ func TestMain(m *testing.M) { } opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("time.Sleep"), goleak.IgnoreTopFunction("database/sql.(*Tx).awaitDone"), diff --git a/session/main_test.go b/session/main_test.go index 790903eb68c8a..0f7b15aa1f124 100644 --- a/session/main_test.go +++ b/session/main_test.go @@ -55,7 +55,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ // TODO: figure the reason and shorten this list - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/internal/retry.newBackoffFn.func1"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/v3.waitRetryBackoff"), diff --git a/session/session_test/main_test.go b/session/session_test/main_test.go index 849904506a0db..0c9c272d46dac 100644 --- a/session/session_test/main_test.go +++ b/session/session_test/main_test.go @@ -39,7 +39,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ // TODO: figure the reason and shorten this list - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/internal/retry.newBackoffFn.func1"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/v3.waitRetryBackoff"), diff --git a/sessionctx/binloginfo/main_test.go b/sessionctx/binloginfo/main_test.go index 0459507352310..647225858fae7 100644 --- a/sessionctx/binloginfo/main_test.go +++ b/sessionctx/binloginfo/main_test.go @@ -26,7 +26,7 @@ func TestMain(m *testing.M) { opts := []goleak.Option{ goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), } goleak.VerifyTestMain(m, opts...) diff --git a/sessionctx/main_test.go b/sessionctx/main_test.go index e6c2bc990a57e..034773325c656 100644 --- a/sessionctx/main_test.go +++ b/sessionctx/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/sessionctx/stmtctx/main_test.go b/sessionctx/stmtctx/main_test.go index ba36da8e5c6b8..e5442883b97d3 100644 --- a/sessionctx/stmtctx/main_test.go +++ b/sessionctx/stmtctx/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/sessionctx/variable/main_test.go b/sessionctx/variable/main_test.go index c5eca2f3d1658..f382b6d861395 100644 --- a/sessionctx/variable/main_test.go +++ b/sessionctx/variable/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/sessiontxn/isolation/main_test.go b/sessiontxn/isolation/main_test.go index e0b8ace02bce6..a1c36e68e88ec 100644 --- a/sessiontxn/isolation/main_test.go +++ b/sessiontxn/isolation/main_test.go @@ -38,7 +38,7 @@ func TestMain(m *testing.M) { testsetup.SetupForCommonTest() tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/sessiontxn/staleread/main_test.go b/sessiontxn/staleread/main_test.go index fb4766298666c..4e66cfbfc12e2 100644 --- a/sessiontxn/staleread/main_test.go +++ b/sessiontxn/staleread/main_test.go @@ -25,7 +25,7 @@ func TestMain(m *testing.M) { testsetup.SetupForCommonTest() tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/sessiontxn/txn_context_test.go b/sessiontxn/txn_context_test.go index 7ecd85a1db982..be51e74523cab 100644 --- a/sessiontxn/txn_context_test.go +++ b/sessiontxn/txn_context_test.go @@ -39,7 +39,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/statistics/handle/main_test.go b/statistics/handle/main_test.go index 5541a01a46aa9..285de7283a6d9 100644 --- a/statistics/handle/main_test.go +++ b/statistics/handle/main_test.go @@ -23,7 +23,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/statistics/main_test.go b/statistics/main_test.go index 1d19e839a8297..00897fd496feb 100644 --- a/statistics/main_test.go +++ b/statistics/main_test.go @@ -48,7 +48,7 @@ func TestMain(m *testing.M) { testDataMap.LoadTestSuiteData("testdata", "trace_suite") opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/copr/copr_test/main_test.go b/store/copr/copr_test/main_test.go index 9b98a6a9ad944..d2d70af80a4e9 100644 --- a/store/copr/copr_test/main_test.go +++ b/store/copr/copr_test/main_test.go @@ -39,7 +39,7 @@ func TestMain(m *testing.M) { tikv.EnableFailpoints() opts := []goleak.Option{ // TODO: figure the reason and shorten this list - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/internal/retry.newBackoffFn.func1"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/v3.waitRetryBackoff"), diff --git a/store/copr/main_test.go b/store/copr/main_test.go index 456b51156c8be..5e4a515a086fd 100644 --- a/store/copr/main_test.go +++ b/store/copr/main_test.go @@ -37,7 +37,7 @@ func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ goleak.IgnoreTopFunction("github.com/pingcap/goleveldb/leveldb.(*DB).mpoolDrain"), - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/driver/error/error_test.go b/store/driver/error/error_test.go index f1f2878fb7743..2088d6fee5940 100644 --- a/store/driver/error/error_test.go +++ b/store/driver/error/error_test.go @@ -28,7 +28,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/driver/main_test.go b/store/driver/main_test.go index e0c805a52a952..9da08210c56ec 100644 --- a/store/driver/main_test.go +++ b/store/driver/main_test.go @@ -40,7 +40,7 @@ func TestMain(m *testing.M) { testsetup.SetupForCommonTest() tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/driver/txn/main_test.go b/store/driver/txn/main_test.go index 7c5fb240d8958..59abd5c7df824 100644 --- a/store/driver/txn/main_test.go +++ b/store/driver/txn/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/gcworker/main_test.go b/store/gcworker/main_test.go index df72adb3a8f27..9528b1d02cd8c 100644 --- a/store/gcworker/main_test.go +++ b/store/gcworker/main_test.go @@ -30,7 +30,7 @@ func TestMain(m *testing.M) { opts := []goleak.Option{ goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), } callback := func(i int) int { diff --git a/store/helper/main_test.go b/store/helper/main_test.go index 3937580027775..d8521eeea02a7 100644 --- a/store/helper/main_test.go +++ b/store/helper/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/main_test.go b/store/main_test.go index 4d0820e80c89b..db9fa6e12c004 100644 --- a/store/main_test.go +++ b/store/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/mockstore/main_test.go b/store/mockstore/main_test.go index aa9718295ad04..d9e651ee3ec0e 100644 --- a/store/mockstore/main_test.go +++ b/store/mockstore/main_test.go @@ -31,7 +31,7 @@ func TestMain(m *testing.M) { return i } opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/mockstore/mockcopr/main_test.go b/store/mockstore/mockcopr/main_test.go index 279862588c465..d2649eacec8b4 100644 --- a/store/mockstore/mockcopr/main_test.go +++ b/store/mockstore/mockcopr/main_test.go @@ -26,7 +26,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/mockstore/unistore/cophandler/main_test.go b/store/mockstore/unistore/cophandler/main_test.go index 5dbab5fb93a5b..44f1a68ca9748 100644 --- a/store/mockstore/unistore/cophandler/main_test.go +++ b/store/mockstore/unistore/cophandler/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/mockstore/unistore/lockstore/main_test.go b/store/mockstore/unistore/lockstore/main_test.go index 09e8ebf061f44..90e0fe6f2c2cd 100644 --- a/store/mockstore/unistore/lockstore/main_test.go +++ b/store/mockstore/unistore/lockstore/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/mockstore/unistore/main_test.go b/store/mockstore/unistore/main_test.go index a2bcc6e1531f9..894979442e47d 100644 --- a/store/mockstore/unistore/main_test.go +++ b/store/mockstore/unistore/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/mockstore/unistore/tikv/main_test.go b/store/mockstore/unistore/tikv/main_test.go index 6b242bcddf291..7edf80555f051 100644 --- a/store/mockstore/unistore/tikv/main_test.go +++ b/store/mockstore/unistore/tikv/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/store/mockstore/unistore/util/lockwaiter/main_test.go b/store/mockstore/unistore/util/lockwaiter/main_test.go index 27b0a5b93bd25..d9d870c15f67d 100644 --- a/store/mockstore/unistore/util/lockwaiter/main_test.go +++ b/store/mockstore/unistore/util/lockwaiter/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/structure/main_test.go b/structure/main_test.go index 956a8a8ad93d8..7167699c0a067 100644 --- a/structure/main_test.go +++ b/structure/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/table/main_test.go b/table/main_test.go index 019f53e9f303a..ad265d56a2254 100644 --- a/table/main_test.go +++ b/table/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/table/tables/main_test.go b/table/tables/main_test.go index d831e57364d33..c4051b28de223 100644 --- a/table/tables/main_test.go +++ b/table/tables/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/table/temptable/main_test.go b/table/temptable/main_test.go index 8c5c4f557e1ae..ccc1a41f076b9 100644 --- a/table/temptable/main_test.go +++ b/table/temptable/main_test.go @@ -38,7 +38,7 @@ func TestMain(m *testing.M) { opts := []goleak.Option{ goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), } testsetup.SetupForCommonTest() diff --git a/tablecodec/main_test.go b/tablecodec/main_test.go index 5024acdb32bdf..e8bd50fb0d1c8 100644 --- a/tablecodec/main_test.go +++ b/tablecodec/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/tablecodec/rowindexcodec/main_test.go b/tablecodec/rowindexcodec/main_test.go index 11b7963a4bd14..8a1ee5618b228 100644 --- a/tablecodec/rowindexcodec/main_test.go +++ b/tablecodec/rowindexcodec/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/telemetry/cte_test/cte_test.go b/telemetry/cte_test/cte_test.go index c8f04eb2df1d4..708d9fe0d5b7f 100644 --- a/telemetry/cte_test/cte_test.go +++ b/telemetry/cte_test/cte_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { opts := []goleak.Option{ goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), } diff --git a/telemetry/main_test.go b/telemetry/main_test.go index 0e8d98b2a4f6c..46ab5a777256c 100644 --- a/telemetry/main_test.go +++ b/telemetry/main_test.go @@ -38,7 +38,7 @@ func TestMain(m *testing.M) { opts := []goleak.Option{ goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), } diff --git a/tests/graceshutdown/main_test.go b/tests/graceshutdown/main_test.go index 56da5e1a0590a..8bf8392820147 100644 --- a/tests/graceshutdown/main_test.go +++ b/tests/graceshutdown/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("syscall.syscall6"), } diff --git a/tests/readonlytest/main_test.go b/tests/readonlytest/main_test.go index 53cdfef25456b..2dd04285455a1 100644 --- a/tests/readonlytest/main_test.go +++ b/tests/readonlytest/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/tests/realtikvtest/brietest/main_test.go b/tests/realtikvtest/brietest/main_test.go index 12b7cda9f1d1e..49ce3f9675220 100644 --- a/tests/realtikvtest/brietest/main_test.go +++ b/tests/realtikvtest/brietest/main_test.go @@ -25,7 +25,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("google.golang.org/grpc.(*ccBalancerWrapper).watcher"), goleak.IgnoreTopFunction("google.golang.org/grpc/internal/transport.(*http2Client).keepalive"), diff --git a/tests/realtikvtest/testkit.go b/tests/realtikvtest/testkit.go index 06b34f20e7d53..23deb4fa24268 100644 --- a/tests/realtikvtest/testkit.go +++ b/tests/realtikvtest/testkit.go @@ -58,7 +58,7 @@ func RunTestMain(m *testing.M) { }) tikv.EnableFailpoints() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/internal/retry.newBackoffFn.func1"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/v3.waitRetryBackoff"), @@ -66,7 +66,7 @@ func RunTestMain(m *testing.M) { goleak.IgnoreTopFunction("google.golang.org/grpc.(*addrConn).resetTransport"), goleak.IgnoreTopFunction("google.golang.org/grpc.(*ccBalancerWrapper).watcher"), goleak.IgnoreTopFunction("google.golang.org/grpc/internal/transport.(*controlBuffer).get"), - goleak.IgnoreTopFunction("google.golang.org/grpc/internal/transport.(*http2Client).keepalive"), + goleak.IgnoreTopFunction("google.golang.org/grpc/internal/grpcsync.(*CallbackSerializer).run"), goleak.IgnoreTopFunction("internal/poll.runtime_pollWait"), goleak.IgnoreTopFunction("net/http.(*persistConn).writeLoop"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/txnkv/transaction.keepAlive"), diff --git a/tidb-server/main_test.go b/tidb-server/main_test.go index cb0c53f4d2443..34b98fc53fc22 100644 --- a/tidb-server/main_test.go +++ b/tidb-server/main_test.go @@ -32,7 +32,7 @@ var isCoverageServer string func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/ttl/cache/main_test.go b/ttl/cache/main_test.go index e3846871bb55b..8b90f0a4dc116 100644 --- a/ttl/cache/main_test.go +++ b/ttl/cache/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/ttl/session/main_test.go b/ttl/session/main_test.go index 330dcd581dbff..d6c93194f026a 100644 --- a/ttl/session/main_test.go +++ b/ttl/session/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/ttl/sqlbuilder/main_test.go b/ttl/sqlbuilder/main_test.go index 76cecabaf752c..8198b07e6bdc5 100644 --- a/ttl/sqlbuilder/main_test.go +++ b/ttl/sqlbuilder/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/types/main_test.go b/types/main_test.go index 3e4fb3f087159..8caf6e228dfc0 100644 --- a/types/main_test.go +++ b/types/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/types/parser_driver/main_test.go b/types/parser_driver/main_test.go index ebf7bf042bd54..eb42a285f3a87 100644 --- a/types/parser_driver/main_test.go +++ b/types/parser_driver/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/admin/main_test.go b/util/admin/main_test.go index ee1f2d5f2f116..c426d6d3c456b 100644 --- a/util/admin/main_test.go +++ b/util/admin/main_test.go @@ -31,7 +31,7 @@ func TestMain(m *testing.M) { }) opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/arena/main_test.go b/util/arena/main_test.go index a399ad116c1b6..fa57e3c65717a 100644 --- a/util/arena/main_test.go +++ b/util/arena/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/benchdaily/main_test.go b/util/benchdaily/main_test.go index 02836578e971d..a7996b81990fb 100644 --- a/util/benchdaily/main_test.go +++ b/util/benchdaily/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/bitmap/main_test.go b/util/bitmap/main_test.go index e023854dbc74e..465b1ff1d89c5 100644 --- a/util/bitmap/main_test.go +++ b/util/bitmap/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/checksum/main_test.go b/util/checksum/main_test.go index 4e41ef991f925..71f0d1d4e1c42 100644 --- a/util/checksum/main_test.go +++ b/util/checksum/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/codec/main_test.go b/util/codec/main_test.go index d754807331c7f..4557d994e0ef0 100644 --- a/util/codec/main_test.go +++ b/util/codec/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/collate/main_test.go b/util/collate/main_test.go index 42632ee9bd640..c405ac95d08e4 100644 --- a/util/collate/main_test.go +++ b/util/collate/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/cteutil/main_test.go b/util/cteutil/main_test.go index 44a7aeb89bc09..db43cd22437c1 100644 --- a/util/cteutil/main_test.go +++ b/util/cteutil/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/dbterror/main_test.go b/util/dbterror/main_test.go index 9e86cc8d329e3..43f8dab796378 100644 --- a/util/dbterror/main_test.go +++ b/util/dbterror/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), } goleak.VerifyTestMain(m, opts...) diff --git a/util/deadlockhistory/main_test.go b/util/deadlockhistory/main_test.go index 388b04f00bbf0..94886db8018c3 100644 --- a/util/deadlockhistory/main_test.go +++ b/util/deadlockhistory/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/disjointset/main_test.go b/util/disjointset/main_test.go index 4c7620d69dc07..3681f9fdb7790 100644 --- a/util/disjointset/main_test.go +++ b/util/disjointset/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/disk/main_test.go b/util/disk/main_test.go index b5dc84c28cf70..e7aff82d5adc5 100644 --- a/util/disk/main_test.go +++ b/util/disk/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/execdetails/main_test.go b/util/execdetails/main_test.go index 0299931b53e97..880c233c16313 100644 --- a/util/execdetails/main_test.go +++ b/util/execdetails/main_test.go @@ -23,7 +23,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/expensivequery/expensivequerey_test.go b/util/expensivequery/expensivequerey_test.go index d7a83b14019fc..d5306ad69a7e8 100644 --- a/util/expensivequery/expensivequerey_test.go +++ b/util/expensivequery/expensivequerey_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/fastrand/main_test.go b/util/fastrand/main_test.go index 3aadf6e7f0a25..5d3eb374e072e 100644 --- a/util/fastrand/main_test.go +++ b/util/fastrand/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/format/main_test.go b/util/format/main_test.go index 080132ddf8844..807f4fac72817 100644 --- a/util/format/main_test.go +++ b/util/format/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/generatedexpr/main_test.go b/util/generatedexpr/main_test.go index fc8f011ecfa2b..b6fc95b22e181 100644 --- a/util/generatedexpr/main_test.go +++ b/util/generatedexpr/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/hack/main_test.go b/util/hack/main_test.go index 152f4c57d6bb7..30c391eac96a8 100644 --- a/util/hack/main_test.go +++ b/util/hack/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/keydecoder/main_test.go b/util/keydecoder/main_test.go index 893be9ecbb29e..6d035d482fd6f 100644 --- a/util/keydecoder/main_test.go +++ b/util/keydecoder/main_test.go @@ -23,7 +23,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/kvcache/main_test.go b/util/kvcache/main_test.go index b6b1f7ef92d8f..3906961f9abd1 100644 --- a/util/kvcache/main_test.go +++ b/util/kvcache/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/localpool/main_test.go b/util/localpool/main_test.go index 10314587bb0a7..821e8eb3475c7 100644 --- a/util/localpool/main_test.go +++ b/util/localpool/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/logutil/main_test.go b/util/logutil/main_test.go index 03fdc6cc0bc3c..d9d043dd09073 100644 --- a/util/logutil/main_test.go +++ b/util/logutil/main_test.go @@ -36,7 +36,7 @@ var ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"), } diff --git a/util/main_test.go b/util/main_test.go index 05ed110d044d6..d02ded71f902b 100644 --- a/util/main_test.go +++ b/util/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/mathutil/main_test.go b/util/mathutil/main_test.go index 3bdc670b7df19..6d682151ee0ea 100644 --- a/util/mathutil/main_test.go +++ b/util/mathutil/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/mock/main_test.go b/util/mock/main_test.go index 4583bc43b0f13..f5bc77f62930e 100644 --- a/util/mock/main_test.go +++ b/util/mock/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/mvmap/main_test.go b/util/mvmap/main_test.go index 7a5f3a941f68c..2e56ef1ad4a03 100644 --- a/util/mvmap/main_test.go +++ b/util/mvmap/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/paging/main_test.go b/util/paging/main_test.go index 4fc9fe6e363ad..ee631933206c0 100644 --- a/util/paging/main_test.go +++ b/util/paging/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/parser/main_test.go b/util/parser/main_test.go index 4b1832ae442a3..1329c7f138c70 100644 --- a/util/parser/main_test.go +++ b/util/parser/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/plancodec/main_test.go b/util/plancodec/main_test.go index e91a5c7442f47..f794d84b4f6b3 100644 --- a/util/plancodec/main_test.go +++ b/util/plancodec/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/printer/main_test.go b/util/printer/main_test.go index d56b58e4e2c77..2457870f75511 100644 --- a/util/printer/main_test.go +++ b/util/printer/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/profile/main_test.go b/util/profile/main_test.go index f55422d993b8b..f812e444a6cdd 100644 --- a/util/profile/main_test.go +++ b/util/profile/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/ranger/main_test.go b/util/ranger/main_test.go index 462007239334c..ebc0186b2add1 100644 --- a/util/ranger/main_test.go +++ b/util/ranger/main_test.go @@ -43,7 +43,7 @@ func TestMain(m *testing.M) { testDataMap.GenerateOutputIfNeeded() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), diff --git a/util/resourcegrouptag/main_test.go b/util/resourcegrouptag/main_test.go index 3b661ec89f0c6..a4c1196901461 100644 --- a/util/resourcegrouptag/main_test.go +++ b/util/resourcegrouptag/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/rowDecoder/main_test.go b/util/rowDecoder/main_test.go index 887a047796ea9..22a09c3e619fb 100644 --- a/util/rowDecoder/main_test.go +++ b/util/rowDecoder/main_test.go @@ -23,7 +23,7 @@ import ( func TestMain(m *testing.M) { opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/rowcodec/main_test.go b/util/rowcodec/main_test.go index 8a4515ed1c558..9c634dc20d841 100644 --- a/util/rowcodec/main_test.go +++ b/util/rowcodec/main_test.go @@ -27,7 +27,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/selection/main_test.go b/util/selection/main_test.go index 74c14e7867157..d39f68d3171bc 100644 --- a/util/selection/main_test.go +++ b/util/selection/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/sem/main_test.go b/util/sem/main_test.go index 7f6d20b904741..64ba584bbe162 100644 --- a/util/sem/main_test.go +++ b/util/sem/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/set/main_test.go b/util/set/main_test.go index 59f224554513f..71bbcc5dacf6c 100644 --- a/util/set/main_test.go +++ b/util/set/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/slice/main_test.go b/util/slice/main_test.go index 3e886afa6be7b..f1203e68b8368 100644 --- a/util/slice/main_test.go +++ b/util/slice/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/sqlexec/main_test.go b/util/sqlexec/main_test.go index f6e80059c0bab..51f112627a42c 100644 --- a/util/sqlexec/main_test.go +++ b/util/sqlexec/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/stmtsummary/main_test.go b/util/stmtsummary/main_test.go index b2e92cd9a56ba..a7176cf31aa07 100644 --- a/util/stmtsummary/main_test.go +++ b/util/stmtsummary/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/stringutil/main_test.go b/util/stringutil/main_test.go index 09b386feae213..8c221bfbc060c 100644 --- a/util/stringutil/main_test.go +++ b/util/stringutil/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/sys/linux/main_test.go b/util/sys/linux/main_test.go index 88f9f2fdf24c3..ad4b3abef844d 100644 --- a/util/sys/linux/main_test.go +++ b/util/sys/linux/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/sys/storage/main_test.go b/util/sys/storage/main_test.go index ef6ea743450f3..e84a868f977e8 100644 --- a/util/sys/storage/main_test.go +++ b/util/sys/storage/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/systimemon/main_test.go b/util/systimemon/main_test.go index 9539aca3a1096..4a680afbae61d 100644 --- a/util/systimemon/main_test.go +++ b/util/systimemon/main_test.go @@ -25,7 +25,7 @@ func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("github.com/pingcap/tidb/util/systimemon.StartMonitor"), } diff --git a/util/texttree/main_test.go b/util/texttree/main_test.go index c73786745d798..6d79442706a0d 100644 --- a/util/texttree/main_test.go +++ b/util/texttree/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/timeutil/main_test.go b/util/timeutil/main_test.go index add3ffbb50126..e903b59b1d5a7 100644 --- a/util/timeutil/main_test.go +++ b/util/timeutil/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/topsql/collector/main_test.go b/util/topsql/collector/main_test.go index 1177b5d4f9c16..6a4f187350c64 100644 --- a/util/topsql/collector/main_test.go +++ b/util/topsql/collector/main_test.go @@ -30,7 +30,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/topsql/main_test.go b/util/topsql/main_test.go index 7317f50b2001b..5d16a6d64b443 100644 --- a/util/topsql/main_test.go +++ b/util/topsql/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/topsql/reporter/main_test.go b/util/topsql/reporter/main_test.go index f5f17f44ac7a6..5789feb5ba341 100644 --- a/util/topsql/reporter/main_test.go +++ b/util/topsql/reporter/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/topsql/stmtstats/main_test.go b/util/topsql/stmtstats/main_test.go index e75153cf9141f..5374b5f9ad331 100644 --- a/util/topsql/stmtstats/main_test.go +++ b/util/topsql/stmtstats/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/tracing/main_test.go b/util/tracing/main_test.go index 02cf4faecadb9..d19585dae66d4 100644 --- a/util/tracing/main_test.go +++ b/util/tracing/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), } diff --git a/util/vitess/main_test.go b/util/vitess/main_test.go index b5f91d4df1535..1eb50fd233a44 100644 --- a/util/vitess/main_test.go +++ b/util/vitess/main_test.go @@ -24,7 +24,7 @@ import ( func TestMain(m *testing.M) { testsetup.SetupForCommonTest() opts := []goleak.Option{ - goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"), + goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"), goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"), goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"), }