diff --git a/metrics/ddl.go b/metrics/ddl.go index b36998282c96e..5c0982647545d 100644 --- a/metrics/ddl.go +++ b/metrics/ddl.go @@ -23,7 +23,7 @@ var ( Subsystem: "ddl", Name: "waiting_jobs", Help: "Gauge of jobs.", - }, []string{"action"}) + }, []string{LblType}) HandleJobHistogram = prometheus.NewHistogramVec( prometheus.HistogramOpts{ @@ -32,13 +32,13 @@ var ( Name: "handle_job_duration_seconds", Help: "Bucketed histogram of processing time (s) of handle jobs", Buckets: prometheus.ExponentialBuckets(0.01, 2, 20), - }, []string{"action", "result_state"}) + }, []string{LblType, LblResult}) BatchAddIdxHistogram = prometheus.NewHistogram( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "ddl", - Name: "batch_add_idx_succ", + Name: "batch_add_idx_duration_seconds", Help: "Bucketed histogram of processing time (s) of batch handle data", Buckets: prometheus.ExponentialBuckets(0.001, 2, 20), }) @@ -54,7 +54,7 @@ var ( Name: "deploy_syncer_duration_seconds", Help: "Bucketed histogram of processing time (s) of deploy syncer", Buckets: prometheus.ExponentialBuckets(0.01, 2, 20), - }, []string{"state", "result_state"}) + }, []string{LblType, LblResult}) UpdateSelfVersionHistogram = prometheus.NewHistogramVec( prometheus.HistogramOpts{ @@ -63,7 +63,7 @@ var ( Name: "update_self_ver_duration_seconds", Help: "Bucketed histogram of processing time (s) of update self version", Buckets: prometheus.ExponentialBuckets(0.01, 2, 20), - }, []string{"result_state"}) + }, []string{LblResult}) OwnerUpdateGlobalVersion = "update_global_version" OwnerGetGlobalVersion = "get_global_version" @@ -75,7 +75,7 @@ var ( Name: "owner_handle_syncer_duration_seconds", Help: "Bucketed histogram of processing time (s) of handle syncer", Buckets: prometheus.ExponentialBuckets(0.01, 2, 20), - }, []string{"op", "result_state"}) + }, []string{LblType, LblResult}) // Metrics for ddl_worker.go. WorkerAddDDLJob = "add_job" @@ -88,7 +88,7 @@ var ( Name: "worker_operation_duration_seconds", Help: "Bucketed histogram of processing time (s) of ddl worker operations", Buckets: prometheus.ExponentialBuckets(0.001, 2, 20), - }, []string{"op", "result_state"}) + }, []string{LblType, LblResult}) CreateDDL = "create_ddl" CreateDDLWorker = "create_ddl_worker" @@ -97,9 +97,9 @@ var ( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "ddl", - Name: "worker_total", + Name: "worker_operation_total", Help: "Counter of creating ddl/worker and isowner.", - }, []string{"type"}) + }, []string{LblType}) ) func init() { diff --git a/metrics/distsql.go b/metrics/distsql.go index 6769a5c6f65fd..eae76a2167427 100644 --- a/metrics/distsql.go +++ b/metrics/distsql.go @@ -32,7 +32,7 @@ var ( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "distsql", - Name: "scan_keys_partial", + Name: "scan_keys_partial_count", Help: "number of scanned keys for each partial result.", }, ) @@ -40,7 +40,7 @@ var ( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "distsql", - Name: "scan_keys", + Name: "scan_keys_count", Help: "number of scanned keys for each query.", }, ) diff --git a/metrics/domain.go b/metrics/domain.go index 38366906914d6..981fc48bf29e1 100644 --- a/metrics/domain.go +++ b/metrics/domain.go @@ -25,14 +25,14 @@ var ( Subsystem: "domain", Name: "load_schema_total", Help: "Counter of load schema", - }, []string{"type"}) + }, []string{LblType}) // LoadSchemaDuration records the duration of load schema. LoadSchemaDuration = prometheus.NewHistogram( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "domain", - Name: "load_schema_duration", + Name: "load_schema_duration_seconds", Help: "Bucketed histogram of processing time (s) in load schema.", Buckets: prometheus.ExponentialBuckets(0.001, 2, 15), }) @@ -44,7 +44,7 @@ var ( Subsystem: "domain", Name: "load_privilege_total", Help: "Counter of load privilege", - }, []string{"type"}) + }, []string{LblType}) ) func init() { diff --git a/metrics/executor.go b/metrics/executor.go index fd2256d953021..bc921611fc638 100644 --- a/metrics/executor.go +++ b/metrics/executor.go @@ -23,7 +23,7 @@ var ( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "executor", - Name: "expensive_executor_counter", + Name: "expensive_total", Help: "Counter of Expensive Executors.", }, []string{LblType}, ) @@ -33,7 +33,7 @@ var ( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "executor", - Name: "statement_node_total", + Name: "statement_total", Help: "Counter of StmtNode.", }, []string{LblType}) ) diff --git a/metrics/meta.go b/metrics/meta.go index 2e0e148f8b181..96417dd678ab4 100644 --- a/metrics/meta.go +++ b/metrics/meta.go @@ -29,7 +29,7 @@ var ( Name: "operation_duration_seconds", Help: "Bucketed histogram of processing time (s) of handled autoid.", Buckets: prometheus.ExponentialBuckets(0.0005, 2, 22), - }, []string{"op", "result_state"}) + }, []string{LblType, LblResult}) GetSchemaDiff = "get_schema_diff" SetSchemaDiff = "set_schema_diff" @@ -44,7 +44,7 @@ var ( Name: "operation_duration_seconds", Help: "Bucketed histogram of processing time (s) of tidb meta data operations.", Buckets: prometheus.ExponentialBuckets(0.0005, 2, 22), - }, []string{"op", "result_state"}) + }, []string{LblType, LblResult}) ) func init() { diff --git a/metrics/metrics.go b/metrics/metrics.go index 89631a1a42a1f..049368f973804 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -20,7 +20,8 @@ var ( PanicCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ Namespace: "tidb", - Name: "panic", + Subsystem: "server", + Name: "panic_total", Help: "Counter of panic.", }, []string{LblType}) ) diff --git a/metrics/owner.go b/metrics/owner.go index 47a7c7d1f76fe..e53d62c0fca37 100644 --- a/metrics/owner.go +++ b/metrics/owner.go @@ -23,10 +23,10 @@ var ( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "owner", - Name: "new_session", + Name: "new_session_duration_seconds", Help: "Bucketed histogram of processing time (s) of new session.", Buckets: prometheus.ExponentialBuckets(0.0005, 2, 22), - }, []string{"type", "result_state"}) + }, []string{LblType, LblResult}) Cancelled = "cancelled" Deleted = "deleted" @@ -36,18 +36,18 @@ var ( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "owner", - Name: "watch_owner", + Name: "watch_owner_total", Help: "Counter of watch owner.", - }, []string{"type", "return_reason"}) + }, []string{LblType, LblResult}) NoLongerOwner = "no_longer_owner" CampaignOwnerCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "owner", - Name: "campaign_owner", + Name: "campaign_owner_total", Help: "Counter of campaign owner.", - }, []string{"type", "retry_reason"}) + }, []string{LblType, LblResult}) ) func init() { diff --git a/metrics/server.go b/metrics/server.go index 1d2c3bf66810d..c61bc6988a085 100644 --- a/metrics/server.go +++ b/metrics/server.go @@ -38,7 +38,7 @@ var ( Subsystem: "server", Name: "query_total", Help: "Counter of queries.", - }, []string{"type", "status"}) + }, []string{LblType, LblResult}) ConnGauge = prometheus.NewGauge( prometheus.GaugeOpts{ @@ -52,15 +52,15 @@ var ( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "server", - Name: "execute_error", + Name: "execute_error_total", Help: "Counter of execute errors.", - }, []string{"type"}) + }, []string{LblType}) CriticalErrorCounter = prometheus.NewCounter( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "server", - Name: "critical_error", + Name: "critical_error_total", Help: "Counter of critical errors.", }) @@ -77,7 +77,7 @@ var ( Subsystem: "server", Name: "event_total", Help: "Counter of tidb-server event.", - }, []string{"type"}) + }, []string{LblType}) ) func init() { diff --git a/metrics/session.go b/metrics/session.go index bade57c935e6f..cb3424a00ca6b 100644 --- a/metrics/session.go +++ b/metrics/session.go @@ -20,53 +20,53 @@ var ( SessionExecuteParseDuration = prometheus.NewHistogram( prometheus.HistogramOpts{ Namespace: "tidb", - Subsystem: "server", - Name: "session_execute_parse_duration", + Subsystem: "session", + Name: "parse_duration_seconds", Help: "Bucketed histogram of processing time (s) in parse SQL.", Buckets: prometheus.LinearBuckets(0.00004, 0.00001, 13), }) SessionExecuteCompileDuration = prometheus.NewHistogram( prometheus.HistogramOpts{ Namespace: "tidb", - Subsystem: "server", - Name: "session_execute_compile_duration", + Subsystem: "session", + Name: "compile_duration_seconds", Help: "Bucketed histogram of processing time (s) in query optimize.", Buckets: prometheus.LinearBuckets(0.00004, 0.00001, 13), }) SessionExecuteRunDuration = prometheus.NewHistogram( prometheus.HistogramOpts{ Namespace: "tidb", - Subsystem: "server", - Name: "session_execute_run_duration", + Subsystem: "session", + Name: "execute_duration_seconds", Help: "Bucketed histogram of processing time (s) in running executor.", Buckets: prometheus.ExponentialBuckets(0.0001, 2, 13), }) SchemaLeaseErrorCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ Namespace: "tidb", - Subsystem: "server", - Name: "schema_lease_error_counter", + Subsystem: "session", + Name: "schema_lease_error_total", Help: "Counter of schema lease error", }, []string{LblType}) SessionRetry = prometheus.NewHistogram( prometheus.HistogramOpts{ Namespace: "tidb", - Subsystem: "server", - Name: "session_retry", + Subsystem: "session", + Name: "retry_count", Help: "Bucketed histogram of session retry count.", Buckets: prometheus.LinearBuckets(0, 1, 10), }) SessionRetryErrorCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ Namespace: "tidb", - Subsystem: "server", - Name: "session_retry_error", + Subsystem: "session", + Name: "retry_error_total", Help: "Counter of session retry error.", }, []string{LblType}) TransactionCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ Namespace: "tidb", - Subsystem: "server", + Subsystem: "session", Name: "transaction_total", Help: "Counter of transactions.", }, []string{LblType}) @@ -74,8 +74,8 @@ var ( SessionRestrictedSQLCounter = prometheus.NewCounter( prometheus.CounterOpts{ Namespace: "tidb", - Subsystem: "server", - Name: "session_restricted_sql_counter", + Subsystem: "session", + Name: "restricted_sql_total", Help: "Counter of internal restricted sql.", }) ) @@ -88,6 +88,7 @@ const ( LblError = "error" LblRollback = "rollback" LblType = "type" + LblResult = "result" ) func init() { diff --git a/metrics/stats.go b/metrics/stats.go index 4c86529f33680..ec5bea1d16311 100644 --- a/metrics/stats.go +++ b/metrics/stats.go @@ -23,7 +23,7 @@ var ( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "statistics", - Name: "auto_analyze_duration", + Name: "auto_analyze_duration_seconds", Help: "Bucketed histogram of processing time (s) of auto analyze.", Buckets: prometheus.ExponentialBuckets(0.01, 2, 20), }) @@ -34,7 +34,7 @@ var ( Subsystem: "statistics", Name: "auto_analyze_total", Help: "Counter of auto analyze.", - }, []string{"type"}) + }, []string{LblType}) StatsInaccuracyRate = prometheus.NewHistogram( prometheus.HistogramOpts{ diff --git a/metrics/tikvclient.go b/metrics/tikvclient.go index 76f754668be88..2810be87919ea 100644 --- a/metrics/tikvclient.go +++ b/metrics/tikvclient.go @@ -39,24 +39,24 @@ var ( Subsystem: "tikvclient", Name: "txn_cmd_total", Help: "Counter of txn commands.", - }, []string{"type"}) + }, []string{LblType}) TiKVTxnCmdHistogram = prometheus.NewHistogramVec( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "tikvclient", - Name: "txn_cmd_seconds", + Name: "txn_cmd_duration_seconds", Help: "Bucketed histogram of processing time of txn cmds.", Buckets: prometheus.ExponentialBuckets(0.0005, 2, 20), - }, []string{"type"}) + }, []string{LblType}) TiKVBackoffCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "tikvclient", - Name: "backoff_count", + Name: "backoff_total", Help: "Counter of backoff.", - }, []string{"type"}) + }, []string{LblType}) TiKVBackoffHistogram = prometheus.NewHistogram( prometheus.HistogramOpts{ @@ -74,7 +74,7 @@ var ( Name: "get_conn_seconds", Help: "Bucketed histogram of taking conn from conn pool.", Buckets: prometheus.ExponentialBuckets(0.0005, 2, 20), - }, []string{"type"}) + }, []string{LblType}) TiKVSendReqHistogram = prometheus.NewHistogramVec( prometheus.HistogramOpts{ @@ -83,21 +83,21 @@ var ( Name: "request_seconds", Help: "Bucketed histogram of sending request duration.", Buckets: prometheus.ExponentialBuckets(0.0005, 2, 20), - }, []string{"type", "store"}) + }, []string{LblType, "store"}) TiKVCoprocessorCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "tikvclient", - Name: "cop_count", + Name: "cop_actions_total", Help: "Counter of coprocessor actions.", - }, []string{"type"}) + }, []string{LblType}) TiKVCoprocessorHistogram = prometheus.NewHistogram( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "tikvclient", - Name: "cop_seconds", + Name: "cop_duration_seconds", Help: "Run duration of a single coprocessor task, includes backoff time.", Buckets: prometheus.ExponentialBuckets(0.0005, 2, 20), }) @@ -108,7 +108,7 @@ var ( Subsystem: "tikvclient", Name: "lock_resolver_actions_total", Help: "Counter of lock resolver actions.", - }, []string{"type"}) + }, []string{LblType}) TiKVRegionErrorCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ @@ -116,7 +116,7 @@ var ( Subsystem: "tikvclient", Name: "region_err_total", Help: "Counter of region errors.", - }, []string{"type"}) + }, []string{LblType}) TiKVTxnWriteKVCountHistogram = prometheus.NewHistogram( prometheus.HistogramOpts{ @@ -131,8 +131,8 @@ var ( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "tikvclient", - Name: "txn_write_size", - Help: "Size of kv pairs to write in a transaction. (KB)", + Name: "txn_write_size_bytes", + Help: "Size of kv pairs to write in a transaction.", Buckets: prometheus.ExponentialBuckets(1, 2, 21), }) @@ -143,25 +143,25 @@ var ( Name: "rawkv_cmd_seconds", Help: "Bucketed histogram of processing time of rawkv cmds.", Buckets: prometheus.ExponentialBuckets(0.0005, 2, 20), - }, []string{"type"}) + }, []string{LblType}) TiKVRawkvSizeHistogram = prometheus.NewHistogramVec( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "tikvclient", - Name: "rawkv_kv_size", + Name: "rawkv_kv_size_bytes", Help: "Size of key/value to put, in bytes.", Buckets: prometheus.ExponentialBuckets(1, 2, 21), - }, []string{"type"}) + }, []string{LblType}) TiKVTxnRegionsNumHistogram = prometheus.NewHistogramVec( prometheus.HistogramOpts{ Namespace: "tidb", Subsystem: "tikvclient", - Name: "txn_regions_num", + Name: "txn_regions_count", Help: "Number of regions in a transaction.", Buckets: prometheus.ExponentialBuckets(1, 2, 20), - }, []string{"type"}) + }, []string{LblType}) TiKVLoadSafepointCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ @@ -169,7 +169,7 @@ var ( Subsystem: "tikvclient", Name: "load_safepoint_total", Help: "Counter of load safepoint.", - }, []string{"type"}) + }, []string{LblType}) TiKVSecondaryLockCleanupFailureCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ @@ -177,15 +177,15 @@ var ( Subsystem: "tikvclient", Name: "lock_cleanup_task_total", Help: "failure statistic of secondary lock cleanup task.", - }, []string{"type"}) + }, []string{LblType}) TiKVRegionCacheCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ Namespace: "tidb", Subsystem: "tikvclient", - Name: "region_cache", + Name: "region_cache_operations_total", Help: "Counter of region cache.", - }, []string{"type", "result_state"}) + }, []string{LblType, LblResult}) ) func init() { diff --git a/server/server_test.go b/server/server_test.go index 1aefb261be8cb..e76c7990928a5 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -764,7 +764,7 @@ func getMetrics(t *C) []byte { func getStmtCnt(content string) (stmtCnt map[string]int) { stmtCnt = make(map[string]int) - r, _ := regexp.Compile("tidb_executor_statement_node_total{type=\"([A-Z|a-z|-]+)\"} (\\d+)") + r, _ := regexp.Compile("tidb_executor_statement_total{type=\"([A-Z|a-z|-]+)\"} (\\d+)") matchResult := r.FindAllStringSubmatch(content, -1) for _, v := range matchResult { cnt, _ := strconv.Atoi(v[2]) diff --git a/store/tikv/2pc.go b/store/tikv/2pc.go index 7ad52c6f335a4..672cbd9450c02 100644 --- a/store/tikv/2pc.go +++ b/store/tikv/2pc.go @@ -144,7 +144,7 @@ func newTwoPhaseCommitter(txn *tikvTxn) (*twoPhaseCommitter, error) { } metrics.TiKVTxnWriteKVCountHistogram.Observe(float64(len(keys))) - metrics.TiKVTxnWriteSizeHistogram.Observe(float64(size / 1024)) + metrics.TiKVTxnWriteSizeHistogram.Observe(float64(size)) return &twoPhaseCommitter{ store: txn.store, txn: txn,