Follow up for: Use the umbrella crate for the parachain template #5993

prdoc/pr_7464.prdoc

@@ -0,0 +1,9 @@
+title: 'Enable importing sc-tracing macros through polkadot-sdk'
+doc:
+- audience: Node Dev
+  description: |-
+    This PR makes it possible to use the sc-tracing macros when they are imported through the umbrella crate.
+
+crates:
+- name: parachain-template-node
+  bump: minor

substrate/client/tracing/proc-macro/Cargo.toml

@@ -18,6 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
+frame-support-procedural-tools = { workspace = true, default-features = true }
 proc-macro-crate = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { features = ["proc-macro"], workspace = true }

substrate/client/tracing/proc-macro/src/lib.rs

@@ -15,11 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
 use proc_macro::TokenStream;
 use proc_macro2::Span;
-use proc_macro_crate::{crate_name, FoundCrate};
 use quote::quote;
-use syn::{Error, Expr, Ident, ItemFn};
+use syn::{Error, Expr, ItemFn};
 
 /// Add a log prefix to the function.
 ///
@@ -109,18 +109,17 @@ pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {
 	if arg.is_empty() {
 		return Error::new(
 			Span::call_site(),
-			"missing argument: name of the node. Example: sc_cli::prefix_logs_with(<expr>)",
+			"missing argument: prefix. Example: sc_cli::prefix_logs_with(<expr>)",
 		)
 		.to_compile_error()
-		.into()
+		.into();
 	}
 
 	let name = syn::parse_macro_input!(arg as Expr);
 
-	let crate_name = match crate_name("sc-tracing") {
-		Ok(FoundCrate::Itself) => Ident::new("sc_tracing", Span::call_site()),
-		Ok(FoundCrate::Name(crate_name)) => Ident::new(&crate_name, Span::call_site()),
-		Err(e) => return Error::new(Span::call_site(), e).to_compile_error().into(),
+	let crate_name = match generate_access_from_frame_or_crate("sc-tracing") {
+		Ok(ident) => ident,
+		Err(err) => return err.to_compile_error().into(),
 	};
 
 	let ItemFn { attrs, vis, sig, block } = item_fn;

templates/parachain/node/Cargo.toml

@@ -12,22 +12,19 @@ build = "build.rs"
 
 [dependencies]
 clap = { features = ["derive"], workspace = true }
-codec = { workspace = true, default-features = true }
 color-print = { workspace = true }
 docify = { workspace = true }
 futures = { workspace = true }
 jsonrpsee = { features = ["server"], workspace = true }
 log = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 
 polkadot-sdk = { workspace = true, features = ["node"] }
 
 parachain-template-runtime = { workspace = true }
 
 # Substrate
 prometheus-endpoint = { workspace = true, default-features = true }
-sc-tracing = { workspace = true, default-features = true }
 
 [build-dependencies]
 polkadot-sdk = { workspace = true, features = ["substrate-build-script-utils"] }