Add progress bars to syn2mas

Author: reivilibre

Cargo.lock

@@ -357,6 +357,10 @@ version = "0.1.41"
 [workspace.dependencies.tracing-subscriber]
 version = "0.3.19"
 
+# Progress bars
+[workspace.dependencies.tracing-indicatif]
+version = "0.3.9"
+
 # OpenTelemetry
 [workspace.dependencies.opentelemetry]
 version = "0.27.1"

Cargo.toml

@@ -48,6 +48,7 @@ tracing.workspace = true
 tracing-appender = "0.2.3"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tracing-opentelemetry.workspace = true
+tracing-indicatif.workspace = true
 opentelemetry.workspace = true
 opentelemetry-http.workspace = true
 opentelemetry-jaeger-propagator.workspace = true

crates/cli/Cargo.toml

@@ -216,33 +216,29 @@ impl Options {
 
                 // TODO how should we handle warnings at this stage?
 
-                let mut reader = SynapseReader::new(&mut syn_conn, true).await?;
+                let reader = SynapseReader::new(&mut syn_conn, true).await?;
                 let mut writer_mas_connections = Vec::with_capacity(NUM_WRITER_CONNECTIONS);
                 for _ in 0..NUM_WRITER_CONNECTIONS {
                     writer_mas_connections.push(database_connection_from_config(&config).await?);
                 }
-                let mut writer = MasWriter::new(mas_connection, writer_mas_connections).await?;
+                let writer = MasWriter::new(mas_connection, writer_mas_connections).await?;
 
                 let clock = SystemClock::default();
                 // TODO is this rng ok?
                 #[allow(clippy::disallowed_methods)]
                 let mut rng = thread_rng();
 
-                // TODO progress reporting
                 let mas_matrix = MatrixConfig::extract(figment)?;
                 syn2mas::migrate(
-                    &mut reader,
-                    &mut writer,
+                    reader,
+                    writer,
                     &mas_matrix.homeserver,
                     &clock,
                     &mut rng,
                     &provider_id_mappings,
                 )
                 .await?;
 
-                reader.finish().await?;
-                writer.finish().await?;
-
                 Ok(ExitCode::SUCCESS)
             }
         }

crates/cli/src/commands/syn2mas.rs

@@ -12,8 +12,13 @@ use anyhow::Context;
 use clap::Parser;
 use mas_config::{ConfigurationSection, TelemetryConfig};
 use sentry_tracing::EventFilter;
+use tracing_indicatif::{
+    filter::{hide_indicatif_span_fields, IndicatifFilter},
+    IndicatifLayer,
+};
 use tracing_subscriber::{
-    filter::LevelFilter, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer, Registry,
+    filter::LevelFilter, fmt::format::DefaultFields, layer::SubscriberExt, util::SubscriberInitExt,
+    EnvFilter, Layer, Registry,
 };
 
 mod app_state;
@@ -131,11 +136,17 @@ async fn try_main() -> anyhow::Result<ExitCode> {
             .with_filter(LevelFilter::INFO)
     });
 
+    // Set up progress bars, used in syn2mas for example
+    let progress_layer = IndicatifLayer::new()
+        .with_span_field_formatter(hide_indicatif_span_fields(DefaultFields::new()))
+        .with_filter(IndicatifFilter::new(false));
+
     let subscriber = Registry::default()
         .with(sentry_layer)
         .with(telemetry_layer)
         .with(filter_layer)
-        .with(fmt_layer);
+        .with(fmt_layer)
+        .with(progress_layer);
     subscriber
         .try_init()
         .context("could not initialize logging")?;

crates/cli/src/main.rs

@@ -21,6 +21,7 @@ sqlx.workspace = true
 chrono.workspace = true
 compact_str.workspace = true
 tracing.workspace = true
+tracing-indicatif.workspace = true
 futures-util = "0.3.30"
 
 rand.workspace = true