instrument all the things

appmgr/src/context/cli.rs

@@ -13,6 +13,7 @@ use rpc_toolkit::reqwest::{Client, Url};
 use rpc_toolkit::url::Host;
 use rpc_toolkit::Context;
 use serde::Deserialize;
+use tracing::instrument;
 
 use crate::ResultExt;
 
@@ -56,6 +57,7 @@ const DEFAULT_PORT: u16 = 5959;
 pub struct CliContext(Arc<CliContextSeed>);
 impl CliContext {
     /// BLOCKING
+    #[instrument(skip(matches))]
     pub fn init(matches: &ArgMatches) -> Result<Self, crate::Error> {
         let cfg_path = Path::new(matches.value_of("config").unwrap_or(crate::CONFIG_PATH));
         let base = if cfg_path.exists() {

appmgr/src/context/diagnostic.rs

@@ -8,6 +8,7 @@ use rpc_toolkit::Context;
 use serde::Deserialize;
 use tokio::fs::File;
 use tokio::sync::broadcast::Sender;
+use tracing::instrument;
 use url::Host;
 
 use crate::shutdown::Shutdown;
@@ -22,6 +23,7 @@ pub struct DiagnosticContextConfig {
     pub zfs_pool_name: Option<String>,
 }
 impl DiagnosticContextConfig {
+    #[instrument(skip(path))]
     pub async fn load<P: AsRef<Path>>(path: Option<P>) -> Result<Self, Error> {
         let cfg_path = path
             .as_ref()
@@ -54,6 +56,7 @@ pub struct DiagnosticContextSeed {
 #[derive(Clone)]
 pub struct DiagnosticContext(Arc<DiagnosticContextSeed>);
 impl DiagnosticContext {
+    #[instrument(skip(path))]
     pub async fn init<P: AsRef<Path>>(path: Option<P>, error: Error) -> Result<Self, Error> {
         let cfg = DiagnosticContextConfig::load(path).await?;
 

appmgr/src/context/rpc.rs

@@ -133,6 +133,7 @@ pub struct RpcContextSeed {
 #[derive(Clone)]
 pub struct RpcContext(Arc<RpcContextSeed>);
 impl RpcContext {
+    #[instrument(skip(cfg_path))]
     pub async fn init<P: AsRef<Path>>(cfg_path: Option<P>) -> Result<Self, Error> {
         let base = RpcContextConfig::load(cfg_path).await?;
         let log_epoch = Arc::new(AtomicU64::new(rand::random()));
@@ -157,7 +158,7 @@ impl RpcContext {
         .await?;
         let managers = ManagerMap::default();
         let metrics_cache = RwLock::new(None);
-        let notification_manager = NotificationManager::new(secret_store.clone(), db.clone(), 3600);
+        let notification_manager = NotificationManager::new(secret_store.clone(), 3600);
         let seed = Arc::new(RpcContextSeed {
             bind_rpc: base.bind_rpc.unwrap_or(([127, 0, 0, 1], 5959).into()),
             bind_ws: base.bind_ws.unwrap_or(([127, 0, 0, 1], 5960).into()),
@@ -199,12 +200,13 @@ impl RpcContext {
         // TODO: handle apps in bad / transient state
         Ok(res)
     }
+    #[instrument(skip(self))]
     pub async fn package_registry_url(&self) -> Result<Url, Error> {
         Ok(
             if let Some(market) = crate::db::DatabaseModel::new()
                 .server_info()
                 .package_marketplace()
-                .get(&mut self.db.handle(), true)
+                .get(&mut self.db.handle(), false)
                 .await?
                 .to_owned()
             {
@@ -214,11 +216,12 @@ impl RpcContext {
             },
         )
     }
+    #[instrument(skip(self))]
     pub async fn eos_registry_url(&self) -> Result<Url, Error> {
         Ok(crate::db::DatabaseModel::new()
             .server_info()
             .eos_marketplace()
-            .get(&mut self.db.handle(), true)
+            .get(&mut self.db.handle(), false)
             .await?
             .to_owned())
     }

appmgr/src/context/sdk.rs

@@ -7,6 +7,7 @@ use clap::ArgMatches;
 use color_eyre::eyre::eyre;
 use rpc_toolkit::Context;
 use serde::Deserialize;
+use tracing::instrument;
 
 use crate::{Error, ResultExt};
 
@@ -25,6 +26,7 @@ pub struct SdkContextSeed {
 pub struct SdkContext(Arc<SdkContextSeed>);
 impl SdkContext {
     /// BLOCKING
+    #[instrument(skip(matches))]
     pub fn init(matches: &ArgMatches) -> Result<Self, crate::Error> {
         let cfg_path = Path::new(matches.value_of("config").unwrap_or(crate::CONFIG_PATH));
         let base = if cfg_path.exists() {
@@ -46,6 +48,7 @@ impl SdkContext {
         })))
     }
     /// BLOCKING
+    #[instrument]
     pub fn developer_key(&self) -> Result<ed25519_dalek::Keypair, Error> {
         if !self.developer_key_path.exists() {
             return Err(Error::new(eyre!("Developer Key does not exist! Please run `embassy-sdk init` before running this command."), crate::ErrorKind::Uninitialized));

appmgr/src/context/setup.rs

@@ -15,6 +15,7 @@ use sqlx::SqlitePool;
 use tokio::fs::File;
 use tokio::sync::broadcast::Sender;
 use tokio::sync::RwLock;
+use tracing::instrument;
 use url::Host;
 
 use crate::db::model::Database;
@@ -33,6 +34,7 @@ pub struct SetupContextConfig {
     pub datadir: Option<PathBuf>,
 }
 impl SetupContextConfig {
+    #[instrument(skip(path))]
     pub async fn load<P: AsRef<Path>>(path: Option<P>) -> Result<Self, Error> {
         let cfg_path = path
             .as_ref()
@@ -74,6 +76,7 @@ pub struct SetupContextSeed {
 #[derive(Clone)]
 pub struct SetupContext(Arc<SetupContextSeed>);
 impl SetupContext {
+    #[instrument(skip(path))]
     pub async fn init<P: AsRef<Path>>(path: Option<P>) -> Result<Self, Error> {
         let cfg = SetupContextConfig::load(path).await?;
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
@@ -89,6 +92,7 @@ impl SetupContext {
             recovery_status: RwLock::new(None),
         })))
     }
+    #[instrument(skip(self))]
     pub async fn db(&self, secret_store: &SqlitePool) -> Result<PatchDb, Error> {
         let db_path = self.datadir.join("main").join("embassy.db");
         let db = PatchDb::open(&db_path)
@@ -108,6 +112,7 @@ impl SetupContext {
         }
         Ok(db)
     }
+    #[instrument(skip(self))]
     pub async fn secret_store(&self) -> Result<SqlitePool, Error> {
         let secret_store = SqlitePool::connect_with(
             SqliteConnectOptions::new()
@@ -122,6 +127,7 @@ impl SetupContext {
             .with_kind(crate::ErrorKind::Database)?;
         Ok(secret_store)
     }
+    #[instrument(skip(self))]
     pub async fn product_key(&self) -> Result<Arc<String>, Error> {
         Ok(
             if let Some(k) = {