Merge #9826

9826: internal: drop latest requests tracking r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

crates/rust-analyzer/src/global_state.rs

@@ -27,7 +27,6 @@ use crate::{
     mem_docs::MemDocs,
     op_queue::OpQueue,
     reload::SourceRootConfig,
-    request_metrics::{LatestRequests, RequestMetrics},
     thread_pool::TaskPool,
     to_proto::url_from_abs_path,
     Result,
@@ -105,8 +104,6 @@ pub(crate) struct GlobalState {
         OpQueue<(Arc<Vec<ProjectWorkspace>>, Vec<anyhow::Result<WorkspaceBuildScripts>>)>,
 
     pub(crate) prime_caches_queue: OpQueue<()>,
-
-    latest_requests: Arc<RwLock<LatestRequests>>,
 }
 
 /// An immutable snapshot of the world's state at a point in time.
@@ -114,7 +111,6 @@ pub(crate) struct GlobalStateSnapshot {
     pub(crate) config: Arc<Config>,
     pub(crate) analysis: Analysis,
     pub(crate) check_fixes: CheckFixes,
-    pub(crate) latest_requests: Arc<RwLock<LatestRequests>>,
     mem_docs: MemDocs,
     pub(crate) semantic_tokens_cache: Arc<Mutex<FxHashMap<Url, SemanticTokens>>>,
     vfs: Arc<RwLock<(vfs::Vfs, FxHashMap<FileId, LineEndings>)>>,
@@ -169,7 +165,6 @@ impl GlobalState {
             prime_caches_queue: OpQueue::default(),
 
             fetch_build_data_queue: OpQueue::default(),
-            latest_requests: Default::default(),
         };
         // Apply any required database inputs from the config.
         this.update_configuration(config);
@@ -230,7 +225,6 @@ impl GlobalState {
             workspaces: Arc::clone(&self.workspaces),
             analysis: self.analysis_host.analysis(),
             vfs: Arc::clone(&self.vfs),
-            latest_requests: Arc::clone(&self.latest_requests),
             check_fixes: Arc::clone(&self.diagnostics.check_fixes),
             mem_docs: self.mem_docs.clone(),
             semantic_tokens_cache: Arc::clone(&self.semantic_tokens_cache),
@@ -270,9 +264,7 @@ impl GlobalState {
     pub(crate) fn respond(&mut self, response: lsp_server::Response) {
         if let Some((method, start)) = self.req_queue.incoming.complete(response.id.clone()) {
             let duration = start.elapsed();
-            log::info!("handled req#{} in {:?}", response.id, duration);
-            let metrics = RequestMetrics { id: response.id.clone(), method, duration };
-            self.latest_requests.write().record(metrics);
+            log::info!("handled {} - ({}) in {:0.2?}", method, response.id, duration);
             self.send(response.into());
         }
     }

crates/rust-analyzer/src/handlers.rs

@@ -79,12 +79,6 @@ pub(crate) fn handle_analyzer_status(
             .status(file_id)
             .unwrap_or_else(|_| "Analysis retrieval was cancelled".to_owned()),
     );
-    format_to!(buf, "\n\nRequests:\n");
-    let requests = snap.latest_requests.read();
-    for (is_last, r) in requests.iter() {
-        let mark = if is_last { "*" } else { " " };
-        format_to!(buf, "{}{:4} {:<36}{}ms\n", mark, r.id, r.method, r.duration.as_millis());
-    }
     Ok(buf)
 }
 

crates/rust-analyzer/src/lib.rs

@@ -30,7 +30,6 @@ mod semantic_tokens;
 mod markdown;
 mod diagnostics;
 mod line_index;
-mod request_metrics;
 mod lsp_utils;
 mod thread_pool;
 mod mem_docs;

crates/rust-analyzer/src/request_metrics.rs

@@ -1,37 +0,0 @@
-//! Records stats about requests
-use std::time::Duration;
-
-use lsp_server::RequestId;
-
-#[derive(Debug)]
-pub(crate) struct RequestMetrics {
-    pub(crate) id: RequestId,
-    pub(crate) method: String,
-    pub(crate) duration: Duration,
-}
-
-const N_COMPLETED_REQUESTS: usize = 10;
-
-#[derive(Debug, Default)]
-pub(crate) struct LatestRequests {
-    // hand-rolling VecDeque here to print things in a nicer way
-    buf: [Option<RequestMetrics>; N_COMPLETED_REQUESTS],
-    idx: usize,
-}
-
-impl LatestRequests {
-    pub(crate) fn record(&mut self, request: RequestMetrics) {
-        // special case: don't track status request itself
-        if request.method == "rust-analyzer/analyzerStatus" {
-            return;
-        }
-        let idx = self.idx;
-        self.buf[idx] = Some(request);
-        self.idx = (idx + 1) % N_COMPLETED_REQUESTS;
-    }
-
-    pub(crate) fn iter(&self) -> impl Iterator<Item = (bool, &RequestMetrics)> {
-        let idx = self.idx;
-        self.buf.iter().enumerate().filter_map(move |(i, req)| Some((i == idx, req.as_ref()?)))
-    }
-}