Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: second granularity #6606

Merged
merged 3 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
67 changes: 67 additions & 0 deletions crates/turborepo-lib/src/run/summary/duration.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
use std::fmt::{self, Formatter};

use chrono::{DateTime, Duration, Local, SubsecRound};

#[derive(Debug)]
pub struct TurboDuration(Duration);

impl TurboDuration {
pub fn new(start_time: &DateTime<Local>, end_time: &DateTime<Local>) -> Self {
TurboDuration(
end_time
.trunc_subsecs(3)
.signed_duration_since(start_time.trunc_subsecs(3)),
)
}
}

impl From<Duration> for TurboDuration {
fn from(duration: Duration) -> Self {
Self(duration)
}
}

impl fmt::Display for TurboDuration {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
let duration = &self.0;

// If duration is less than a second, we print milliseconds
if duration.num_seconds() <= 0 {
let milliseconds = duration.num_milliseconds() - duration.num_seconds() * 1000;
return write!(f, "{}ms", milliseconds);
}

if duration.num_hours() > 0 {
write!(f, "{}h", duration.num_hours(),)?;
}

if duration.num_minutes() > 0 {
let minutes = duration.num_minutes() - duration.num_hours() * 60;
write!(f, "{}m", minutes)?;
}

if duration.num_seconds() > 0 {
let seconds_in_ms = duration.num_milliseconds() - duration.num_minutes() * 60 * 1000;
let seconds = (seconds_in_ms as f64) / 1000.0;
write!(f, "{}s", seconds)?;
}

Ok(())
}
}

#[cfg(test)]
mod test {
use pretty_assertions::assert_eq;
use test_case::test_case;

use super::*;

#[test_case(TurboDuration::from(Duration::milliseconds(120)), "120ms")]
#[test_case(TurboDuration::from(Duration::milliseconds(1500)), "1.5s")]
#[test_case(TurboDuration::from(Duration::milliseconds(1234)), "1.234s")]
#[test_case(TurboDuration::from(Duration::seconds(90)), "1m30s")]
fn duration_formatting(duration: TurboDuration, expected: &str) {
assert_eq!(duration.to_string(), expected);
}
}
53 changes: 4 additions & 49 deletions crates/turborepo-lib/src/run/summary/execution.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use std::{fmt, fmt::Formatter};
use std::fmt;

use chrono::{DateTime, Duration, Local, SubsecRound};
use chrono::{DateTime, Local};
use serde::Serialize;
use tokio::sync::mpsc;
use turbopath::{AbsoluteSystemPathBuf, AnchoredSystemPath};
use turborepo_ui::{color, cprintln, BOLD, BOLD_GREEN, BOLD_RED, MAGENTA, UI, YELLOW};

use super::TurboDuration;
use crate::run::{summary::task::TaskSummary, task_id::TaskId};

// Just used to make changing the type that gets passed to the state management
Expand Down Expand Up @@ -44,53 +45,6 @@ pub struct ExecutionSummary<'a> {
pub(crate) exit_code: i32,
}

#[derive(Debug)]
struct TurboDuration(Duration);

impl TurboDuration {
pub fn new(start_time: &DateTime<Local>, end_time: &DateTime<Local>) -> Self {
TurboDuration(
end_time
.trunc_subsecs(3)
.signed_duration_since(start_time.trunc_subsecs(3)),
)
}
}

impl From<Duration> for TurboDuration {
fn from(duration: Duration) -> Self {
Self(duration)
}
}

impl fmt::Display for TurboDuration {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
let duration = &self.0;

// If duration is less than a second, we print milliseconds
if duration.num_seconds() <= 0 {
let milliseconds = duration.num_milliseconds() - duration.num_seconds() * 1000;
return write!(f, "{}ms", milliseconds);
}

if duration.num_hours() > 0 {
write!(f, "{}h", duration.num_hours(),)?;
}

if duration.num_minutes() > 0 {
let minutes = duration.num_minutes() - duration.num_hours() * 60;
write!(f, "{}m", minutes)?;
}

if duration.num_seconds() > 0 {
let seconds = duration.num_seconds() - duration.num_minutes() * 60;
write!(f, "{}s", seconds)?;
}

Ok(())
}
}

impl<'a> ExecutionSummary<'a> {
pub fn new(
command: String,
Expand Down Expand Up @@ -470,6 +424,7 @@ impl TaskTracker<chrono::DateTime<Local>> {

#[cfg(test)]
mod test {
use chrono::Duration;
use serde_json::json;
use test_case::test_case;

Expand Down
2 changes: 2 additions & 0 deletions crates/turborepo-lib/src/run/summary/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//! displaying it We have this split because the tracker representation is not
//! exactly what we want to display to the user.
#[allow(dead_code)]
mod duration;
mod execution;
mod global_hash;
mod scm;
Expand All @@ -13,6 +14,7 @@ mod task_factory;
use std::{collections::HashSet, io, io::Write};

use chrono::{DateTime, Local};
pub use duration::TurboDuration;
pub use execution::{TaskExecutionSummary, TaskTracker};
pub use global_hash::GlobalHashSummary;
use itertools::Itertools;
Expand Down