refactor(attest): switch to orb-telemetry (#319)

worldcoin · Dec 11, 2024 · f3f143a · f3f143a
1 parent 335bfe7
commit f3f143a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 65 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/attest/Cargo.toml b/attest/Cargo.toml
@@ -20,6 +20,7 @@ orb-attest-dbus.workspace = true
 orb-build-info.workspace = true
 orb-const-concat.workspace = true
 orb-security-utils = { workspace = true, features = ["reqwest"] }
+orb-telemetry.workspace = true
 reqwest = { workspace = true, features = ["json", "multipart"] }
 ring.workspace = true
 secrecy = { workspace = true, features = ["serde"] }

diff --git a/attest/src/lib.rs b/attest/src/lib.rs
@@ -3,7 +3,6 @@
 pub mod client;
 pub mod config;
 pub mod dbus;
-pub mod logging;
 pub mod remote_api;
 
 use std::sync::Arc;
@@ -20,10 +19,10 @@ const BUILD_INFO: BuildInfo = make_build_info!();
 
 const HTTP_RETRY_DELAY: std::time::Duration = std::time::Duration::from_secs(3);
 
+pub const SYSLOG_IDENTIFIER: &str = "worldcoin-attest";
+
 #[allow(clippy::missing_errors_doc)]
 pub async fn main() -> eyre::Result<()> {
-    logging::init();
-
     info!("Version: {}", BUILD_INFO.version);
 
     let orb_id =

diff --git a/attest/src/logging.rs b/attest/src/logging.rs
diff --git a/attest/src/main.rs b/attest/src/main.rs
@@ -1,5 +1,8 @@
 #[tokio::main]
 async fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
+    orb_telemetry::TelemetryConfig::new()
+        .with_journald(orb_attest::SYSLOG_IDENTIFIER)
+        .init();
     orb_attest::main().await
 }
diff --git a/attest/src/remote_api.rs b/attest/src/remote_api.rs
@@ -518,7 +518,7 @@ printf dmFsaWRzaWduYXR1cmU=
     // A happy path
     #[tokio::test]
     async fn get_token() {
-        crate::logging::init();
+        orb_telemetry::TelemetryConfig::new().init();
 
         let mock_server = MockServer::start().await;