2 files changed, 17 insertions, 30 deletions

diff --git a/crates/core/tedge_mapper/src/collectd_mapper/batcher.rs b/crates/core/tedge_mapper/src/collectd_mapper/batcher.rs
index e7ecd830..9844485e 100644
--- a/crates/core/tedge_mapper/src/collectd_mapper/batcher.rs
+++ b/crates/core/tedge_mapper/src/collectd_mapper/batcher.rs
@@ -7,7 +7,6 @@ use thin_edge_json::{
 };
 
 use crate::collectd_mapper::{collectd::CollectdMessage, error::DeviceMonitorError};
-use chrono::Local;
 use thin_edge_json::group::MeasurementGrouperError;
 
 #[derive(Debug)]
@@ -22,7 +21,7 @@ impl MessageBatch {
         let mut messages = messages.into_iter();
 
         if let Some(first_message) = messages.next() {
-            let timestamp = first_message.timestamp.with_timezone(Local::now().offset());
+            let timestamp = first_message.timestamp;
             let mut batch = MessageBatch::start_batch(first_message, timestamp)?;
             for message in messages {
                 batch.add_to_batch(message)?;
@@ -72,12 +71,12 @@ impl MessageBatch {
 mod tests {
     use super::*;
     use assert_matches::assert_matches;
-    use chrono::{TimeZone, Utc};
     use clock::{Clock, WallClock};
+    use time::macros::datetime;
 
     #[test]
     fn test_message_batch_processor() -> anyhow::Result<()> {
-        let timestamp = Utc.ymd(2015, 5, 15).and_hms_milli(0, 0, 1, 444);
+        let timestamp = datetime!(2015-05-15 0:00:01.444 UTC);
         let collectd_message = CollectdMessage::new("temperature", "value", 32.5, timestamp);
         let mut message_batch = MessageBatch::start_batch(collectd_message, WallClock.now())?;
 
diff --git a/crates/core/tedge_mapper/src/collectd_mapper/collectd.rs b/crates/core/tedge_mapper/src/collectd_mapper/collectd.rs
index ab98f67d..0bb0fe22 100644
--- a/crates/core/tedge_mapper/src/collectd_mapper/collectd.rs
+++ b/crates/core/tedge_mapper/src/collectd_mapper/collectd.rs
@@ -1,13 +1,13 @@
 use batcher::Batchable;
-use chrono::{DateTime, NaiveDateTime, Utc};
 use mqtt_channel::Message;
 use thin_edge_json::measurement::MeasurementVisitor;
+use time::{Duration, OffsetDateTime};
 
 #[derive(Debug)]
 pub struct CollectdMessage {
     pub metric_group_key: String,
     pub metric_key: String,
-    pub timestamp: DateTime<Utc>,
+    pub timestamp: OffsetDateTime,
     pub metric_value: f64,
 }
 
@@ -43,7 +43,7 @@ impl CollectdMessage {
         metric_group_key: &str,
         metric_key: &str,
         metric_value: f64,
-        timestamp: DateTime<Utc>,
+        timestamp: OffsetDateTime,
     ) -> Self {
         Self {
             metric_group_key: metric_group_key.to_string(),
@@ -167,10 +167,11 @@ impl CollectdPayload {
         })
     }
 
-    pub fn timestamp(&self) -> DateTime<Utc> {
+    pub fn timestamp(&self) -> OffsetDateTime {
         let timestamp = self.timestamp.trunc() as i64;
         let nanoseconds = (self.timestamp.fract() * 1.0e9) as u32;
-        DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(timestamp, nanoseconds), Utc)
+        OffsetDateTime::from_unix_timestamp(timestamp).unwrap()
+            + Duration::nanoseconds(nanoseconds as i64)
     }
 }
 
@@ -181,18 +182,17 @@ impl Batchable for CollectdMessage {
         format!("{}/{}", &self.metric_group_key, &self.metric_key)
     }
 
-    fn event_time(&self) -> DateTime<Utc> {
+    fn event_time(&self) -> OffsetDateTime {
         self.timestamp
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use std::ops::Index;
-
     use assert_matches::assert_matches;
-    use chrono::TimeZone;
     use mqtt_channel::Topic;
+    use std::ops::Index;
+    use time::macros::datetime;
 
     use super::*;
 
@@ -212,10 +212,7 @@ mod tests {
         assert_eq!(metric_group_key, "temperature");
 
         assert_eq!(metric_key, "value");
-        assert_eq!(
-            *timestamp,
-            Utc.ymd(1973, 11, 29).and_hms_milli(21, 33, 09, 0)
-        );
+        assert_eq!(*timestamp, datetime!(1973-11-29 21:33:09.0 UTC));
         assert_eq!(*metric_value, 32.5);
     }
 
@@ -230,15 +227,12 @@ mod tests {
             metric_group_key,
             metric_key,
             timestamp,
-            metric_value,
+            metric_value: _,
         } = collectd_message.index(0);
         assert_eq!(metric_group_key, "temperature");
 
         assert_eq!(metric_key, "value_val1");
-        assert_eq!(
-            *timestamp,
-            Utc.ymd(1973, 11, 29).and_hms_milli(21, 33, 09, 0)
-        );
+        assert_eq!(*timestamp, datetime!(1973-11-29 21:33:09.0 UTC));
 
         let CollectdMessage {
             metric_group_key,
@@ -249,10 +243,7 @@ mod tests {
 
         assert_eq!(metric_group_key, "temperature");
         assert_eq!(metric_key, "value_val2");
-        assert_eq!(
-            *timestamp,
-            Utc.ymd(1973, 11, 29).and_hms_milli(21, 33, 09, 0)
-        );
+        assert_eq!(*timestamp, datetime!(1973-11-29 21:33:09.0 UTC));
         assert_eq!(*metric_value, 45.2);
     }
 
@@ -272,10 +263,7 @@ mod tests {
 
         assert_eq!(metric_group_key, "temperature");
         assert_eq!(metric_key, "value");
-        assert_eq!(
-            *timestamp,
-            Utc.ymd(1973, 11, 29).and_hms_milli(21, 33, 09, 125)
-        );
+        assert_eq!(*timestamp, datetime!(1973-11-29 21:33:09.125 UTC));
         assert_eq!(*metric_value, 32.5);
     }