move clockabilly to an external crate

Cargo.toml

@@ -1,7 +1,6 @@
 [workspace]
 resolver = "2"
 members = [
-    "clockabilly",
     "sk-api",
     "sk-cli",
     "sk-core",
@@ -26,16 +25,14 @@ debug = false
 sk-api.path = "sk-api"
 sk-core.path = "sk-core"
 sk-store.path = "sk-store"
-testutils.path = "testutils"
-clockabilly.path = "clockabilly"
 
 anyhow = { version = "1.0.75", features = ["backtrace"] }
 async-recursion = "1.0.5"
 async-trait = "0.1.80"
 bytes = "1.5.0"
-chrono = "0.4.26"
 clap = { version = "4.3.21", features = ["cargo", "derive", "string"] }
 clap_complete = "4.5.6"
+clockabilly = "0.1.0"
 dirs = "5.0.1"
 either = "1.12.0"
 futures = "0.3.28"

sk-core/src/k8s/lease.rs

@@ -42,7 +42,7 @@ pub async fn try_claim_lease(
     metaroot: &SimulationRoot,
     lease_ns: &str,
 ) -> anyhow::Result<LeaseState> {
-    try_claim_lease_with_clock(client, sim, metaroot, lease_ns, UtcClock::new()).await
+    try_claim_lease_with_clock(client, sim, metaroot, lease_ns, UtcClock::boxed()).await
 }
 
 pub(super) async fn try_claim_lease_with_clock(
@@ -103,7 +103,7 @@ pub async fn try_update_lease(
     lease_ns: &str,
     lease_duration: i64,
 ) -> EmptyResult {
-    try_update_lease_with_clock(client, sim, lease_ns, lease_duration, UtcClock::new()).await
+    try_update_lease_with_clock(client, sim, lease_ns, lease_duration, UtcClock::boxed()).await
 }
 
 pub(super) async fn try_update_lease_with_clock(

sk-core/src/k8s/tests/lease_test.rs

@@ -31,7 +31,7 @@ fn lease_other_holder() -> coordinationv1::Lease {
 #[traced_test]
 #[tokio::test]
 async fn test_try_claim_lease_with_clock_already_owned_by_us(test_sim: Simulation, test_sim_root: SimulationRoot) {
-    let clock = MockUtcClock::new(NOW);
+    let clock = MockUtcClock::boxed(NOW);
     let (mut fake_apiserver, client) = make_fake_apiserver();
     let lease_obj = build_lease(&test_sim, &test_sim_root, TEST_CTRL_NAMESPACE, clock.now());
     fake_apiserver
@@ -52,7 +52,7 @@ async fn test_try_claim_lease_with_clock_already_owned_by_us(test_sim: Simulatio
 #[traced_test]
 #[tokio::test]
 async fn test_try_claim_lease_with_clock_other_lease_unowned(test_sim: Simulation, test_sim_root: SimulationRoot) {
-    let clock = MockUtcClock::new(NOW);
+    let clock = MockUtcClock::boxed(NOW);
     let (mut fake_apiserver, client) = make_fake_apiserver();
     let other_lease: coordinationv1::Lease = Default::default();
     let lease_obj = build_lease(&test_sim, &test_sim_root, TEST_CTRL_NAMESPACE, clock.now());
@@ -83,7 +83,7 @@ async fn test_try_claim_lease_with_clock_already_owned_by_other(
     test_sim_root: SimulationRoot,
     lease_other_holder: coordinationv1::Lease,
 ) {
-    let clock = MockUtcClock::new(NOW);
+    let clock = MockUtcClock::boxed(NOW);
     let (mut fake_apiserver, client) = make_fake_apiserver();
     fake_apiserver
         .handle(move |when, then| {
@@ -103,7 +103,7 @@ async fn test_try_claim_lease_with_clock_already_owned_by_other(
 #[traced_test]
 #[tokio::test]
 async fn test_try_claim_lease_with_clock(test_sim: Simulation, test_sim_root: SimulationRoot) {
-    let clock = MockUtcClock::new(NOW);
+    let clock = MockUtcClock::boxed(NOW);
     let (mut fake_apiserver, client) = make_fake_apiserver();
     let lease_obj = build_lease(&test_sim, &test_sim_root, TEST_CTRL_NAMESPACE, clock.now());
     fake_apiserver
@@ -125,7 +125,7 @@ async fn test_try_claim_lease_with_clock(test_sim: Simulation, test_sim_root: Si
 #[traced_test]
 #[tokio::test]
 async fn test_try_update_lease_with_clock_no_lease_found(test_sim: Simulation) {
-    let clock = MockUtcClock::new(NOW);
+    let clock = MockUtcClock::boxed(NOW);
     let (mut fake_apiserver, client) = make_fake_apiserver();
     fake_apiserver
         .handle_not_found(format!("/apis/coordination.k8s.io/v1/namespaces/{TEST_LEASE_NS}/leases/{SK_LEASE_NAME}"))
@@ -142,7 +142,7 @@ async fn test_try_update_lease_with_clock_no_lease_found(test_sim: Simulation) {
 #[traced_test]
 #[tokio::test]
 async fn test_try_update_lease_with_clock_wrong_owner(test_sim: Simulation, lease_other_holder: coordinationv1::Lease) {
-    let clock = MockUtcClock::new(NOW);
+    let clock = MockUtcClock::boxed(NOW);
     let (mut fake_apiserver, client) = make_fake_apiserver();
     fake_apiserver
         .handle(move |when, then| {
@@ -163,7 +163,7 @@ async fn test_try_update_lease_with_clock_wrong_owner(test_sim: Simulation, leas
 #[traced_test]
 #[tokio::test]
 async fn test_try_update_lease_with_clock(test_sim: Simulation, test_sim_root: SimulationRoot) {
-    let mut clock = MockUtcClock::new(NOW);
+    let mut clock = MockUtcClock::boxed(NOW);
     let (mut fake_apiserver, client) = make_fake_apiserver();
     let lease_obj = build_lease(&test_sim, &test_sim_root, TEST_CTRL_NAMESPACE, clock.now());
     let mut patched_lease_obj = build_lease(&test_sim, &test_sim_root, TEST_CTRL_NAMESPACE, clock.now());

sk-driver/src/runner.rs

@@ -169,7 +169,7 @@ pub async fn run_trace(ctx: DriverContext, client: kube::Client) -> EmptyResult
         }
     }
 
-    let clock = UtcClock::new();
+    let clock = UtcClock::boxed();
     let timeout = clock.now_ts() + DRIVER_CLEANUP_TIMEOUT_SECONDS;
     cleanup_trace(&ctx, roots_api, clock, timeout).await
 }

sk-driver/src/tests/runner_test.rs

@@ -30,7 +30,7 @@ async fn test_cleanup_trace_error() {
     let store = Arc::new(TraceStore::new(Default::default()));
     let ctx = build_driver_context(cache, store);
 
-    let clock = MockUtcClock::new(0);
+    let clock = MockUtcClock::boxed(0);
 
     fake_apiserver
         .handle(|when, then| {
@@ -58,7 +58,7 @@ async fn test_cleanup_trace_timeout() {
     let store = Arc::new(TraceStore::new(Default::default()));
     let ctx = build_driver_context(cache, store);
 
-    let clock = MockUtcClock::new(DRIVER_CLEANUP_TIMEOUT_SECONDS + 10);
+    let clock = MockUtcClock::boxed(DRIVER_CLEANUP_TIMEOUT_SECONDS + 10);
 
     let res = cleanup_trace(&ctx, roots_api, clock, DRIVER_CLEANUP_TIMEOUT_SECONDS)
         .await
@@ -79,7 +79,7 @@ async fn test_cleanup_trace() {
     let store = Arc::new(TraceStore::new(Default::default()));
     let ctx = build_driver_context(cache, store);
 
-    let clock = MockUtcClock::new(0);
+    let clock = MockUtcClock::boxed(0);
 
     fake_apiserver
         .handle(|when, then| {

sk-store/src/tests/import_export_test.rs

@@ -128,7 +128,7 @@ fn test_stream(clock: MockUtcClock) -> KubeObjectStream {
 #[traced_test]
 #[tokio::test]
 async fn itest_export(#[case] duration: Option<String>) {
-    let clock = MockUtcClock::new(0);
+    let clock = MockUtcClock::boxed(0);
 
     // Since we're just generating the results from the stream and not actually querying any
     // Kubernetes internals or whatever, the TracerConfig is empty.

sk-store/src/watchers/dyn_obj_watcher.rs

@@ -75,7 +75,7 @@ impl DynObjWatcher {
 
         Ok((
             DynObjWatcher {
-                clock: UtcClock::new(),
+                clock: UtcClock::boxed(),
                 obj_stream: select_all(apis),
                 store,
 

sk-store/src/watchers/pod_watcher.rs

@@ -87,7 +87,7 @@ impl PodWatcher {
                 owners_cache: OwnersCache::new(apiset),
                 store,
 
-                clock: UtcClock::new(),
+                clock: UtcClock::boxed(),
                 is_ready: false,
                 ready_tx: tx,
             },

sk-store/src/watchers/tests/pod_watcher_test.rs

@@ -27,7 +27,7 @@ const END_TS: i64 = 5678;
 
 #[fixture]
 fn clock() -> Box<MockUtcClock> {
-    MockUtcClock::new(START_TS)
+    MockUtcClock::boxed(START_TS)
 }
 
 fn make_pod_watcher(