Remove UsageCounter from ExportComponents (#40013)

GitOrigin-RevId: f62b6229c501db0c02cec3dd42cb8abd927f4d73

Author: goffrie

Cargo.lock

@@ -15,7 +15,6 @@ use database::{
     Database,
     UserFacingModel,
 };
-use events::usage::NoOpUsageEventLogger;
 use exports::ExportComponents;
 use keybroker::Identity;
 use maplit::btreeset;
@@ -31,7 +30,6 @@ use storage::{
     StorageExt as _,
 };
 use tokio::io::AsyncReadExt as _;
-use usage_tracking::UsageCounter;
 use value::{
     assert_obj,
     export::ValueFormat,
@@ -127,7 +125,6 @@ async fn test_export_components(rt: TestRuntime) -> anyhow::Result<()> {
             database: db.latest_database_snapshot()?,
             storage: storage.clone(),
             file_storage,
-            usage_tracking: UsageCounter::new(Arc::new(NoOpUsageEventLogger)),
             instance_name: "carnitas".to_string(),
         },
         ExportFormat::Zip {
@@ -190,7 +187,6 @@ async fn test_export_unmounted_components(rt: TestRuntime) -> anyhow::Result<()>
             database: db.latest_database_snapshot()?,
             storage: storage.clone(),
             file_storage,
-            usage_tracking: UsageCounter::new(Arc::new(NoOpUsageEventLogger)),
             instance_name: "carnitas".to_string(),
         },
         ExportFormat::Zip {

crates/application/src/exports/tests.rs

@@ -190,7 +190,6 @@ impl<RT: Runtime> ExportWorker<RT> {
                         database: database_snapshot,
                         storage: self.storage.clone(),
                         file_storage: self.file_storage.clone(),
-                        usage_tracking: self.usage_tracking.clone(),
                         instance_name: self.instance_name.clone(),
                     },
                     format,

crates/application/src/exports/worker.rs

@@ -53,7 +53,6 @@ common = { workspace = true, features = ["testing"] }
 convex_macro = { workspace = true }
 database = { workspace = true, features = ["testing"] }
 errors = { workspace = true, features = ["testing"] }
-events = { workspace = true }
 file_storage = { workspace = true }
 headers = { workspace = true }
 keybroker = { workspace = true, features = ["testing"] }
@@ -63,9 +62,7 @@ pretty_assertions = { workspace = true }
 runtime = { workspace = true }
 shape_inference = { workspace = true, features = ["testing"] }
 storage = { workspace = true, features = ["testing"] }
-usage_tracking = { workspace = true, features = [
-    "testing",
-] }
+usage_tracking = { workspace = true, features = ["testing"] }
 value = { workspace = true, features = ["testing"] }
 
 [lints]

crates/exports/Cargo.toml

@@ -65,10 +65,7 @@ use storage::{
 };
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
-use usage_tracking::{
-    FunctionUsageTracker,
-    UsageCounter,
-};
+use usage_tracking::FunctionUsageTracker;
 use value::{
     InternalId,
     TableNamespace,
@@ -98,7 +95,6 @@ pub struct ExportComponents<RT: Runtime> {
     pub database: DatabaseSnapshot<RT>,
     pub storage: Arc<dyn Storage>,
     pub file_storage: Arc<dyn Storage>,
-    pub usage_tracking: UsageCounter,
     pub instance_name: String,
 }
 

crates/exports/src/lib.rs

@@ -26,7 +26,6 @@ use database::{
     TableModel,
     UserFacingModel,
 };
-use events::usage::NoOpUsageEventLogger;
 use file_storage::{
     FileStorage,
     TransactionalFileStorage,
@@ -51,10 +50,7 @@ use storage::{
     StorageExt,
 };
 use tokio::io::AsyncReadExt;
-use usage_tracking::{
-    FunctionUsageTracker,
-    UsageCounter,
-};
+use usage_tracking::FunctionUsageTracker;
 use value::{
     assert_obj,
     export::ValueFormat,
@@ -85,7 +81,6 @@ async fn setup_export_test(rt: &TestRuntime) -> anyhow::Result<ExportFixtures> {
             database: db.latest_database_snapshot()?,
             storage,
             file_storage,
-            usage_tracking: UsageCounter::new(Arc::new(NoOpUsageEventLogger)),
             instance_name: "carnitas".to_string(),
         },
         db,