resolve conflict

polkadot/node/collation-generation/src/lib.rs

@@ -126,7 +126,7 @@ impl CollationGenerationSubsystem {
 				..
 			}))) => {
 				if let Err(err) = self.handle_new_activation(activated.map(|v| v.hash), ctx).await {
-					gum::warn!(target: LOG_TARGET, err = ?err, "failed to handle new activation");
+					sp_tracing::warn!(target: LOG_TARGET, err = ?err, "failed to handle new activation");
 				}
 
 				false
@@ -152,7 +152,7 @@ impl CollationGenerationSubsystem {
 				msg: CollationGenerationMessage::SubmitCollation(params),
 			}) => {
 				if let Err(err) = self.handle_submit_collation(params, ctx).await {
-					gum::error!(target: LOG_TARGET, ?err, "Failed to submit collation");
+					sp_tracing::error!(target: LOG_TARGET, ?err, "Failed to submit collation");
 				}
 
 				false
@@ -200,7 +200,7 @@ impl CollationGenerationSubsystem {
 		{
 			Some(v) => v,
 			None => {
-				gum::debug!(
+				sp_tracing::debug!(
 					target: LOG_TARGET,
 					relay_parent = ?relay_parent,
 					our_para = %config.para_id,
@@ -384,7 +384,7 @@ impl CollationGenerationSubsystem {
 					)
 					.await
 					{
-						gum::error!(
+						sp_tracing::error!(
 							target: LOG_TARGET,
 							"Failed to construct and distribute collation: {}",
 							err
@@ -555,7 +555,7 @@ async fn construct_and_distribute_receipt(
 		ccr.to_plain()
 	} else {
 		if commitments.core_selector().map_err(Error::CandidateReceiptCheck)?.is_some() {
-			gum::warn!(
+			sp_tracing::warn!(
 				target: LOG_TARGET,
 				?pov_hash,
 				?relay_parent,

polkadot/node/core/approval-voting/src/lib.rs

@@ -3354,7 +3354,7 @@ async fn launch_approval<
 
 	let candidate_hash = candidate.hash();
 	let para_id = candidate.descriptor.para_id();
-	gum::trace!(target: LOG_TARGET, ?candidate_hash, ?para_id, "Recovering data.");
+	sp_tracing::trace!(target: LOG_TARGET, ?candidate_hash, ?para_id, "Recovering data.");
 
 	let timer = metrics.time_recover_and_approve();
 	sender

polkadot/node/core/backing/src/lib.rs

@@ -1013,7 +1013,7 @@ async fn handle_active_leaves_update<Context>(
 			fresh_relay_parent
 		},
 		Some((leaf, Err(e))) => {
-			gum::debug!(
+			sp_tracing::debug!(
 				target: LOG_TARGET,
 				leaf_hash = ?leaf.hash,
 				err = ?e,
@@ -1166,7 +1166,7 @@ async fn construct_per_relay_parent_state<Context>(
 		per_session_cache.executor_params(session_index, parent, ctx.sender()).await;
 	let executor_params = try_runtime_api!(executor_params);
 
-	gum::debug!(target: LOG_TARGET, inject_core_index, ?parent, "New state");
+	sp_tracing::debug!(target: LOG_TARGET, inject_core_index, ?parent, "New state");
 
 	let (validator_groups, group_rotation_info) = try_runtime_api!(groups);
 
@@ -1615,7 +1615,7 @@ async fn import_statement<Context>(
 
 			match rx.await {
 				Err(oneshot::Canceled) => {
-					gum::warn!(
+					sp_tracing::warn!(
 						target: LOG_TARGET,
 						"Could not reach the Prospective Parachains subsystem."
 					);
@@ -1678,7 +1678,7 @@ async fn post_import_statement_actions<Context>(
 				rp_state.inject_core_index,
 			) {
 				let para_id = backed.candidate().descriptor.para_id();
-				gum::debug!(
+				sp_tracing::debug!(
 					target: LOG_TARGET,
 					candidate_hash = ?candidate_hash,
 					relay_parent = ?rp_state.parent,
@@ -1696,13 +1696,13 @@ async fn post_import_statement_actions<Context>(
 				// Notify statement distribution of backed candidate.
 				ctx.send_message(StatementDistributionMessage::Backed(candidate_hash)).await;
 			} else {
-				gum::debug!(target: LOG_TARGET, ?candidate_hash, "Cannot get BackedCandidate");
+				sp_tracing::debug!(target: LOG_TARGET, ?candidate_hash, "Cannot get BackedCandidate");
 			}
 		} else {
-			gum::debug!(target: LOG_TARGET, ?candidate_hash, "Candidate already known");
+			sp_tracing::debug!(target: LOG_TARGET, ?candidate_hash, "Candidate already known");
 		}
 	} else {
-		gum::debug!(target: LOG_TARGET, "No attested candidate");
+		sp_tracing::debug!(target: LOG_TARGET, "No attested candidate");
 	}
 
 	issue_new_misbehaviors(ctx, rp_state.parent, &mut rp_state.table);
@@ -2028,7 +2028,7 @@ async fn handle_second_message<Context>(
 	let relay_parent = candidate.descriptor().relay_parent();
 
 	if candidate.descriptor().persisted_validation_data_hash() != persisted_validation_data.hash() {
-		gum::warn!(
+		sp_tracing::warn!(
 			target: LOG_TARGET,
 			?candidate_hash,
 			"Candidate backing was asked to second candidate with wrong PVD",
@@ -2062,7 +2062,7 @@ async fn handle_second_message<Context>(
 
 	// Sanity check that candidate is from our assignment.
 	if !matches!(assigned_paras, Some(paras) if paras.contains(&candidate.descriptor().para_id())) {
-		gum::debug!(
+		sp_tracing::debug!(
 			target: LOG_TARGET,
 			our_assignment_core = ?rp_state.assigned_core,
 			our_assignment_paras = ?assigned_paras,

polkadot/node/core/candidate-validation/src/lib.rs

@@ -160,7 +160,7 @@ where
 	match util::runtime::fetch_claim_queue(sender, relay_parent).await {
 		Ok(maybe_cq) => maybe_cq,
 		Err(err) => {
-			gum::warn!(
+			sp_tracing::warn!(
 				target: LOG_TARGET,
 				?relay_parent,
 				?err,
@@ -564,7 +564,7 @@ async fn update_active_leaves<Sender>(
 {
 	let ancestors = get_block_ancestors(sender, update.activated.as_ref().map(|x| x.hash)).await;
 	if let Err(err) = validation_backend.update_active_leaves(update, ancestors).await {
-		gum::warn!(
+		sp_tracing::warn!(
 			target: LOG_TARGET,
 			?err,
 			"cannot update active leaves in validation backend",
@@ -580,7 +580,7 @@ where
 		Ok(ProspectiveParachainsMode::Enabled { allowed_ancestry_len, .. }) =>
 			Some(allowed_ancestry_len),
 		res => {
-			gum::warn!(target: LOG_TARGET, ?res, "async backing is disabled");
+			sp_tracing::warn!(target: LOG_TARGET, ?res, "async backing is disabled");
 			None
 		},
 	}
@@ -609,7 +609,7 @@ where
 	match rx.await {
 		Ok(Ok(x)) => x,
 		res => {
-			gum::warn!(target: LOG_TARGET, ?res, "cannot request ancestors");
+			sp_tracing::warn!(target: LOG_TARGET, ?res, "cannot request ancestors");
 			vec![]
 		},
 	}
@@ -753,7 +753,7 @@ async fn validate_candidate_exhaustive(
 	let relay_parent = candidate_receipt.descriptor.relay_parent();
 	let para_id = candidate_receipt.descriptor.para_id();
 
-	gum::debug!(
+	sp_tracing::debug!(
 		target: LOG_TARGET,
 		?validation_code_hash,
 		?para_id,
@@ -765,7 +765,7 @@ async fn validate_candidate_exhaustive(
 		(PvfExecKind::Backing(_) | PvfExecKind::BackingSystemParas(_), Some(session_index)) => {
 			let Some(expected_session_index) = maybe_expected_session_index else {
 				let error = "cannot fetch session index from the runtime";
-				gum::warn!(
+				sp_tracing::warn!(
 					target: LOG_TARGET,
 					?relay_parent,
 					error,
@@ -874,7 +874,7 @@ async fn validate_candidate_exhaustive(
 			Err(ValidationFailed(e.to_string()))
 		},
 		Err(e @ ValidationError::ExecutionDeadline) => {
-			gum::warn!(
+			sp_tracing::warn!(
 				target: LOG_TARGET,
 				?para_id,
 				?e,
@@ -884,7 +884,7 @@ async fn validate_candidate_exhaustive(
 		},
 		Ok(res) =>
 			if res.head_data.hash() != candidate_receipt.descriptor.para_head() {
-				gum::info!(target: LOG_TARGET, ?para_id, "Invalid candidate (para_head)");
+				sp_tracing::info!(target: LOG_TARGET, ?para_id, "Invalid candidate (para_head)");
 				Ok(ValidationResult::Invalid(InvalidCandidate::ParaHeadHashMismatch))
 			} else {
 				let committed_candidate_receipt = CommittedCandidateReceipt {
@@ -902,7 +902,7 @@ async fn validate_candidate_exhaustive(
 				if candidate_receipt.commitments_hash !=
 					committed_candidate_receipt.commitments.hash()
 				{
-					gum::info!(
+					sp_tracing::info!(
 						target: LOG_TARGET,
 						?para_id,
 						"Invalid candidate (commitments hash)"
@@ -923,7 +923,7 @@ async fn validate_candidate_exhaustive(
 						) => {
 							let Some(claim_queue) = maybe_claim_queue else {
 								let error = "cannot fetch the claim queue from the runtime";
-								gum::warn!(
+								sp_tracing::warn!(
 									target: LOG_TARGET,
 									?relay_parent,
 									error
@@ -935,7 +935,7 @@ async fn validate_candidate_exhaustive(
 							if let Err(err) = committed_candidate_receipt
 								.check_core_index(&transpose_claim_queue(claim_queue.0))
 							{
-								gum::warn!(
+								sp_tracing::warn!(
 									target: LOG_TARGET,
 									?err,
 									candidate_hash = ?candidate_receipt.hash(),

polkadot/node/core/prospective-parachains/src/lib.rs

@@ -539,7 +539,7 @@ async fn handle_introduce_seconded_candidate(
 				added.push(*relay_parent);
 			},
 			Err(FragmentChainError::CandidateAlreadyKnown) => {
-				gum::trace!(
+				sp_tracing::trace!(
 					target: LOG_TARGET,
 					?para,
 					?relay_parent,
@@ -550,7 +550,7 @@ async fn handle_introduce_seconded_candidate(
 				added.push(*relay_parent);
 			},
 			Err(err) => {
-				gum::trace!(
+				sp_tracing::trace!(
 					target: LOG_TARGET,
 					?para,
 					?relay_parent,
@@ -573,14 +573,14 @@ async fn handle_introduce_seconded_candidate(
 	}
 
 	if added.is_empty() {
-		gum::debug!(
+		sp_tracing::debug!(
 			target: LOG_TARGET,
 			para = ?para,
 			candidate = ?candidate_hash,
 			"Newly-seconded candidate cannot be kept under any relay parent",
 		);
 	} else {
-		gum::debug!(
+		sp_tracing::debug!(
 			target: LOG_TARGET,
 			?para,
 			"Added/Kept seconded candidate {:?} on relay parents: {:?}",
@@ -779,7 +779,7 @@ fn answer_hypothetical_membership_request(
 					membership.push(*active_leaf);
 				},
 				Err(err) => {
-					gum::trace!(
+					sp_tracing::trace!(
 						target: LOG_TARGET,
 						para = ?para_id,
 						leaf = ?active_leaf,
@@ -794,7 +794,7 @@ fn answer_hypothetical_membership_request(
 
 	for (candidate, membership) in &response {
 		if membership.is_empty() {
-			gum::debug!(
+			sp_tracing::debug!(
 				target: LOG_TARGET,
 				para = ?candidate.candidate_para(),
 				active_leaves = ?view.active_leaves,

polkadot/node/core/pvf/src/execute/queue.rs

@@ -341,7 +341,7 @@ impl Queue {
 
 				let Some(job) = queue.remove(index) else { continue };
 				let _ = job.result_tx.send(Err(ValidationError::ExecutionDeadline));
-				gum::warn!(
+				sp_tracing::warn!(
 					target: LOG_TARGET,
 					?priority,
 					exec_kind = ?job.exec_kind,
@@ -381,7 +381,7 @@ fn handle_to_queue(queue: &mut Queue, to_queue: ToQueue) {
 				result_tx,
 				exec_kind,
 			} = pending_execution_request;
-			gum::debug!(
+			sp_tracing::debug!(
 				target: LOG_TARGET,
 				validation_code_hash = ?artifact.id.code_hash,
 				"enqueueing an artifact for execution",
@@ -791,7 +791,7 @@ impl Unscheduled {
 	}
 
 	fn select_next_priority(&self) -> Priority {
-		gum::debug!(
+		sp_tracing::debug!(
 			target: LOG_TARGET,
 			unscheduled = ?self.unscheduled.iter().map(|(p, q)| (*p, q.len())).collect::<HashMap<Priority, usize>>(),
 			counter = ?self.counter,
@@ -874,7 +874,7 @@ impl Unscheduled {
 		if self.counter.values().sum::<usize>() >= Self::SCHEDULING_WINDOW_SIZE {
 			self.reset_counter();
 		}
-		gum::debug!(
+		sp_tracing::debug!(
 			target: LOG_TARGET,
 			?priority,
 			"Job marked as scheduled",

polkadot/node/network/availability-recovery/Cargo.toml

@@ -17,6 +17,7 @@ rand = { workspace = true, default-features = true }
 fatality = { workspace = true }
 thiserror = { workspace = true }
 async-trait = { workspace = true }
+sp-tracing = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
 
 polkadot-erasure-coding = { workspace = true, default-features = true }

polkadot/node/network/availability-recovery/src/error.rs

@@ -86,6 +86,6 @@ pub fn log_error(result: Result<()>) -> std::result::Result<(), FatalError> {
 impl JfyiError {
 	/// Log a `JfyiError`.
 	pub fn log(self) {
-		gum::warn!(target: LOG_TARGET, "{}", self);
+		sp_tracing::warn!(target: LOG_TARGET, "{}", self);
 	}
 }