inspan guard

Author: joostjager

lightning-macros/src/lib.rs

@@ -417,7 +417,7 @@ pub fn auto_span_methods(_attr: TokenStream, item: TokenStream) -> TokenStream {
 				let block = &method.block;
 				let method_name = method.sig.ident.to_string();
 				method.block = syn::parse_quote!({
-					let _node_span = enter_instance_span(self.node_id.clone()).entered();
+					let _node_span = enter_instance_span(self.node_id.clone()).map(|s|(s.entered(), InSpanGuard{}));
 					let _method_span = tracing::span!(tracing::Level::INFO, #method_name).entered();
 					#block
 				});

lightning/src/ln/channelmanager.rs

@@ -1893,9 +1893,30 @@ where
 thread_local! {
 	static CURRENT_INSTANCE: RefCell<Option<String>> = RefCell::new(None);
 	static CURRENT_SPAN: RefCell<Option<Span>> = RefCell::new(None);
+	static IN_SPAN: RefCell<bool> = RefCell::new(false);
 }
 
-fn enter_instance_span(name: String) -> tracing::span::Span {
+struct InSpanGuard {}
+
+impl Drop for InSpanGuard {
+	fn drop(&mut self) {
+		IN_SPAN.with(|in_span| {
+			*in_span.borrow_mut() = false;
+		});
+	}
+}
+
+fn enter_instance_span(name: String) -> Option<tracing::span::Span> {
+	// return None is IN_SPAN
+	if IN_SPAN.with(|in_span| *in_span.borrow()) {
+		return None;
+	}
+
+	// set IN_SPAN to true
+	IN_SPAN.with(|in_span| {
+		*in_span.borrow_mut() = true;
+	});
+
 	let mut span_to_enter: Option<Span> = None;
 
 	CURRENT_INSTANCE.with(|current_name| {
@@ -1917,7 +1938,7 @@ fn enter_instance_span(name: String) -> tracing::span::Span {
 		}
 	});
 
-	span_to_enter.unwrap()
+	span_to_enter
 }
 
 /// A lightning node's channel state machine and payment management logic, which facilitates

lightning/src/ln/payment_tests.rs

@@ -434,12 +434,10 @@ fn mpp_receive_timeout() {
 
 #[test]
 fn test_keysend_payments() {
-	let layer = HierarchicalLayer::new(5) // indent by 2 spaces
+	let layer = HierarchicalLayer::new(3) // indent by 2 spaces
 		.with_ansi(true)
 		.with_targets(true)
 		.with_deferred_spans(true);
-	//.with_indent_lines(true);
-
 	let subscriber = Registry::default().with(layer);
 	tracing::subscriber::set_global_default(subscriber).unwrap();
 
@@ -449,11 +447,11 @@ fn test_keysend_payments() {
 	// 	.init();
 
 	do_test_keysend_payments(false);
-	do_test_keysend_payments(true);
+	// do_test_keysend_payments(true);
 }
 
 fn do_test_keysend_payments(public_node: bool) {
-	let span = tracing::info_span!("node setup");
+	let span = tracing::info_span!("node setup").entered();
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);