Tracing dm

Cargo.toml

@@ -30,8 +30,17 @@ exclude = [
 ]
 
 [patch.crates-io]
-#lib3h = "=0.0.38"
-#lib3h_protocol = "=0.0.38"
-#lib3h_crypto_api = "=0.0.38"
-#lib3h_sodium = "=0.0.38"
-#lib3h_zombie_actor = "=0.0.38"
+lib3h = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" }
+lib3h_protocol = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" }
+lib3h_crypto_api = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" }
+lib3h_sodium = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" }
+lib3h_zombie_actor = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" }
+#lib3h = "=0.0.37"
+#lib3h_protocol = "=0.0.37"
+#lib3h_crypto_api = "=0.0.37"
+#lib3h_sodium = "=0.0.37"
+#lib3h_zombie_actor = "=0.0.37"
+
+#holochain_tracing = { path = "../holochain-tracing/crates/tracing" }
+#holochain_tracing_macros = { path = "../holochain-tracing/crates/tracing_macros" }
+

crates/cli/Cargo.toml

@@ -15,8 +15,8 @@ holochain_conductor_lib = { version = "=0.0.43-alpha3", path = "../conductor_lib
 holochain_net = { version = "=0.0.43-alpha3", path = "../net" }
 holochain_dpki = { version = "=0.0.43-alpha3", path = "../dpki" }
 holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" }
-holochain_tracing = "=0.0.19"
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing = "=0.0.20"
+holochain_tracing_macros = "=0.0.20"
 newrelic="0.2"
 sim2h = { version = "=0.0.43-alpha3", path = "../sim2h" }
 lib3h_crypto_api = "=0.0.38"

crates/conductor_api/Cargo.toml

@@ -12,7 +12,7 @@ edition = "2018"
 holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" }
 holochain_wasm_utils = { version = "=0.0.43-alpha3", path = "../wasm_utils" }
 holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" }
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing_macros = "=0.0.20"
 holochain_common = { version = "=0.0.43-alpha3", path = "../common" }
 newrelic="0.2"
 jsonrpc-core = "=14.0.1"

crates/conductor_lib/Cargo.toml

@@ -22,8 +22,8 @@ holochain_persistence_lmdb = "=0.0.17"
 holochain_common = { version = "=0.0.43-alpha3", path = "../common" }
 holochain_dpki = { version = "=0.0.43-alpha3", path = "../dpki" }
 holochain_net = { version = "=0.0.43-alpha3", path = "../net" }
-holochain_tracing = "=0.0.19"
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing = "=0.0.20"
+holochain_tracing_macros = "=0.0.20"
 lib3h = "=0.0.38"
 lib3h_sodium = "=0.0.38"
 holochain_metrics = { version = "=0.0.43-alpha3", path = "../metrics" }

crates/core/Cargo.toml

@@ -40,8 +40,8 @@ holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" }
 holochain_dpki = { version = "=0.0.43-alpha3", path = "../dpki" }
 holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" }
 holochain_metrics = { version = "=0.0.43-alpha3", path = "../metrics" }
-holochain_tracing = "=0.0.19"
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing = "=0.0.20"
+holochain_tracing_macros = "=0.0.20"
 log = "=0.4.8"
 holochain_logging = "=0.0.7"
 boolinator = "=2.4.0"

crates/core/src/network/handler/mod.rs

@@ -144,18 +144,20 @@ pub fn create_handler(c: &Arc<Context>, my_dna_address: String) -> NetHandler {
             return Ok(());
         }
         let message = message.unwrap();
-        let mut span = ht::SpanWrap::from(message.clone())
-            .follower(&context.tracer, "received message from handler")
-            .unwrap_or_else(|| {
-                context
-                    .tracer
-                    .span("create_handler (missing history)")
-                    .start()
-                    .into()
+        let _spanguard = message
+            .span_context
+            .as_ref()
+            // This span has context, create a follow if tracing is on.
+            .and_then(|c| ht::follow_encoded_tag(&Some((*context.tracer).clone()), 
+                c, here!({}), ht::debug_tag("message", &message.data)))
+            // No context so if tracing is on then this trace was never started
+            .or_else(|| {
+                    let s = context.tracer
+                        .span("Trace was never started in Sim2h!")
+                        .tag(ht::debug_tag("message", &message.data))
+                        .start();
+                    Some(ht::push_span(s.into()))
             });
-        span.event(format!("message.data: {:?}", message.data));
-        // Set this as the root span for autotrace
-        let _guard = ht::push_span(span);
         match message.data {
             Lib3hServerProtocol::FailureResult(failure_data) => {
                 if !is_my_dna(&my_dna_address, &failure_data.space_address.to_string()) {

crates/dpki/Cargo.toml

@@ -12,7 +12,7 @@ edition = "2018"
 lazy_static = "=1.4.0"
 base64 = "=0.10.1"
 holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" }
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing_macros = "=0.0.20"
 newrelic="0.2"
 lib3h_sodium = "=0.0.38"
 holochain_persistence_api = "=0.0.17"

crates/holochain/Cargo.toml

@@ -14,8 +14,8 @@ holochain_conductor_lib = { version = "=0.0.43-alpha3", path = "../conductor_lib
 lib3h_sodium = "=0.0.38"
 holochain_common = { version = "=0.0.43-alpha3", path = "../common" }
 holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" }
-holochain_tracing = "=0.0.19"
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing = "=0.0.20"
+holochain_tracing_macros = "=0.0.20"
 structopt = "=0.2.15"
 tiny_http = "=0.6.2"
 lazy_static = "=1.4.0"

crates/metrics/Cargo.toml

@@ -12,7 +12,7 @@ shrinkwraprs = "=0.2.1"
 serde = { version = "=1.0.104", features = ["rc"] }
 serde_derive = "=1.0.104"
 holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" }
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing_macros = "=0.0.20"
 holochain_common = { version = "=0.0.43-alpha3", path = "../common" }
 lazy_static = "=1.4.0"
 num-traits = "=0.2.6"

crates/net/Cargo.toml

@@ -23,14 +23,14 @@ lib3h_protocol = "=0.0.38"
 lib3h = "=0.0.38"
 lib3h_zombie_actor = "=0.0.38"
 detach = "=0.0.19"
-holochain_tracing = "=0.0.19"
+holochain_tracing = "=0.0.20"
 holochain_metrics = { version = "=0.0.43-alpha3", path = "../metrics" }
 holochain_conductor_lib_api = { version = "=0.0.43-alpha3", path = "../conductor_api" }
 holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" }
 holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" }
 holochain_json_derive = "=0.0.23"
 holochain_json_api = "=0.0.23"
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing_macros = "=0.0.20"
 holochain_persistence_api = "=0.0.17"
 holochain_common = { version = "=0.0.43-alpha3", path = "../common" }
 in_stream = { version = "=0.0.43-alpha3", path = "../in_stream" }

crates/sim2h/Cargo.toml

@@ -22,12 +22,12 @@ lib3h_crypto_api = "=0.0.38"
 lib3h_sodium = "=0.0.38"
 lib3h_protocol = "=0.0.38"
 lib3h_zombie_actor = "=0.0.38"
-holochain_tracing = "=0.0.19"
+holochain_tracing = "=0.0.20"
 holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" }
 holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" }
 holochain_metrics = { version = "=0.0.43-alpha3", path = "../metrics" }
 holochain_common = { version = "=0.0.43-alpha3", path = "../common" }
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing_macros = "=0.0.20"
 im = { version = "=14.0.0", features = ["serde"] }
 in_stream = { version = "=0.0.43-alpha3", path = "../in_stream" }
 uuid = { version = "0.4", features = ["v4"] }

crates/sim2h/src/connection_mgr.rs

@@ -26,7 +26,7 @@ pub enum ConMgrEvent {
 #[derive(Debug)]
 enum ConMgrCommand {
     Connect(Lib3hUri, TcpWss),
-    SendData(Lib3hUri, WsFrame),
+    SendData(Lib3hUri, ht::SpanWrap<WsFrame>),
     Disconnect(Lib3hUri),
 }
 
@@ -38,7 +38,13 @@ type CmdRecv = tokio::sync::mpsc::UnboundedReceiver<ConMgrCommand>;
 pub type ConnectionMgrEventRecv = EvtRecv;
 
 /// internal websocket polling loop
-async fn wss_task(uri: Lib3hUri, mut wss: TcpWss, evt_send: EvtSend, mut cmd_recv: CmdRecv) {
+async fn wss_task(
+    uri: Lib3hUri,
+    mut wss: TcpWss,
+    evt_send: EvtSend,
+    mut cmd_recv: CmdRecv,
+    tracer: Option<ht::Tracer>,
+) {
     let mut frame = None;
 
     // TODO - this should be done with tokio tcp streams && selecting
@@ -59,7 +65,8 @@ async fn wss_task(uri: Lib3hUri, mut wss: TcpWss, evt_send: EvtSend, mut cmd_rec
                     did_work = true;
                     match cmd {
                         ConMgrCommand::SendData(_uri, frame) => {
-                            if let Err(e) = wss.write(frame) {
+                            let _spanguard = ht::follow(&tracer, &frame, here!(()));
+                            if let Err(e) = wss.write(frame.data) {
                                 error!("socket write error {} {:?}", uri, e);
                                 let _ = evt_send
                                     .send(ConMgrEvent::Disconnect(uri.clone(), Some(e.into())));
@@ -134,9 +141,14 @@ async fn wss_task(uri: Lib3hUri, mut wss: TcpWss, evt_send: EvtSend, mut cmd_rec
 }
 
 /// internal actually spawn the above wss_task into the tokio runtime
-fn spawn_wss_task(uri: Lib3hUri, wss: TcpWss, evt_send: EvtSend) -> CmdSend {
+fn spawn_wss_task(
+    uri: Lib3hUri,
+    wss: TcpWss,
+    evt_send: EvtSend,
+    tracer: Option<ht::Tracer>,
+) -> CmdSend {
     let (cmd_send, cmd_recv) = tokio::sync::mpsc::unbounded_channel();
-    tokio::task::spawn(wss_task(uri, wss, evt_send, cmd_recv));
+    tokio::task::spawn(wss_task(uri, wss, evt_send, cmd_recv, tracer));
     cmd_send
 }
 
@@ -175,12 +187,15 @@ pub struct ConnectionMgr {
     evt_recv_from_children: EvtRecv,
     connection_count: ConnectionCount,
     wss_map: std::collections::HashMap<Lib3hUri, CmdSend>,
+    tracer: Option<ht::Tracer>,
 }
 
 impl ConnectionMgr {
     /// spawn a new connection manager task, returning a handle for controlling it
     /// and a receiving channel for any incoming data
-    pub fn new() -> (ConnectionMgrHandle, ConnectionMgrEventRecv, ConnectionCount) {
+    pub fn new(
+        tracer: Option<ht::Tracer>,
+    ) -> (ConnectionMgrHandle, ConnectionMgrEventRecv, ConnectionCount) {
         let (evt_p_send, evt_p_recv) = tokio::sync::mpsc::unbounded_channel();
         let (evt_c_send, evt_c_recv) = tokio::sync::mpsc::unbounded_channel();
         let (cmd_send, cmd_recv) = tokio::sync::mpsc::unbounded_channel();
@@ -198,6 +213,7 @@ impl ConnectionMgr {
             evt_recv_from_children: evt_c_recv,
             connection_count: connection_count.clone(),
             wss_map: std::collections::HashMap::new(),
+            tracer,
         };
 
         tokio::task::spawn(con_mgr_task(con_mgr, weak_ref_dummy));
@@ -250,6 +266,7 @@ impl ConnectionMgr {
                                 uri.clone(),
                                 wss,
                                 self.evt_send_from_children.clone(),
+                                self.tracer.clone(),
                             );
                             if let Some(old) = self.wss_map.insert(uri.clone(), cmd_send) {
                                 error!("REPLACING ACTIVE CONNECTION: {}", uri);
@@ -353,7 +370,7 @@ impl ConnectionMgrHandle {
     }
 
     /// send data to a managed websocket connection
-    pub fn send_data(&self, uri: Lib3hUri, frame: WsFrame) {
+    pub fn send_data(&self, uri: Lib3hUri, frame: ht::SpanWrap<WsFrame>) {
         if let Err(e) = self.send_cmd.send(ConMgrCommand::SendData(uri, frame)) {
             error!("failed to send on channel - shutting down? {:?}", e);
         }