diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index b59480fdc12..1c19c7b64aa 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -1812,6 +1812,7 @@ dependencies = [ "serde_json", "tokio", "tokio-util", + "tracing", "uniffi", ] diff --git a/apps/desktop/desktop_native/macos_provider/Cargo.toml b/apps/desktop/desktop_native/macos_provider/Cargo.toml index a48aadb5b99..9f042209b06 100644 --- a/apps/desktop/desktop_native/macos_provider/Cargo.toml +++ b/apps/desktop/desktop_native/macos_provider/Cargo.toml @@ -21,6 +21,7 @@ serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } tokio = { workspace = true, features = ["sync"] } tokio-util = { workspace = true } +tracing = { workspace = true } uniffi = { workspace = true, features = ["cli"] } [target.'cfg(target_os = "macos")'.dependencies] diff --git a/apps/desktop/desktop_native/macos_provider/src/lib.rs b/apps/desktop/desktop_native/macos_provider/src/lib.rs index 9872468643b..ded133bcb54 100644 --- a/apps/desktop/desktop_native/macos_provider/src/lib.rs +++ b/apps/desktop/desktop_native/macos_provider/src/lib.rs @@ -7,8 +7,8 @@ use std::{ }; use futures::FutureExt; -use log::{error, info}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; +use tracing::{error, info}; uniffi::setup_scaffolding!(); @@ -114,21 +114,21 @@ impl MacOSProviderClient { match value { Ok(value) => { if let Err(e) = cb.complete(value) { - error!("Error deserializing message: {e}"); + error!(error = %e, "Error deserializing message"); } } Err(e) => { - error!("Error processing message: {e:?}"); + error!(error = ?e, "Error processing message"); cb.error(e) } } } None => { - error!("No callback found for sequence number: {sequence_number}") + error!(sequence_number, "No callback found for sequence number") } }, Err(e) => { - error!("Error deserializing message: {e}"); + error!(error = %e, "Error deserializing message"); } }; } diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts index 281bfd5d69f..2212c03f4f8 100644 --- a/apps/desktop/desktop_native/napi/index.d.ts +++ b/apps/desktop/desktop_native/napi/index.d.ts @@ -228,8 +228,8 @@ export declare namespace chromium_importer { login?: Login failure?: LoginImportFailure } - export function getInstalledBrowsers(): Promise> - export function getAvailableProfiles(browser: string): Promise> + export function getInstalledBrowsers(): Array + export function getAvailableProfiles(browser: string): Array export function importLogins(browser: string, profileId: string): Promise> } export declare namespace autotype {