Much simpler clock control (#9133)

Author: isoos

app/lib/database/database.dart

@@ -14,7 +14,6 @@ import 'package:pub_dev/database/schema.dart';
 import 'package:pub_dev/service/secret/backend.dart';
 import 'package:pub_dev/shared/configuration.dart';
 import 'package:pub_dev/shared/env_config.dart';
-import 'package:pub_dev/task/clock_control.dart';
 import 'package:typed_sql/typed_sql.dart';
 
 final _random = Random.secure();
@@ -155,7 +154,7 @@ Future<(String, String?)> _startOrUseLocalPostgresInDocker() async {
     }
     // The socket file may be present sooner than the server is accepting connections.
     // This arbitrary wait is probably enough to have a working server at this point.
-    await clock.delayed(Duration(seconds: 2));
+    await Future.delayed(Duration(seconds: 2));
   }
   return (url, null);
 }

app/lib/package/api_export/api_exporter.dart

@@ -14,7 +14,6 @@ import 'package:pub_dev/scorecard/backend.dart';
 import 'package:pub_dev/service/security_advisories/backend.dart';
 import 'package:pub_dev/shared/exceptions.dart';
 import 'package:pub_dev/shared/parallel_foreach.dart';
-import 'package:pub_dev/task/clock_control.dart';
 
 import '../../search/backend.dart';
 import '../../shared/datastore.dart';
@@ -99,7 +98,7 @@ final class ApiExporter {
               st,
             );
             // Sleep 5 minutes to reduce risk of degenerate behavior
-            await clock.delayed(Duration(minutes: 5));
+            await Future.delayed(Duration(minutes: 5));
           }
         }
       } catch (e, st) {
@@ -355,10 +354,7 @@ final class ApiExporter {
       seen.removeWhere((_, updated) => updated.isBefore(since));
 
       // Wait until aborted or 10 minutes before scanning again!
-      await abort.future.timeoutWithClock(
-        Duration(minutes: 10),
-        onTimeout: () => null,
-      );
+      await abort.future.timeout(Duration(minutes: 10), onTimeout: () => null);
     }
   }
 

app/lib/search/backend.dart

@@ -20,7 +20,6 @@ import 'package:pana/src/dartdoc/pub_dartdoc_data.dart';
 import 'package:path/path.dart' as p;
 import 'package:pool/pool.dart';
 import 'package:pub_dev/shared/monitoring.dart';
-import 'package:pub_dev/task/clock_control.dart';
 import 'package:retry/retry.dart';
 
 import '../../publisher/backend.dart';
@@ -125,14 +124,14 @@ class SearchBackend {
         final elapsed = clock.now().difference(started);
         if (elapsed < Duration(hours: 1)) {
           _logger.warning('Waiting before rethrowing exception.', e, st);
-          await clock.delayed(Duration(hours: 1) - elapsed);
+          await Future.delayed(Duration(hours: 1) - elapsed);
         }
         // Throwing here will crash the VM and force the instance to restart.
         rethrow;
       }
 
       // Allow another instance to get the lock and build the index.
-      await clock.delayed(Duration(minutes: 1));
+      await Future.delayed(Duration(minutes: 1));
     }
   }
 
@@ -237,7 +236,7 @@ class SearchBackend {
         lastUploadedSnapshotTimestamp = snapshot.updated!;
       }
 
-      await clock.delayed(sleepDuration);
+      await Future.delayed(sleepDuration);
     }
     await pool.close();
   }

app/lib/shared/redis_cache.dart

@@ -8,15 +8,13 @@ import 'dart:math';
 
 import 'package:_pub_shared/data/download_counts_data.dart';
 import 'package:_pub_shared/data/package_api.dart' show VersionScore;
-import 'package:clock/clock.dart';
 import 'package:gcloud/service_scope.dart' as ss;
 import 'package:googleapis/youtube/v3.dart';
 import 'package:indexed_blob/indexed_blob.dart' show BlobIndex;
 import 'package:logging/logging.dart';
 import 'package:neat_cache/cache_provider.dart';
 import 'package:neat_cache/neat_cache.dart';
 import 'package:pub_dev/service/download_counts/download_counts.dart';
-import 'package:pub_dev/task/clock_control.dart';
 
 import '../../../service/async_queue/async_queue.dart';
 import '../../../service/security_advisories/models.dart';
@@ -632,7 +630,7 @@ extension EntryPurgeExt<T> on Entry<T> {
   Future purgeAndRepeat({int retries = 0, Duration? delay}) async {
     await purge(retries: retries);
     asyncQueue.addAsyncFn(() async {
-      await clock.delayed(delay ?? Duration.zero);
+      await Future.delayed(delay ?? Duration.zero);
       await purge();
     });
   }

app/lib/task/backend.dart

@@ -41,7 +41,6 @@ import 'package:pub_dev/shared/versions.dart'
 import 'package:pub_dev/shared/versions.dart'
     as shared_versions
     show runtimeVersion;
-import 'package:pub_dev/task/clock_control.dart';
 import 'package:pub_dev/task/cloudcompute/cloudcompute.dart';
 import 'package:pub_dev/task/global_lock.dart';
 import 'package:pub_dev/task/handlers.dart';
@@ -176,10 +175,7 @@ class TaskBackend {
                   return;
                 }
                 // Wait until aborted or [delay] before doing it again!
-                await aborted.future.timeoutWithClock(
-                  delay,
-                  onTimeout: () => null,
-                );
+                await aborted.future.timeout(delay, onTimeout: () => null);
               }
             }, abort: aborted);
           } catch (e, st) {
@@ -191,7 +187,7 @@ class TaskBackend {
               st,
             );
             // Sleep 5 minutes to reduce risk of degenerate behavior
-            await clock.delayed(Duration(minutes: 5));
+            await Future.delayed(Duration(minutes: 5));
           }
         }
       } catch (e, st) {