Merge branch 'master' into integrate-hybrid-engine

tikv · Dec 13, 2023 · 0d97d36 · 0d97d36
2 parents 3335d00 + 820b220
commit 0d97d36
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/coprocessor/tracker.rs b/src/coprocessor/tracker.rs
@@ -6,8 +6,10 @@ use ::tracker::{get_tls_tracker_token, with_tls_tracker};
 use engine_traits::{PerfContext, PerfContextExt, PerfContextKind};
 use kvproto::{kvrpcpb, kvrpcpb::ScanDetailV2};
 use pd_client::BucketMeta;
+use protobuf::Message;
 use tikv_kv::Engine;
 use tikv_util::time::{self, Duration, Instant};
+use tipb::ResourceGroupTag;
 use txn_types::Key;
 
 use super::metrics::*;
@@ -266,9 +268,14 @@ impl<E: Engine> Tracker<E> {
 
             let source_stmt = self.req_ctx.context.get_source_stmt();
             with_tls_tracker(|tracker| {
+                let mut req_tag = ResourceGroupTag::new();
+                req_tag
+                    .merge_from_bytes(&tracker.req_info.resource_group_tag)
+                    .unwrap_or_default();
                 info!(#"slow_log", "slow-query";
                     "connection_id" => source_stmt.get_connection_id(),
                     "session_alias" => source_stmt.get_session_alias(),
+                    "query_digest" => hex::encode(req_tag.get_sql_digest()),
                     "region_id" => &self.req_ctx.context.get_region_id(),
                     "remote_host" => &self.req_ctx.peer,
                     "total_lifetime" => ?self.req_lifetime,