highlight node id

Author: joostjager

lightning/src/ln/payment_tests.rs

@@ -48,7 +48,7 @@ use crate::types::string::UntrustedString;
 use crate::util::errors::APIError;
 use crate::util::logger::TracingToLogger;
 use crate::util::ser::Writeable;
-use crate::util::test_utils::{self, TestTracerLayer};
+use crate::util::test_utils::{self, HighlightLayer, TestTracerLayer};
 
 use tracing_subscriber::fmt::format::FmtSpan;
 use tracing_subscriber::{fmt, prelude::*, Registry};
@@ -438,7 +438,7 @@ fn test_keysend_payments() {
 		.with_ansi(true)
 		.with_targets(true)
 		.with_deferred_spans(true);
-	let subscriber = Registry::default().with(layer);
+	let subscriber = Registry::default().with(HighlightLayer).with(layer);
 	tracing::subscriber::set_global_default(subscriber).unwrap();
 
 	// tracing_subscriber::fmt()

lightning/src/util/test_utils.rs

@@ -82,7 +82,7 @@ use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};
 use lightning_invoice::RawBolt11Invoice;
 use tracing::field::{Field, Visit};
 use tracing::span::{Attributes, Id};
-use tracing::{Event, Metadata, Subscriber};
+use tracing::{event, Event, Metadata, Subscriber};
 use tracing_subscriber::registry::LookupSpan;
 use tracing_subscriber::{layer, Layer};
 
@@ -1736,6 +1736,45 @@ impl Logger for TestLogger {
 	}
 }
 
+struct FieldVisitor {
+	name: Option<String>,
+}
+
+impl Visit for FieldVisitor {
+	fn record_str(&mut self, field: &tracing::field::Field, value: &str) {
+		if field.name() == "name" {
+			self.name = Some(value.to_string());
+		}
+	}
+
+	fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {}
+}
+
+pub struct HighlightLayer;
+
+impl<S> Layer<S> for HighlightLayer
+where
+	S: Subscriber + for<'a> LookupSpan<'a>,
+{
+	fn on_new_span(
+		&self, attrs: &tracing::span::Attributes<'_>, id: &Id,
+		ctx: tracing_subscriber::layer::Context<'_, S>,
+	) {
+		let span = ctx.span(id).unwrap();
+		let meta = span.metadata();
+		if meta.name() == "node" {
+			let mut visitor = FieldVisitor { name: None };
+			attrs.record(&mut visitor);
+
+			event!(
+				tracing::Level::INFO,
+				"NODE \x1b[1;34;47m {} \x1b[0m",
+				visitor.name.unwrap_or_default()
+			);
+		}
+	}
+}
+
 pub struct TestTracerLayer;
 
 #[derive(Debug, Default)]