diff --git a/compute_tools/src/compute.rs b/compute_tools/src/compute.rs index f256a7430b..31c4e07c8c 100644 --- a/compute_tools/src/compute.rs +++ b/compute_tools/src/compute.rs @@ -1490,11 +1490,6 @@ LIMIT 100", pub fn get_installed_extensions(&self) -> Result<()> { let connstr = self.connstr.clone(); - let compute_state = self.state.lock().unwrap().clone(); - let pspec = compute_state.pspec.as_ref().expect("spec must be set"); - let tenant_id = pspec.tenant_id; - let timeline_id = pspec.timeline_id; - thread::spawn(move || { let rt = tokio::runtime::Builder::new_current_thread() .enable_all() @@ -1503,8 +1498,6 @@ LIMIT 100", let result = rt .block_on(crate::installed_extensions::get_installed_extensions( connstr, - tenant_id, - timeline_id, )) .expect("failed to get installed extensions"); diff --git a/compute_tools/src/http/api.rs b/compute_tools/src/http/api.rs index 2da25a5e82..e17f3d263b 100644 --- a/compute_tools/src/http/api.rs +++ b/compute_tools/src/http/api.rs @@ -205,15 +205,8 @@ async fn routes(req: Request, compute: &Arc) -> Response render_json(Body::from(serde_json::to_string(&res).unwrap())), Err(e) => render_json_error( diff --git a/compute_tools/src/installed_extensions.rs b/compute_tools/src/installed_extensions.rs index e16e13b044..c11b3f007c 100644 --- a/compute_tools/src/installed_extensions.rs +++ b/compute_tools/src/installed_extensions.rs @@ -3,8 +3,6 @@ use metrics::proto::MetricFamily; use std::collections::HashMap; use std::collections::HashSet; use url::Url; -use utils::id::TenantId; -use utils::id::TimelineId; use anyhow::Result; use postgres::{Client, NoTls}; @@ -42,11 +40,7 @@ fn list_dbs(client: &mut Client) -> Result> { /// Connect to every database (see list_dbs above) and get the list of installed extensions. /// Same extension can be installed in multiple databases with different versions, /// we only keep the highest and lowest version across all databases. -pub async fn get_installed_extensions( - connstr: Url, - tenant_id: TenantId, - timeline_id: TimelineId, -) -> Result { +pub async fn get_installed_extensions(connstr: Url) -> Result { let mut connstr = connstr.clone(); task::spawn_blocking(move || { @@ -99,12 +93,7 @@ pub async fn get_installed_extensions( }; INSTALLED_EXTENSIONS - .with_label_values(&[ - &tenant_id.to_string(), - &timeline_id.to_string(), - &ext.extname, - &versions, - ]) + .with_label_values(&[&ext.extname, &versions]) .set(ext.n_databases as u64); } @@ -117,7 +106,7 @@ static INSTALLED_EXTENSIONS: Lazy = Lazy::new(|| { register_uint_gauge_vec!( "installed_extensions", "Number of databases where extension is installed, versions passed as label", - &["tenant_id", "timeline_id", "extension_name", "versions"] + &["extension_name", "versions"] ) .expect("failed to define a metric") });