Improved tracing (closes #180 closes #417 closes #376 closes #418 closes #517)

crates/common/src/config/server/listener.rs

@@ -34,15 +34,15 @@ use super::{
 impl Servers {
     pub fn parse(config: &mut Config) -> Self {
         // Parse ACME managers
-        let mut servers = Servers::default();
-
-        // Create sessionId generator
-        let id_generator = Arc::new(
-            config
-                .property::<u64>("cluster.node-id")
-                .map(SnowflakeIdGenerator::with_node_id)
-                .unwrap_or_default(),
-        );
+        let mut servers = Servers {
+            span_id_gen: Arc::new(
+                config
+                    .property::<u64>("cluster.node-id")
+                    .map(SnowflakeIdGenerator::with_node_id)
+                    .unwrap_or_default(),
+            ),
+            ..Default::default()
+        };
 
         // Parse servers
         for id in config
@@ -50,17 +50,12 @@ impl Servers {
             .map(|s| s.to_string())
             .collect::<Vec<_>>()
         {
-            servers.parse_server(config, id, id_generator.clone());
+            servers.parse_server(config, id);
         }
         servers
     }
 
-    fn parse_server(
-        &mut self,
-        config: &mut Config,
-        id_: String,
-        id_generator: Arc<SnowflakeIdGenerator>,
-    ) {
+    fn parse_server(&mut self, config: &mut Config, id_: String) {
         // Parse protocol
         let id = id_.as_str();
         let protocol =
@@ -197,6 +192,7 @@ impl Servers {
             proxy_networks.push(network);
         }
 
+        let span_id_gen = self.span_id_gen.clone();
         self.servers.push(Server {
             max_connections: config
                 .property_or_else(
@@ -209,7 +205,7 @@ impl Servers {
             protocol,
             listeners,
             proxy_networks,
-            id_generator,
+            span_id_gen,
         });
     }
 

crates/common/src/config/server/mod.rs

@@ -20,6 +20,7 @@ pub mod tls;
 pub struct Servers {
     pub servers: Vec<Server>,
     pub tcp_acceptors: AHashMap<String, TcpAcceptor>,
+    pub span_id_gen: Arc<SnowflakeIdGenerator>,
 }
 
 #[derive(Debug, Default)]
@@ -29,7 +30,7 @@ pub struct Server {
     pub listeners: Vec<Listener>,
     pub proxy_networks: Vec<IpAddrMask>,
     pub max_connections: u64,
-    pub id_generator: Arc<SnowflakeIdGenerator>,
+    pub span_id_gen: Arc<SnowflakeIdGenerator>,
 }
 
 #[derive(Debug)]