Revert Makefile changes and re-arrange imports

jimmygchen · jimmygchen · commit 433010d2e3df · 2025-08-13T17:24:46.000+10:00
diff --git a/Makefile b/Makefile
@@ -143,7 +143,7 @@ build-release-tarballs:
 # test vectors.
 test-release:
 	cargo test --workspace --release --features "$(TEST_FEATURES)" \
- 		--exclude ef_tests --exclude beacon_chain --exclude slasher --exclude network
+ 		--exclude ef_tests --exclude beacon_chain --exclude slasher --exclude network \
 		--exclude http_api
 
 # Runs the full workspace tests in **release**, without downloading any additional
@@ -279,7 +279,7 @@ lint:
 
 # Lints the code using Clippy and automatically fix some simple compiler warnings.
 lint-fix:
-	EXTRA_CLIPPY_OPTS="--fix --allow-staged --allow-dirty" $(MAKE) lint
+	EXTRA_CLIPPY_OPTS="--fix --allow-staged --allow-dirty" $(MAKE) lint-full
 
 # Also run the lints on the optimized-only tests
 lint-full:
diff --git a/beacon_node/lighthouse_tracing/src/lib.rs b/beacon_node/lighthouse_tracing/src/lib.rs
@@ -1,5 +1,9 @@
 use tracing::Subscriber;
 
+use std::collections::HashSet;
+use tracing::span::Id;
+use tracing_subscriber::Layer;
+
 /// DA checker spans
 pub const SPAN_PENDING_COMPONENTS: &str = "pending_components";
 /// Gossip methods root spans
@@ -26,7 +30,9 @@ pub const SPAN_HANDLE_LIGHT_CLIENT_OPTIMISTIC_UPDATE: &str =
     "handle_light_client_optimistic_update";
 pub const SPAN_HANDLE_LIGHT_CLIENT_FINALITY_UPDATE: &str = "handle_light_client_finality_update";
 
-// All allowed root span names
+// Only allowed root spans and its descendants are exported to the tracing backend, so that we don't
+// get a lot of noise from code paths that are not instrumented.
+// When a new root span is added, it should be added to this list.
 pub const LH_BN_ROOT_SPAN_NAMES: &[&str] = &[
     SPAN_PENDING_COMPONENTS,
     SPAN_PROCESS_GOSSIP_DATA_COLUMN,
@@ -50,10 +56,6 @@ pub const LH_BN_ROOT_SPAN_NAMES: &[&str] = &[
     SPAN_HANDLE_LIGHT_CLIENT_FINALITY_UPDATE,
 ];
 
-use std::collections::HashSet;
-use tracing::span::Id;
-use tracing_subscriber::Layer;
-
 /// A filtering layer that wraps another layer and only forwards spans from allowed root spans and their descendants
 pub struct AllowedRootSpanLayer<L> {
     inner: L,
