local time!!!!11!1

Cargo.lock

@@ -1354,6 +1354,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.37.3"
@@ -2286,7 +2295,9 @@ checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
+ "libc",
  "num-conv",
+ "num_threads",
  "powerfmt",
  "serde_core",
  "time-core",
@@ -2655,6 +2666,7 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "time",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -2834,6 +2846,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
+ "time",
  "tokio",
  "tokio-tungstenite 0.24.0",
  "toml",
@@ -2860,6 +2873,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sled",
+ "time",
  "tokio",
  "toml",
  "tower-http",

wakey-agent/Cargo.toml

@@ -27,7 +27,8 @@ tokio = { version = "1", features = [
 tokio-tungstenite = { version = "0.24", features = ["rustls-tls-webpki-roots"] }
 toml = "0.8"
 tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "time"] }
+time = { version = "0.3", features = ["formatting", "local-offset"] }
 url = "2"
 wakey = { path = "..", registry = "gitea" }
 wakey-core = { path = "../wakey-core", registry = "gitea" }

wakey-agent/src/tracing.rs

@@ -1,3 +1,6 @@
+use time::UtcOffset;
+use time::format_description::well_known::Rfc3339;
+use tracing_subscriber::fmt::time::OffsetTime;
 use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
 
 pub fn init(verbose: u8) {
@@ -7,7 +10,7 @@ pub fn init(verbose: u8) {
 
     tracing_subscriber::registry()
         .with(filter)
-        .with(fmt::layer())
+        .with(fmt::layer().with_timer(local_offset_timer()))
         .init();
 }
 
@@ -18,3 +21,8 @@ fn default_filter(verbose: u8) -> &'static str {
         _ => "wakey_agent=trace,wakey=debug",
     }
 }
+
+fn local_offset_timer() -> OffsetTime<Rfc3339> {
+    let offset = UtcOffset::current_local_offset().unwrap_or(UtcOffset::UTC);
+    OffsetTime::new(offset, Rfc3339)
+}

wakey-control-plane/Cargo.toml

@@ -25,7 +25,8 @@ tokio = { version = "1", features = [
 tower-http = { version = "0.6.8", features = ["fs"] }
 tracing = "0.1"
 tracing-opentelemetry = "0.32"
-tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "json"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "json", "time"] }
+time = { version = "0.3", features = ["formatting", "local-offset"] }
 opentelemetry = "0.31"
 opentelemetry-otlp = { version = "0.31", features = ["grpc-tonic", "trace"] }
 opentelemetry_sdk = { version = "0.31", features = ["rt-tokio"] }

wakey-control-plane/src/cli.rs

@@ -71,7 +71,7 @@ pub struct ServeArgs {
     #[arg(long)]
     pub pid_file: Option<PathBuf>,
 
-    #[arg(long, default_value = DEFAULT_CONFIG_FILE)]
+    #[arg(long, visible_alias="config", default_value = DEFAULT_CONFIG_FILE)]
     pub config_file: PathBuf,
 
     #[arg(long)]

wakey-control-plane/src/tracing.rs

@@ -4,6 +4,9 @@ use opentelemetry::trace::TracerProvider as _;
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::Resource;
 use opentelemetry_sdk::trace::{SdkTracerProvider, Tracer};
+use time::UtcOffset;
+use time::format_description::well_known::Rfc3339;
+use tracing_subscriber::fmt::time::OffsetTime;
 use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
 
 use crate::config::TelemetryConfig;
@@ -20,13 +23,13 @@ pub fn init(verbose: u8, telemetry: &TelemetryConfig) -> Result<()> {
             tracing_subscriber::registry()
                 .with(otel_layer)
                 .with(filter)
-                .with(fmt::layer().json())
+                .with(fmt::layer().json().with_timer(local_offset_timer()))
                 .init();
             tracing::info!(endpoint = ?telemetry.otlp_endpoint, json_logs = telemetry.json_logs, "tracing initialized with otlp exporter");
         } else {
             tracing_subscriber::registry()
                 .with(filter)
-                .with(fmt::layer().json())
+                .with(fmt::layer().json().with_timer(local_offset_timer()))
                 .init();
             tracing::info!(
                 json_logs = telemetry.json_logs,
@@ -37,13 +40,13 @@ pub fn init(verbose: u8, telemetry: &TelemetryConfig) -> Result<()> {
         tracing_subscriber::registry()
             .with(otel_layer)
             .with(filter)
-            .with(fmt::layer())
+            .with(fmt::layer().with_timer(local_offset_timer()))
             .init();
         tracing::info!(endpoint = ?telemetry.otlp_endpoint, json_logs = telemetry.json_logs, "tracing initialized with otlp exporter");
     } else {
         tracing_subscriber::registry()
             .with(filter)
-            .with(fmt::layer())
+            .with(fmt::layer().with_timer(local_offset_timer()))
             .init();
         tracing::info!(
             json_logs = telemetry.json_logs,
@@ -89,3 +92,8 @@ fn default_filter(verbose: u8) -> &'static str {
         _ => "wakey_control_plane=trace",
     }
 }
+
+fn local_offset_timer() -> OffsetTime<Rfc3339> {
+    let offset = UtcOffset::current_local_offset().unwrap_or(UtcOffset::UTC);
+    OffsetTime::new(offset, Rfc3339)
+}