after rebase

Signed-off-by: discord9 <discord9@163.com>

src/datanode/src/heartbeat/handler/gc_worker.rs

@@ -102,10 +102,13 @@ impl InstructionHandler for GcRegionsHandler {
                             reports.push(report);
                         }
 
-                    // Merge reports
-                    let mut merged_report = GcReport::default();
-                    for report in reports {
-                        merged_report.merge(report);
+                        // Merge reports
+                        let mut merged_report = GcReport::default();
+                        for report in reports {
+                            merged_report.merge(report);
+                        }
+
+                        Ok(merged_report)
                     }
                     .instrument(common_telemetry::tracing::info_span!("gc_worker_run")),
                 ),

src/meta-srv/src/gc/scheduler.rs

@@ -189,6 +189,7 @@ impl GcScheduler {
                         common_telemetry::tracing::info_span!("meta_gc_tick", trigger = "manual");
                     match self
                         .handle_manual_gc(region_ids, full_file_listing, timeout)
+                        .instrument(span)
                         .await
                     {
                         Ok(report) => {