From 277e41f4b73d91bfb96383eab1f42c4e5f7a0ad9 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zenith.tech>
Date: Tue, 29 Mar 2022 13:48:26 +0300
Subject: [PATCH] Show s3 spans in logs and improve the log messages

---
 pageserver/src/remote_storage/storage_sync.rs | 8 ++++----
 zenith_utils/src/http/endpoint.rs             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pageserver/src/remote_storage/storage_sync.rs b/pageserver/src/remote_storage/storage_sync.rs
index cd6c40b46f..50a260491b 100644
--- a/pageserver/src/remote_storage/storage_sync.rs
+++ b/pageserver/src/remote_storage/storage_sync.rs
@@ -321,8 +321,8 @@ pub fn schedule_timeline_checkpoint_upload(
             tenant_id, timeline_id
         )
     } else {
-        warn!(
-            "Could not send an upload task for tenant {}, timeline {}: the sync queue is not initialized",
+        debug!(
+            "Upload task for tenant {}, timeline {} sent",
             tenant_id, timeline_id
         )
     }
@@ -455,7 +455,7 @@ fn storage_sync_loop<
                     max_concurrent_sync,
                     max_sync_errors,
                 )
-                .instrument(debug_span!("storage_sync_loop_step")) => step,
+                .instrument(info_span!("storage_sync_loop_step")) => step,
                 _ = thread_mgr::shutdown_watcher() => LoopStep::Shutdown,
             }
         });
@@ -528,7 +528,7 @@ async fn loop_step<
 
             let extra_step = match tokio::spawn(
                 process_task(conf, Arc::clone(&remote_assets), task, max_sync_errors).instrument(
-                    debug_span!("process_sync_task", sync_id = %sync_id, attempt, sync_name),
+                    info_span!("process_sync_task", sync_id = %sync_id, attempt, sync_name),
                 ),
             )
             .await
diff --git a/zenith_utils/src/http/endpoint.rs b/zenith_utils/src/http/endpoint.rs
index 0be08f45e1..7669f18cd2 100644
--- a/zenith_utils/src/http/endpoint.rs
+++ b/zenith_utils/src/http/endpoint.rs
@@ -160,7 +160,7 @@ pub fn serve_thread_main<S>(
 where
     S: Future<Output = ()> + Send + Sync,
 {
-    info!("Starting a http endpoint at {}", listener.local_addr()?);
+    info!("Starting an HTTP endpoint at {}", listener.local_addr()?);
 
     // Create a Service from the router above to handle incoming requests.
     let service = RouterService::new(router_builder.build().map_err(|err| anyhow!(err))?).unwrap();