Page MenuHomePhabricator
Files F3373446

D6388.id21659.diff
No OneTemporary
Actions

D6388.id21659.diff
View Options

diff --git a/services/backup/src/service/handlers/create_backup.rs b/services/backup/src/service/handlers/create_backup.rs
--- a/services/backup/src/service/handlers/create_backup.rs
+++ b/services/backup/src/service/handlers/create_backup.rs
@@ -103,7 +103,7 @@
error!("Failed to convert data_hash into string: {:?}", err);
Status::aborted("Unexpected error")
})?;
- tracing::Span::current().record("data_hash", &hash_str);
+ debug!("Received data hash: {}", &hash_str);
self.data_hash = Some(hash_str);
self.handle_internal().await
}
diff --git a/services/backup/src/service/handlers/send_log.rs b/services/backup/src/service/handlers/send_log.rs
--- a/services/backup/src/service/handlers/send_log.rs
+++ b/services/backup/src/service/handlers/send_log.rs
@@ -90,7 +90,7 @@
error!("Failed to convert data_hash into string: {:?}", err);
Status::aborted("Unexpected error")
})?;
- tracing::Span::current().record("log_hash", &hash_str);
+ debug!("Received log hash: {}", &hash_str);
self.log_hash = Some(hash_str);
self.handle_internal().await
}
diff --git a/services/backup/src/service/mod.rs b/services/backup/src/service/mod.rs
--- a/services/backup/src/service/mod.rs
+++ b/services/backup/src/service/mod.rs
@@ -56,7 +56,7 @@
>,
>;
- #[instrument(skip_all, fields(device_id, data_hash, backup_id, blob_holder))]
+ #[instrument(skip_all, fields(device_id, backup_id, blob_holder))]
async fn create_new_backup(
&self,
request: Request<tonic::Streaming<proto::CreateNewBackupRequest>>,
@@ -117,7 +117,7 @@
))
}
- #[instrument(skip_all, fields(backup_id, log_hash, log_id))]
+ #[instrument(skip_all, fields(backup_id, log_id))]
async fn send_log(
&self,
request: Request<tonic::Streaming<proto::SendLogRequest>>,
diff --git a/services/blob/src/service.rs b/services/blob/src/service.rs
--- a/services/blob/src/service.rs
+++ b/services/blob/src/service.rs
@@ -73,7 +73,7 @@
type PutStream =
Pin<Box<dyn Stream<Item = Result<blob::PutResponse, Status>> + Send>>;
- #[instrument(skip_all, fields(holder, blob_hash))]
+ #[instrument(skip_all, fields(holder))]
async fn put(
&self,
request: Request<tonic::Streaming<blob::PutRequest>>,
@@ -294,7 +294,7 @@
warn!("Blob hash already provided");
return Err(Status::invalid_argument("Blob hash already provided"));
}
- tracing::Span::current().record("blob_hash", &new_hash);
+ debug!("Blob hash: {}", new_hash);
self.blob_hash = Some(new_hash);
self.determine_action().await
}

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 9:44 AM (18 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2590067
Default Alt Text
D6388.id21659.diff (2 KB)

Event Timeline