ref: Replace chrono usage with time/SystemTime (#409)

Author: Swatinem

.github/workflows/ci.yml

@@ -99,7 +99,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [1.51.0]
+        rust: [1.53.0]
 
     name: Check / Test MSRV ${{ matrix.rust }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 **Breaking Changes**:
 
-- The minium supported Rust version was bumped to **1.51.0** due to requirements from dependencies.
+- The minium supported Rust version was bumped to **1.53.0** due to requirements from dependencies.
 - The `backtrace` feature of `sentry-anyhow` is enabled by default. ([#362](https://github.com/getsentry/sentry-rust/pull/362))
 - The `tracing-subscriber` dependency of `sentry-tracing` has been bumped to version `0.3.x`. ([#377](https://github.com/getsentry/sentry-rust/pull/377))
 - `Scope::add_event_processor` now takes a generic parameter instead of a boxed function.([#380](https://github.com/getsentry/sentry-rust/pull/380))

README.md

@@ -94,7 +94,7 @@ best API and adding new features.
 We currently only verify this crate against a recent version of Sentry hosted on [sentry.io](https://sentry.io/) but it
 should work with on-prem Sentry versions 20.6 and later.
 
-The **Minimum Supported Rust Version** is currently at _1.51.0_.
+The **Minimum Supported Rust Version** is currently at _1.53.0_.
 The Sentry crates will support a _6 month_ old Rust version at time of release,
 and the MSRV will be increased in accordance with its dependencies.
 

clippy.toml

@@ -1 +1 @@
-msrv = "1.51"
+msrv = "1.53"

sentry-core/Cargo.toml

@@ -29,7 +29,6 @@ test = ["client"]
 [dependencies]
 sentry-types = { version = "0.23.0", path = "../sentry-types" }
 serde = { version = "1.0.104", features = ["derive"] }
-chrono = { version = "0.4.13", default-features = false }
 lazy_static = "1.4.0"
 rand = { version = "0.8.1", optional = true }
 serde_json = "1.0.46"

sentry-core/src/session.rs

@@ -5,9 +5,7 @@
 use std::collections::HashMap;
 use std::sync::{Arc, Condvar, Mutex, MutexGuard};
 use std::thread::JoinHandle;
-use std::time::{Duration, Instant};
-
-use chrono::{Duration as ChronoDuration, DurationRound};
+use std::time::{Duration, Instant, SystemTime};
 
 use crate::client::TransportArc;
 use crate::clientoptions::SessionMode;
@@ -16,7 +14,7 @@ use crate::protocol::{
     SessionStatus, SessionUpdate,
 };
 use crate::scope::StackLayer;
-use crate::types::{DateTime, Utc, Uuid};
+use crate::types::Uuid;
 use crate::{Client, Envelope};
 
 #[derive(Clone, Debug)]
@@ -56,7 +54,7 @@ impl Session {
                 distinct_id,
                 sequence: None,
                 timestamp: None,
-                started: Utc::now(),
+                started: SystemTime::now(),
                 init: true,
                 duration: None,
                 status: SessionStatus::Ok,
@@ -164,7 +162,7 @@ impl From<AggregatedSessions> for EnvelopeItem {
 
 #[derive(Debug, PartialEq, Eq, Hash)]
 struct AggregationKey {
-    started: DateTime<Utc>,
+    started: SystemTime,
     distinct_id: Option<String>,
 }
 
@@ -257,9 +255,13 @@ impl SessionFlusher {
             attributes: session_update.attributes.clone(),
         });
 
-        let started = session_update
+        let duration = session_update
             .started
-            .duration_trunc(ChronoDuration::minutes(1))
+            .duration_since(SystemTime::UNIX_EPOCH)
+            .unwrap();
+        let duration = (duration.as_secs() / 60) * 60;
+        let started = SystemTime::UNIX_EPOCH
+            .checked_add(Duration::from_secs(duration))
             .unwrap();
 
         let key = AggregationKey {

sentry-types/Cargo.toml

@@ -20,12 +20,12 @@ default = ["protocol"]
 protocol = []
 
 [dependencies]
-thiserror = "1.0.15"
+debugid = { version = "0.7.2", features = ["serde"] }
+getrandom = "0.2.3"
+hex = "0.4.3"
 serde = { version = "1.0.104", features = ["derive"] }
 serde_json = "1.0.46"
+thiserror = "1.0.15"
+time = { version = "0.3.5", features = ["formatting", "parsing"] }
 url = { version = "2.1.1", features = ["serde"] }
-chrono = { version = "0.4.13", default-features = false, features = ["clock", "std", "serde"] }
 uuid = { version = "0.8.1", features = ["v4", "serde"] }
-debugid = { version = "0.7.2", features = ["serde"] }
-getrandom = "0.2.3"
-hex = "0.4.3"

sentry-types/src/auth.rs

@@ -1,8 +1,8 @@
 use std::borrow::Cow;
 use std::fmt;
 use std::str::FromStr;
+use std::time::SystemTime;
 
-use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use url::form_urlencoded;
@@ -29,7 +29,7 @@ pub enum ParseAuthError {
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Auth {
     #[serde(skip)]
-    timestamp: Option<DateTime<Utc>>,
+    timestamp: Option<SystemTime>,
     #[serde(rename = "sentry_client")]
     client: Option<String>,
     #[serde(rename = "sentry_version")]
@@ -60,11 +60,7 @@ impl Auth {
             let value = value.into();
             match key.as_ref() {
                 "sentry_timestamp" => {
-                    let timestamp = value
-                        .parse()
-                        .ok()
-                        .and_then(|ts| timestamp_to_datetime(ts).single())
-                        .or_else(|| value.parse().ok());
+                    let timestamp = value.parse().ok().and_then(timestamp_to_datetime);
 
                     rv.timestamp = timestamp;
                 }
@@ -100,8 +96,8 @@ impl Auth {
         Auth::from_pairs(form_urlencoded::parse(qs))
     }
 
-    /// Returns the unix timestamp the client defined
-    pub fn timestamp(&self) -> Option<DateTime<Utc>> {
+    /// Returns the timestamp the client defined
+    pub fn timestamp(&self) -> Option<SystemTime> {
         self.timestamp
     }
 
@@ -179,7 +175,7 @@ impl FromStr for Auth {
 
 pub(crate) fn auth_from_dsn_and_client(dsn: &Dsn, client: Option<&str>) -> Auth {
     Auth {
-        timestamp: Some(Utc::now()),
+        timestamp: Some(SystemTime::now()),
         client: client.map(|x| x.to_string()),
         version: protocol::LATEST,
         key: dsn.public_key().to_string(),

sentry-types/src/lib.rs

@@ -50,6 +50,5 @@ pub use crate::dsn::*;
 pub use crate::project_id::*;
 
 // Re-export external types and traits for convenience
-pub use chrono::{DateTime, ParseError as ChronoParseError, TimeZone, Utc};
 pub use debugid::*;
 pub use uuid::{Uuid, Variant as UuidVariant, Version as UuidVersion};

sentry-types/src/protocol/envelope.rs

@@ -250,7 +250,10 @@ impl From<Transaction<'static>> for Envelope {
 
 #[cfg(test)]
 mod test {
-    use chrono::{DateTime, Utc};
+    use std::time::{Duration, SystemTime};
+
+    use time::format_description::well_known::Rfc3339;
+    use time::OffsetDateTime;
 
     use super::*;
     use crate::protocol::v7::{SessionAttributes, SessionStatus, Span};
@@ -261,6 +264,14 @@ mod test {
         String::from_utf8_lossy(&vec).to_string()
     }
 
+    fn timestamp(s: &str) -> SystemTime {
+        let dt = OffsetDateTime::parse(s, &Rfc3339).unwrap();
+        let secs = dt.unix_timestamp() as u64;
+        let nanos = dt.nanosecond();
+        let duration = Duration::new(secs, nanos);
+        SystemTime::UNIX_EPOCH.checked_add(duration).unwrap()
+    }
+
     #[test]
     fn test_empty() {
         assert_eq!(to_str(Envelope::new()), "{}\n");
@@ -269,7 +280,7 @@ mod test {
     #[test]
     fn test_event() {
         let event_id = Uuid::parse_str("22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c").unwrap();
-        let timestamp = "2020-07-20T14:51:14.296Z".parse::<DateTime<Utc>>().unwrap();
+        let timestamp = timestamp("2020-07-20T14:51:14.296Z");
         let event = Event {
             event_id,
             timestamp,
@@ -288,7 +299,7 @@ mod test {
     #[test]
     fn test_session() {
         let session_id = Uuid::parse_str("22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c").unwrap();
-        let started = "2020-07-20T14:51:14.296Z".parse::<DateTime<Utc>>().unwrap();
+        let started = timestamp("2020-07-20T14:51:14.296Z");
         let session = SessionUpdate {
             session_id,
             distinct_id: Some("[email protected]".to_owned()),
@@ -322,7 +333,7 @@ mod test {
         let event_id = Uuid::parse_str("22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c").unwrap();
         let span_id = "d42cee9fc3e74f5c".parse().unwrap();
         let trace_id = "335e53d614474acc9f89e632b776cc28".parse().unwrap();
-        let start_timestamp = "2020-07-20T14:51:14.296Z".parse::<DateTime<Utc>>().unwrap();
+        let start_timestamp = timestamp("2020-07-20T14:51:14.296Z");
         let spans = vec![Span {
             span_id,
             trace_id,

sentry-types/src/protocol/session.rs

@@ -2,12 +2,14 @@ use std::borrow::Cow;
 use std::fmt;
 use std::net::IpAddr;
 use std::str;
+use std::time::SystemTime;
 
-use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use uuid::Uuid;
 
+use crate::utils::{ts_rfc3339, ts_rfc3339_opt};
+
 /// The Status of a Release Health Session.
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
@@ -102,12 +104,16 @@ pub struct SessionUpdate<'a> {
     pub sequence: Option<u64>,
 
     /// The timestamp of when the session change event was created.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub timestamp: Option<DateTime<Utc>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "ts_rfc3339_opt"
+    )]
+    pub timestamp: Option<SystemTime>,
 
     /// The timestamp of when the session itself started.
-    #[serde(default = "Utc::now")]
-    pub started: DateTime<Utc>,
+    #[serde(default = "SystemTime::now", with = "ts_rfc3339")]
+    pub started: SystemTime,
 
     /// A flag that indicates that this is the initial transmission of the session.
     #[serde(default, skip_serializing_if = "is_false")]
@@ -139,7 +145,8 @@ fn is_zero(val: &u32) -> bool {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct SessionAggregateItem {
     /// The timestamp of when the session itself started.
-    pub started: DateTime<Utc>,
+    #[serde(with = "ts_rfc3339")]
+    pub started: SystemTime,
     /// The distinct identifier.
     #[serde(rename = "did", default, skip_serializing_if = "Option::is_none")]
     pub distinct_id: Option<String>,