Skip to content

Commit

Permalink
reverting last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
seemantaggarwal committed Feb 17, 2025
1 parent 4ad0f0a commit 2f95de5
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions substrate/client/tracing/proc-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,28 +117,19 @@ pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {

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()),

// Check if `sc-tracing` is coming from `polkadot-sdk`
Ok(FoundCrate::Name(crate_name)) if crate_name == "polkadot-sdk" => {
Ident::new("polkadot_sdk::sc_tracing", Span::call_site())
}

// If `sc-tracing` is used elsewhere, use the detected crate name
Ok(FoundCrate::Name(crate_name)) => Ident::new(&crate_name, Span::call_site()),

// If the crate is not found, return a compilation error
Err(e) => return Error::new(Span::call_site(), e).to_compile_error().into(),
let (sdk_crate, tracing_crate) = match crate_name("polkadot-sdk").or_else(|_| crate_name("sc-tracing")) {
Ok(FoundCrate::Itself) => (Ident::new("polkadot_sdk", Span::call_site()), Ident::new("tracing", Span::call_site())),
Ok(FoundCrate::Name(crate_name)) => (Ident::new(&crate_name, Span::call_site()), Ident::new("tracing", Span::call_site())),
Err(_) => (Ident::new("sc_tracing", Span::call_site()), Ident::new("sc_tracing", Span::call_site())),
};

let ItemFn { attrs, vis, sig, block } = item_fn;

(quote! {
#(#attrs)*
#vis #sig {
let span = #crate_name::tracing::info_span!(
#crate_name::logging::PREFIX_LOG_SPAN,
let span = #tracing_crate::info_span!(
#sdk_crate::logging::PREFIX_LOG_SPAN,
name = #name,
);
let _enter = span.enter();
Expand Down

0 comments on commit 2f95de5

Please sign in to comment.