Merge branch 'master' into fix-label-counter

.github/workflows/check.yaml

@@ -16,7 +16,7 @@ jobs:
             ~/go/pkg/mod
             ~/.cache/go-build
             **/.tools
-            **/.dashboard_asset_cache
+            **/.dashboard_download_cache
           key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-golang

.github/workflows/pd-tests.yaml

@@ -32,7 +32,7 @@ jobs:
             ~/go/pkg/mod
             ~/.cache/go-build
             **/.tools
-            **/.dashboard_asset_cache
+            **/.dashboard_download_cache
           key: ${{ runner.os }}-go-${{ matrix.worker_id }}-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-${{ matrix.worker_id }}

.gitignore

@@ -11,7 +11,7 @@ vendor
 default*
 *.bak
 .vscode/
-/.dashboard_asset_cache
+/.dashboard_download_cache
 /.dashboard_build_temp
 /.tools/bin
 docs/swagger/*

Makefile

@@ -271,7 +271,7 @@ clean-test:
 
 clean-build:
 	# Cleaning building files...
-	rm -rf .dashboard_asset_cache/
+	rm -rf .dashboard_download_cache/
 	rm -rf $(BUILD_BIN_PATH)
 	rm -rf $(GO_TOOLS_BIN_PATH)
 

cmd/pd-server/main.go

@@ -74,12 +74,6 @@ func main() {
 	// Flushing any buffered log entries
 	defer log.Sync()
 
-	// The old logger
-	err = logutil.InitLogger(&cfg.Log)
-	if err != nil {
-		log.Fatal("initialize logger error", errs.ZapError(err))
-	}
-
 	server.LogPDInfo()
 
 	for _, msg := range cfg.WarningMsgs {

go.mod

@@ -11,7 +11,6 @@ require (
 	github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
 	github.com/coreos/go-semver v0.3.0
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
 	github.com/docker/go-units v0.4.0
 	github.com/go-echarts/go-echarts v1.0.0
 	github.com/gogo/protobuf v1.3.1
@@ -25,20 +24,19 @@ require (
 	github.com/mgechev/revive v1.0.2
 	github.com/montanaflynn/stats v0.5.0
 	github.com/opentracing/opentracing-go v1.1.0
-	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/petermattis/goid v0.0.0-20211229010228-4d14c490ee36 // indirect
 	github.com/phf/go-queue v0.0.0-20170504031614-9abe38d0371d
 	github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
 	github.com/pingcap/errcode v0.3.0
 	github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3
 	github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce
 	github.com/pingcap/kvproto v0.0.0-20211213085605-3329b3c5404c
-	github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7
+	github.com/pingcap/log v0.0.0-20210906054005-afc726e70354
 	github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d
-	github.com/pingcap/tidb-dashboard v0.0.0-20211206031355-bcc43a01d537
+	github.com/pingcap/tidb-dashboard v0.0.0-20211231024458-18087fcc06d7
 	github.com/prometheus/client_golang v1.1.0
 	github.com/prometheus/common v0.6.0
 	github.com/sasha-s/go-deadlock v0.2.0
-	github.com/sirupsen/logrus v1.2.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/swaggo/http-swagger v0.0.0-20200308142732-58ac5e232fba
@@ -50,9 +48,8 @@ require (
 	go.etcd.io/bbolt v1.3.5 // indirect
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
 	go.uber.org/goleak v1.1.12
-	go.uber.org/zap v1.16.0
+	go.uber.org/zap v1.19.0
 	golang.org/x/tools v0.1.5
 	google.golang.org/grpc v1.26.0
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gotest.tools/gotestsum v1.7.0
 )