refactor: add clap to common and use one LogFormat in project

common/Cargo.toml

@@ -23,6 +23,7 @@ tokio-console = ["telemetry", "dep:console-subscriber"]
 [dependencies]
 anyhow.workspace = true
 console-subscriber = { workspace = true, optional = true }
+clap.workspace = true # technically optional to telemetry but required by the rest of the workspace right now
 gethostname = "0.4.2"
 opentelemetry-otlp = { workspace = true, optional = true }
 opentelemetry = { workspace = true, optional = true }

common/src/telemetry.rs

@@ -31,7 +31,16 @@ use tracing_subscriber::{
 };
 
 #[derive(
-    Clone, Copy, Debug, PartialEq, Eq, Hash, Default, serde::Deserialize, serde::Serialize,
+    Clone,
+    Copy,
+    Debug,
+    PartialEq,
+    Eq,
+    Hash,
+    Default,
+    clap::ValueEnum,
+    serde::Deserialize,
+    serde::Serialize,
 )]
 /// The format to use for logging
 #[serde(rename_all = "camelCase")]

operator/src/main.rs

@@ -1,7 +1,7 @@
 //! Operator is a long lived process that auotmates creating and managing Ceramic networks.
 #![deny(missing_docs)]
 use anyhow::Result;
-use clap::{arg, command, Parser, Subcommand, ValueEnum};
+use clap::{arg, command, Parser, Subcommand};
 use keramik_common::telemetry;
 use keramik_operator::set_network_log_format;
 use opentelemetry::global::{shutdown_meter_provider, shutdown_tracer_provider};
@@ -20,28 +20,7 @@ struct Cli {
     prom_bind: String,
 
     #[arg(long, env = "OPERATOR_LOG_FORMAT")]
-    log_format: Option<LogFormat>,
-}
-
-#[derive(ValueEnum, Debug, Clone)]
-/// The format of the logs
-pub enum LogFormat {
-    /// Compact single line logs
-    SingleLine,
-    /// Pretty multi-line logs
-    MultiLine,
-    /// JSON logs
-    Json,
-}
-
-impl From<LogFormat> for telemetry::LogFormat {
-    fn from(format: LogFormat) -> telemetry::LogFormat {
-        match format {
-            LogFormat::SingleLine => telemetry::LogFormat::SingleLine,
-            LogFormat::MultiLine => telemetry::LogFormat::MultiLine,
-            LogFormat::Json => telemetry::LogFormat::Json,
-        }
-    }
+    log_format: Option<telemetry::LogFormat>,
 }
 
 /// Available Subcommands

runner/src/main.rs

@@ -31,28 +31,7 @@ struct Cli {
 
     /// Specify the format of log events.
     #[arg(long, default_value = "multi-line", env = "RUNNER_LOG_FORMAT")]
-    log_format: LogFormat,
-}
-
-#[derive(clap::ValueEnum, Debug, Clone)]
-/// The format of the logs
-pub enum LogFormat {
-    /// Compact single line logs
-    SingleLine,
-    /// Pretty multi-line logs
-    MultiLine,
-    /// JSON logs
-    Json,
-}
-
-impl From<LogFormat> for telemetry::LogFormat {
-    fn from(format: LogFormat) -> telemetry::LogFormat {
-        match format {
-            LogFormat::SingleLine => telemetry::LogFormat::SingleLine,
-            LogFormat::MultiLine => telemetry::LogFormat::MultiLine,
-            LogFormat::Json => telemetry::LogFormat::Json,
-        }
-    }
+    log_format: telemetry::LogFormat,
 }
 
 /// Available Subcommands
@@ -91,7 +70,7 @@ pub enum CommandResult {
 #[tokio::main]
 async fn main() -> Result<()> {
     let args = Cli::parse();
-    telemetry::init_tracing(Some(args.otlp_endpoint.clone()), args.log_format.into()).await?;
+    telemetry::init_tracing(Some(args.otlp_endpoint.clone()), args.log_format).await?;
     let metrics_controller = telemetry::init_metrics_otlp(args.otlp_endpoint.clone()).await?;
     info!("starting runner");