pr review

otel-worker-cli/src/commands.rs

@@ -7,6 +7,7 @@ pub mod client;
 pub mod debug;
 pub mod dev;
 pub mod system;
+mod util;
 
 /// otel-worker - store and query traces
 #[derive(Parser, Debug)]

otel-worker-cli/src/commands/client/traces.rs

@@ -1,8 +1,8 @@
-use anyhow::{anyhow, Result};
+use crate::commands::util::parse_rfc3339_from_str;
+use anyhow::Result;
 use clap::Subcommand;
 use otel_worker_core::api::client::ApiClient;
 use std::io::stdout;
-use time::format_description::well_known::Rfc3339;
 use time::OffsetDateTime;
 use url::Url;
 
@@ -62,7 +62,8 @@ pub struct ListArgs {
 
     /// Optional timestamp from which traces that occurred before it are returned.
     /// Must be in RFC3339 format
-    pub time: Option<String>,
+    #[arg(value_parser = parse_rfc3339_from_str)]
+    pub time: Option<OffsetDateTime>,
 
     #[arg(from_global)]
     pub base_url: Url,
@@ -72,19 +73,10 @@ pub struct ListArgs {
 }
 
 async fn handle_list(args: ListArgs) -> Result<()> {
-    let time = if let Some(time) = args.time {
-        Some(
-            OffsetDateTime::parse(&time, &Rfc3339)
-                .map_err(|err| anyhow!("failed to parse time argument as rfc3339: {err}"))?,
-        )
-    } else {
-        None
-    };
-
     let mut api_client = ApiClient::new(args.base_url.clone());
     api_client.set_bearer_token(args.auth_token);
 
-    let result = api_client.trace_list(args.limit, time).await?;
+    let result = api_client.trace_list(args.limit, args.time).await?;
 
     serde_json::to_writer_pretty(stdout(), &result)?;
 

otel-worker-cli/src/commands/util.rs

@@ -0,0 +1,7 @@
+use anyhow::{Context, Result};
+use time::format_description::well_known::Rfc3339;
+use time::OffsetDateTime;
+
+pub fn parse_rfc3339_from_str(arg: &str) -> Result<OffsetDateTime> {
+    OffsetDateTime::parse(arg, &Rfc3339).context("failed to parse rfc3339 timestamp")
+}