Make sinks a variant of collections

src/storage-client/src/controller.rs

@@ -28,7 +28,6 @@ use std::time::Duration;
 
 use async_trait::async_trait;
 use mz_cluster_client::client::ClusterReplicaLocation;
-use mz_cluster_client::metrics::WallclockLagMetrics;
 use mz_cluster_client::ReplicaId;
 use mz_persist_client::batch::ProtoBatch;
 use mz_persist_types::{Codec64, Opaque, ShardId};
@@ -723,27 +722,19 @@ pub struct ExportState<T: TimelyTimestamp> {
 
     /// Reported write frontier.
     pub write_frontier: Antichain<T>,
-
-    /// Maximum frontier wallclock lag since the last introspection update.
-    pub wallclock_lag_max: Duration,
-    /// Frontier wallclock lag metrics tracked for this collection.
-    pub wallclock_lag_metrics: WallclockLagMetrics,
 }
 
 impl<T: Timestamp> ExportState<T> {
     pub fn new(
         description: ExportDescription<T>,
         read_hold: ReadHold<T>,
         read_policy: ReadPolicy<T>,
-        wallclock_lag_metrics: WallclockLagMetrics,
     ) -> Self {
         Self {
             description,
             read_hold,
             read_policy,
             write_frontier: Antichain::from_elem(Timestamp::minimum()),
-            wallclock_lag_max: Default::default(),
-            wallclock_lag_metrics,
         }
     }