Add progress bars to syn2mas

Author: reivilibre

Cargo.lock

@@ -365,6 +365,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.28.0"

Cargo.toml

@@ -51,6 +51,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

@@ -232,7 +232,6 @@ impl Options {
                 #[allow(clippy::disallowed_methods)]
                 let mut rng = thread_rng();
 
-                // TODO progress reporting
                 let mas_matrix = MatrixConfig::extract(figment)?;
                 syn2mas::migrate(
                     reader,

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::{
+    IndicatifLayer,
+    filter::{IndicatifFilter, hide_indicatif_span_fields},
+};
 use tracing_subscriber::{
-    EnvFilter, Layer, Registry, filter::LevelFilter, layer::SubscriberExt, util::SubscriberInitExt,
+    EnvFilter, Layer, Registry, filter::LevelFilter, fmt::format::DefaultFields,
+    layer::SubscriberExt, util::SubscriberInitExt,
 };
 
 mod app_state;
@@ -133,11 +138,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

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