Fix telemetry span not entering properly & enter span in sc-cli

client/service/src/builder.rs

@@ -308,7 +308,7 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 
-	let telemetry_span = if config.telemetry_endpoints.is_some() {
+	let telemetry_span = if config.telemetry_endpoints().is_some() {
 		Some(TelemetrySpan::new())
 	} else {
 		None
@@ -383,7 +383,7 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 	TExecDisp: NativeExecutionDispatch + 'static,
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
-	let telemetry_span = if config.telemetry_endpoints.is_some() {
+	let telemetry_span = if config.telemetry_endpoints().is_some() {
 		Some(TelemetrySpan::new())
 	} else {
 		None

client/service/src/task_manager/mod.rs

@@ -91,10 +91,7 @@ impl SpawnTaskHandle {
 			metrics.tasks_ended.with_label_values(&[name, "finished"]).inc_by(0);
 		}
 
-		let telemetry_span = self.telemetry_span.clone();
 		let future = async move {
-			let _telemetry_entered = telemetry_span.as_ref().map(|x| x.enter());
-
 			if let Some(metrics) = metrics {
 				// Add some wrappers around `task`.
 				let task = {
@@ -127,7 +124,20 @@ impl SpawnTaskHandle {
 			}
 		};
 
-		let join_handle = self.executor.spawn(Box::pin(future.in_current_span()), task_type);
+		let future: Pin<Box<dyn Future<Output = ()> + Send>> =
+			if let Some(telemetry_span) = self.telemetry_span.clone() {
+				// this will preserve the telemetry span and by extension all of its parents as they
+				// are linked together upon creation
+				// this is used by sc_telemetry::layer::TelemetryLayer
+				Box::pin(future.instrument(telemetry_span.span()))
+			} else {
+				// this will preserve the current span (if any) and by extension all of its parents
+				// as they are linked together upon creation
+				// this is used by sc_tracing::logging::prefix_logs_with
+				Box::pin(future.in_current_span())
+			};
+
+		let join_handle = self.executor.spawn(future, task_type);
 		let mut task_notifier = self.task_notifier.clone();
 		self.executor.spawn(
 			Box::pin(async move {

client/telemetry/src/lib.rs

@@ -88,6 +88,11 @@ impl TelemetrySpan {
 	pub fn new() -> Self {
 		Self(tracing::info_span!(TELEMETRY_LOG_SPAN))
 	}
+
+	/// Return a clone of the underlying `tracing::Span` instance.
+	pub fn span(&self) -> tracing::Span {
+		self.0.clone()
+	}
 }
 
 /// Message sent when the connection (re-)establishes.