tracing macro

Author: drahnr

Cargo.lock

@@ -15,27 +15,26 @@ version.workspace      = true
 workspace = true
 
 [dependencies]
-anyhow                   = { workspace = true }
-futures                  = { version = "0.3" }
-http                     = { workspace = true }
-mediatype                = { version = "0.21" }
-miden-node-proto         = { workspace = true }
-miden-node-proto-build   = { workspace = true }
-miden-node-tracing       = { workspace = true }
-miden-node-utils         = { workspace = true }
-miden-protocol           = { default-features = true, workspace = true }
-miden-tx                 = { default-features = true, workspace = true }
-semver                   = { version = "1.0" }
-thiserror                = { workspace = true }
-tokio                    = { features = ["macros", "net", "rt-multi-thread"], workspace = true }
-tokio-stream             = { features = ["net"], workspace = true }
-tonic                    = { default-features = true, features = ["tls-native-roots", "tls-ring"], workspace = true }
-tonic-reflection         = { workspace = true }
-tonic-web                = { version = "0.14" }
-tower                    = { workspace = true }
-tower-http               = { features = ["trace"], workspace = true }
-tracing                  = { workspace = true }
-url                      = { workspace = true }
+anyhow                 = { workspace = true }
+futures                = { version = "0.3" }
+http                   = { workspace = true }
+mediatype              = { version = "0.21" }
+miden-node-proto       = { workspace = true }
+miden-node-proto-build = { workspace = true }
+miden-node-utils       = { workspace = true }
+miden-protocol         = { default-features = true, workspace = true }
+miden-tx               = { default-features = true, workspace = true }
+semver                 = { version = "1.0" }
+thiserror              = { workspace = true }
+tokio                  = { features = ["macros", "net", "rt-multi-thread"], workspace = true }
+tokio-stream           = { features = ["net"], workspace = true }
+tonic                  = { default-features = true, features = ["tls-native-roots", "tls-ring"], workspace = true }
+tonic-reflection       = { workspace = true }
+tonic-web              = { version = "0.14" }
+tower                  = { workspace = true }
+tower-http             = { features = ["trace"], workspace = true }
+tracing                = { workspace = true }
+url                    = { workspace = true }
 
 [dev-dependencies]
 miden-air        = { features = ["testing"], workspace = true }

crates/rpc/Cargo.toml

@@ -15,20 +15,20 @@ version.workspace      = true
 workspace = true
 
 [dependencies]
-anyhow                  = { workspace = true }
-deadpool                = { default-features = false, features = ["managed", "rt_tokio_1"], version = "0.12" }
-deadpool-diesel         = { features = ["sqlite"], version = "0.6" }
-deadpool-sync           = { version = "0.1" }
-diesel                  = { features = ["numeric", "sqlite"], version = "2.3" }
-diesel_migrations       = { features = ["sqlite"], version = "2.3" }
-fs-err                  = { workspace = true }
-hex                     = { version = "0.4" }
-indexmap                = { workspace = true }
-miden-node-proto        = { workspace = true }
-miden-node-proto-build  = { features = ["internal"], workspace = true }
-miden-node-tracing      = { workspace = true }
-miden-node-utils        = { workspace = true }
-miden-standards         = { workspace = true }
+anyhow                 = { workspace = true }
+deadpool               = { default-features = false, features = ["managed", "rt_tokio_1"], version = "0.12" }
+deadpool-diesel        = { features = ["sqlite"], version = "0.6" }
+deadpool-sync          = { version = "0.1" }
+diesel                 = { features = ["numeric", "sqlite"], version = "2.3" }
+diesel_migrations      = { features = ["sqlite"], version = "2.3" }
+fs-err                 = { workspace = true }
+hex                    = { version = "0.4" }
+indexmap               = { workspace = true }
+miden-node-proto       = { workspace = true }
+miden-node-proto-build = { features = ["internal"], workspace = true }
+miden-node-tracing     = { workspace = true }
+miden-node-utils       = { workspace = true }
+miden-standards        = { workspace = true }
 # TODO remove `testing` from `miden-protocol`, required for `BlockProof::new_dummy`
 miden-protocol    = { features = ["std", "testing"], workspace = true }
 pretty_assertions = { workspace = true }

crates/store/Cargo.toml

@@ -20,4 +20,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0"
 quote       = "1.0"
-syn         = { features = ["full", "extra-traits", "parsing"], version = "2.0" }
+syn         = { features = ["extra-traits", "full", "parsing"], version = "2.0" }

crates/tracing-macro/Cargo.toml

@@ -75,7 +75,7 @@ pub fn instrument_with_err_report(attr: TokenStream, item: TokenStream) -> Token
     };
 
     if has_err && returns_result {
-        generate_with_error_reporting(attr2, input).into()
+        generate_with_error_reporting(&attr2, input).into()
     } else {
         // Just delegate to standard tracing::instrument
         let ItemFn { attrs, vis, sig, block } = input;
@@ -89,12 +89,12 @@ pub fn instrument_with_err_report(attr: TokenStream, item: TokenStream) -> Token
     }
 }
 
-fn generate_with_error_reporting(attr: TokenStream2, input: ItemFn) -> TokenStream2 {
+fn generate_with_error_reporting(attr: &TokenStream2, input: ItemFn) -> TokenStream2 {
     let ItemFn { attrs, vis, sig, block } = input;
 
     // Remove 'err' from the attributes we pass to tracing::instrument
     // since we handle error reporting ourselves
-    let tracing_attr = remove_err_from_attr(&attr);
+    let tracing_attr = remove_err_from_attr(attr);
 
     // Get the return type for type annotation
     let result_type = match &sig.output {

crates/tracing-macro/src/lib.rs

@@ -17,6 +17,5 @@ workspace = true
 [dependencies]
 miden-node-tracing-macro = { workspace = true }
 miden-node-utils         = { workspace = true }
-tracing                  = { workspace = true }
-tracing-opentelemetry    = { version = "0.32" }
 opentelemetry            = { version = "0.31" }
+tracing                  = { workspace = true }