Merge pull request #2132 from holochain/tokio_tracing

Basic start to tokio trace

Author: zippy

.circleci/config.yml

@@ -117,7 +117,7 @@ jobs:
      - checkout
      - run:
          name: sim2h server
-         command: nix-shell --run "hc-sim2h-server -p 9002"
+         command: nix-shell --run "hc-sim2h-server -p 9002 --structured None"
          background: true
          no_output_timeout: 20m
      - run:

CHANGELOG-UNRELEASED.md

@@ -30,8 +30,19 @@ 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 = "=0.0.39"
+#lib3h_protocol = "=0.0.39"
+#lib3h_crypto_api = "=0.0.39"
+#lib3h_sodium = "=0.0.39"
+#lib3h_zombie_actor = "=0.0.39"
+
+#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" }
+
+#holochain_tracing = { path = "../holochain-tracing/crates/tracing" }
+#holochain_tracing_macros = { path = "../holochain-tracing/crates/tracing_macros" }
+#holochain_tracing = { git = "https://github.com/holochain/holochain-tracing", branch ="tokio" }
+#holochain_tracing_macros = { git = "https://github.com/holochain/holochain-tracing", branch ="tokio" }

Cargo.lock

@@ -15,21 +15,21 @@ holochain_conductor_lib = { version = "=0.0.44-alpha3", path = "../conductor_lib
 holochain_net = { version = "=0.0.44-alpha3", path = "../net" }
 holochain_dpki = { version = "=0.0.44-alpha3", path = "../dpki" }
 holochain_locksmith = { version = "=0.0.44-alpha3", path = "../locksmith" }
-holochain_tracing = "=0.0.19"
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing = "=0.0.22"
+holochain_tracing_macros = "=0.0.22"
 newrelic="0.2"
 sim2h = { version = "=0.0.44-alpha3", path = "../sim2h" }
-lib3h_crypto_api = "=0.0.38"
+lib3h_crypto_api = "=0.0.39"
 in_stream = { version = "=0.0.44-alpha3", path = "../in_stream" }
 url2 = "=0.0.4"
-lib3h_sodium = "=0.0.38"
+lib3h_sodium = "=0.0.39"
 holochain_json_api = "=0.0.23"
 holochain_persistence_api = "=0.0.17"
 holochain_persistence_file = "=0.0.17"
 holochain_wasm_utils = { path = "../wasm_utils" }
 crossbeam-channel = "=0.3.8"
 structopt = "=0.3.3"
-failure = "=0.1.5"
+failure = "=0.1.7"
 serde = "=1.0.104"
 serde_derive = "=1.0.104"
 serde_json = { version = "=1.0.47", features = ["preserve_order"] }
@@ -45,13 +45,14 @@ rustyline = "=5.0.0"
 json-patch = "=0.2.2"
 reqwest = "=0.9.11"
 tempfile = "=3.0.7"
-lib3h_protocol = "=0.0.38"
+lib3h_protocol = "=0.0.39"
 tar = "=0.4.26"
 flate2 = "=1.0.12"
 log = "=0.4.8"
 dns-lookup = "=1.0.1"
 hcid = "=0.0.6"
 lazy_static = "=1.4.0"
+tracing-subscriber = "=0.2.1"
 
 [dev-dependencies]
 assert_cmd = "=0.10.2"

Cargo.toml

@@ -1,4 +1,4 @@
-use crate::{error::DefaultResult, NEW_RELIC_LICENSE_KEY};
+use crate::error::DefaultResult;
 use colored::*;
 use holochain_core::{
     agent::{

crates/cli/Cargo.toml

@@ -1,4 +1,4 @@
-use crate::{error::DefaultResult, NEW_RELIC_LICENSE_KEY};
+use crate::error::DefaultResult;
 use flate2::read::GzDecoder;
 use glob::glob;
 use std::{

crates/cli/src/cli/chain_log.rs

@@ -1,4 +1,3 @@
-use crate::NEW_RELIC_LICENSE_KEY;
 use error::DefaultResult;
 use failure::err_msg;
 use holochain_conductor_lib::conductor::Conductor;

crates/cli/src/cli/generate.rs

@@ -6,7 +6,6 @@ use crate::{
     config_files::App as AppConfig,
     error::DefaultResult,
     util::DIST_DIR_NAME,
-    NEW_RELIC_LICENSE_KEY,
 };
 use colored::*;
 use serde_json;

crates/cli/src/cli/hash_dna.rs

@@ -1,4 +1,3 @@
-use crate::NEW_RELIC_LICENSE_KEY;
 use error::DefaultResult;
 use holochain_common::paths::keys_directory;
 use holochain_conductor_lib::{key_loaders::mock_passphrase_manager, keystore::Keystore};

crates/cli/src/cli/init.rs

@@ -1,4 +1,4 @@
-use crate::{config_files::Build, error::DefaultResult, util, NEW_RELIC_LICENSE_KEY};
+use crate::{config_files::Build, error::DefaultResult, util};
 use base64;
 use colored::*;
 use holochain_core::wasm_engine::{run_dna, WasmCallData};

crates/cli/src/cli/keygen.rs

@@ -1,4 +1,4 @@
-use crate::{NetworkingType, NEW_RELIC_LICENSE_KEY};
+use crate::NetworkingType;
 use cli;
 use colored::*;
 use error::DefaultResult;

crates/cli/src/cli/package.rs

@@ -1,4 +1,3 @@
-use crate::NEW_RELIC_LICENSE_KEY;
 use dns_lookup::lookup_host;
 use in_stream::*;
 use lib3h_crypto_api::CryptoSystem;

crates/cli/src/cli/run.rs

@@ -1,4 +1,4 @@
-use crate::{error::DefaultResult, util, NEW_RELIC_LICENSE_KEY};
+use crate::{error::DefaultResult, util};
 use base64;
 use serde_json;
 use std::{

crates/cli/src/cli/sim2h_client.rs

@@ -1,4 +1,4 @@
-use crate::{error::DefaultResult, NEW_RELIC_LICENSE_KEY};
+use crate::error::DefaultResult;
 use colored::*;
 pub use holochain_common::paths::DNA_EXTENSION;
 use std::{

crates/cli/src/config_files/build.rs

@@ -47,7 +47,7 @@ macro_rules! new_relic_setup {
     ($x:expr) => {
         lazy_static::lazy_static! {
             static ref NEW_RELIC_LICENSE_KEY: Option<String> =
-                option_env!($x).map(|s| s.to_string());
+                std::env::var_os($x).and_then(|s| s.into_string().ok());
         }
     };
 }

crates/cli/src/util.rs

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

crates/common/src/env_vars.rs

@@ -1,4 +1,3 @@
-use crate::NEW_RELIC_LICENSE_KEY;
 use holochain_core_types::error::HolochainError;
 use holochain_locksmith::RwLock;
 use holochain_wasm_utils::api_serialization::crypto::CryptoMethod;

crates/conductor_api/Cargo.toml

@@ -22,10 +22,10 @@ holochain_persistence_lmdb = "=0.0.17"
 holochain_common = { version = "=0.0.44-alpha3", path = "../common" }
 holochain_dpki = { version = "=0.0.44-alpha3", path = "../dpki" }
 holochain_net = { version = "=0.0.44-alpha3", path = "../net" }
-holochain_tracing = "=0.0.19"
-holochain_tracing_macros = "=0.0.19"
-lib3h = "=0.0.38"
-lib3h_sodium = "=0.0.38"
+holochain_tracing = "=0.0.22"
+holochain_tracing_macros = "=0.0.22"
+lib3h = "=0.0.39"
+lib3h_sodium = "=0.0.39"
 holochain_metrics = { version = "=0.0.44-alpha3", path = "../metrics" }
 chrono = "=0.4.6"
 serde = "=1.0.104"

crates/conductor_api/src/conductor_api.rs

@@ -6,7 +6,6 @@ use crate::{
     },
     dpki_instance::DpkiInstance,
     keystore::{Keystore, PRIMARY_KEYBUNDLE_ID},
-    NEW_RELIC_LICENSE_KEY,
 };
 use holochain_core_types::error::HolochainError;
 use holochain_locksmith::RwLock;

crates/conductor_lib/Cargo.toml

@@ -10,7 +10,7 @@ use crate::{
     key_loaders::test_keystore,
     keystore::{Keystore, PRIMARY_KEYBUNDLE_ID},
     port_utils::{try_with_port, INTERFACE_CONNECT_ATTEMPTS_MAX},
-    Holochain, NEW_RELIC_LICENSE_KEY,
+    Holochain,
 };
 use crossbeam_channel::{unbounded, Receiver, Sender};
 use holochain_common::paths::DNA_EXTENSION;

crates/conductor_lib/src/conductor/admin.rs

@@ -1,4 +1,4 @@
-use crate::{conductor::Conductor, NEW_RELIC_LICENSE_KEY};
+use crate::conductor::Conductor;
 use holochain_core::state_dump::StateDump;
 use holochain_core_types::error::HolochainError;
 use holochain_persistence_api::cas::content::Address;

crates/conductor_lib/src/conductor/base.rs

@@ -1,4 +1,3 @@
-use crate::NEW_RELIC_LICENSE_KEY;
 use crossbeam_channel::{unbounded, Sender};
 use holochain_core_types::error::HolochainError;
 use holochain_locksmith::Mutex;

crates/conductor_lib/src/conductor/debug.rs

@@ -4,7 +4,6 @@ use crate::{
     error::HolochainInstanceError,
     static_file_server::ConductorStaticFileServer,
     static_server_impls::NickelStaticServer as StaticServer,
-    NEW_RELIC_LICENSE_KEY,
 };
 use holochain_core_types::error::HolochainError;
 use std::{path::PathBuf, sync::Arc};

crates/conductor_lib/src/conductor/passphrase_manager.rs

@@ -1,4 +1,4 @@
-use crate::{conductor::base::DnaLoader, logger::LogRules, NEW_RELIC_LICENSE_KEY};
+use crate::{conductor::base::DnaLoader, logger::LogRules};
 /// Conductor Configuration
 /// This module provides structs that represent the different aspects of how
 /// a conductor can be configured.

crates/conductor_lib/src/conductor/ui_admin.rs

@@ -1,4 +1,3 @@
-use crate::NEW_RELIC_LICENSE_KEY;
 use holochain_core_types::error::HolochainError;
 use reqwest::{self, Url};
 use serde::{

crates/conductor_lib/src/config.rs

@@ -1,6 +1,6 @@
 /// Defines a rust wrapper trait to match the Dpki exposed function trait definition
 /// for the conductor to use in the various dpki related flows, e.g. bootstrap and agent addition
-use crate::{holochain::Holochain, NEW_RELIC_LICENSE_KEY};
+use crate::holochain::Holochain;
 use holochain_core_types::{dna::capabilities::CapabilityRequest, error::HolochainError};
 use holochain_json_api::json::JsonString;
 use holochain_persistence_api::cas::content::AddressableContent;

crates/conductor_lib/src/dna_location.rs

@@ -1,4 +1,4 @@
-use crate::{config::*, port_utils::get_free_port, NEW_RELIC_LICENSE_KEY};
+use crate::{config::*, port_utils::get_free_port};
 use boolinator::Boolinator;
 use std::collections::HashMap;
 

crates/conductor_lib/src/dpki_instance.rs

@@ -1,4 +1,3 @@
-use crate::NEW_RELIC_LICENSE_KEY;
 use boolinator::Boolinator;
 use holochain_core_types::{agent::AgentId, error::HolochainError};
 use holochain_persistence_api::cas::content::AddressableContent;

crates/conductor_lib/src/happ_bundle.rs

@@ -91,10 +91,7 @@
 //!
 //!```
 
-use crate::{
-    error::{HolochainInstanceError, HolochainResult},
-    NEW_RELIC_LICENSE_KEY,
-};
+use crate::error::{HolochainInstanceError, HolochainResult};
 use holochain_core::{
     context::Context,
     instance::Instance,

crates/conductor_lib/src/holo_signing_service.rs

@@ -23,7 +23,6 @@ use crate::{
         InterfaceConfiguration, InterfaceDriver, UiBundleConfiguration, UiInterfaceConfiguration,
     },
     keystore::{KeyType, Keystore, Secret},
-    NEW_RELIC_LICENSE_KEY,
 };
 use holochain_dpki::utils::SeedContext;
 use serde_json::{self, map::Map};

crates/conductor_lib/src/holochain.rs

@@ -1,4 +1,4 @@
-use crate::{conductor::broadcaster::Broadcaster, interface::Interface, NEW_RELIC_LICENSE_KEY};
+use crate::{conductor::broadcaster::Broadcaster, interface::Interface};
 use crossbeam_channel::Receiver;
 use jsonrpc_core::IoHandler;
 use jsonrpc_http_server::ServerBuilder;

crates/conductor_lib/src/interface.rs

@@ -1,4 +1,4 @@
-use crate::{conductor::broadcaster::Broadcaster, interface::Interface, NEW_RELIC_LICENSE_KEY};
+use crate::{conductor::broadcaster::Broadcaster, interface::Interface};
 use crossbeam_channel::Receiver;
 use jsonrpc_core::IoHandler;
 use jsonrpc_ws_server::ServerBuilder;

crates/conductor_lib/src/interface_impls/http.rs

@@ -21,7 +21,7 @@ use lib3h_sodium::{
     secbuf::SecBuf,
 };
 
-use crate::{conductor::passphrase_manager::PassphraseManager, NEW_RELIC_LICENSE_KEY};
+use crate::conductor::passphrase_manager::PassphraseManager;
 use holochain_dpki::{password_encryption::PwHashConfig, seed::SeedType};
 use std::{
     collections::{BTreeMap, HashMap},

crates/conductor_lib/src/interface_impls/websocket.rs

@@ -1,4 +1,3 @@
-use crate::NEW_RELIC_LICENSE_KEY;
 use std::{ops::Range, thread, time::Duration};
 
 pub const INTERFACE_CONNECT_ATTEMPTS_MAX: usize = 30;

crates/conductor_lib/src/keystore.rs

@@ -1,7 +1,6 @@
 use crate::{
     config::{InterfaceConfiguration, UiBundleConfiguration, UiInterfaceConfiguration},
     error::HolochainResult,
-    NEW_RELIC_LICENSE_KEY,
 };
 use hyper::{http::uri, Request};
 

crates/conductor_lib/src/port_utils.rs

@@ -3,7 +3,6 @@ use crate::{
     config::{InterfaceConfiguration, UiBundleConfiguration, UiInterfaceConfiguration},
     error::HolochainResult,
     static_file_server::{dna_connections_response, ConductorStaticFileServer, DNA_CONFIG_ROUTE},
-    NEW_RELIC_LICENSE_KEY,
 };
 use crossbeam_channel::{self, Sender};
 use holochain_core_types::error::HolochainError;

crates/conductor_lib/src/static_file_server.rs

@@ -18,7 +18,7 @@ snowflake = { version = "=1.3.0", features = ["serde_support"] }
 bitflags = "=1.2.1"
 wasmi = "=0.4.4"
 wasmer-runtime = "=0.13.1"
-failure = "=0.1.5"
+failure = "=0.1.7"
 lazy_static = "=1.4.0"
 unwrap_to = "=0.1.0"
 num-traits = "=0.2.6"
@@ -29,8 +29,8 @@ holochain_net = { version = "=0.0.44-alpha3", path = "../net" }
 holochain_wasm_utils = { version = "=0.0.44-alpha3", path = "../wasm_utils" }
 holochain_common = { version = "=0.0.44-alpha3", path = "../common" }
 holochain_conductor_lib_api = { version = "=0.0.44-alpha3", path = "../conductor_api" }
-lib3h_protocol = "=0.0.38"
-lib3h_sodium = "=0.0.38"
+lib3h_protocol = "=0.0.39"
+lib3h_sodium = "=0.0.39"
 holochain_json_derive = "=0.0.23"
 holochain_json_api = "=0.0.23"
 holochain_persistence_api = "=0.0.17"
@@ -40,8 +40,8 @@ holochain_core_types = { version = "=0.0.44-alpha3", path = "../core_types" }
 holochain_dpki = { version = "=0.0.44-alpha3", path = "../dpki" }
 holochain_locksmith = { version = "=0.0.44-alpha3", path = "../locksmith" }
 holochain_metrics = { version = "=0.0.44-alpha3", path = "../metrics" }
-holochain_tracing = "=0.0.19"
-holochain_tracing_macros = "=0.0.19"
+holochain_tracing = "=0.0.22"
+holochain_tracing_macros = "=0.0.22"
 log = "=0.4.8"
 holochain_logging = "=0.0.7"
 boolinator = "=2.4.0"
@@ -54,7 +54,7 @@ clokwerk = "=0.1.0"
 crossbeam-channel = "=0.3.8"
 env_logger = "=0.6.1"
 url = { version = "=2.1.0", features = ["serde"] }
-rand = "0.7.2"
+rand = "=0.7.3"
 threadpool = "=1.7.1"
 im = { version = "=14.0.0", features = ["serde"] }
 itertools = "0.8.2"

crates/conductor_lib/src/static_server_impls/nickel_static_server.rs

@@ -3,7 +3,6 @@ use crate::{
     agent::state::AgentActionResponse,
     context::Context,
     instance::dispatch_action,
-    NEW_RELIC_LICENSE_KEY,
 };
 use futures::{future::Future, task::Poll};
 use holochain_core_types::{entry::Entry, error::HolochainError};

crates/core/Cargo.toml

@@ -1,7 +1,4 @@
-use crate::{
-    content_store::{AddContent, GetContent},
-    NEW_RELIC_LICENSE_KEY,
-};
+use crate::content_store::{AddContent, GetContent};
 use globset::{GlobBuilder, GlobSetBuilder};
 use holochain_core_types::{
     chain_header::ChainHeader,

crates/core/src/agent/actions/commit.rs

@@ -3,7 +3,6 @@ use crate::{
     agent::chain_store::{ChainStore, ChainStoreIterator},
     network::entry_with_header::EntryWithHeader,
     state::State,
-    NEW_RELIC_LICENSE_KEY,
 };
 use holochain_persistence_api::cas::content::{Address, AddressableContent, Content};
 

crates/core/src/agent/chain_store.rs

@@ -1,6 +1,4 @@
-use crate::{
-    action::Action, context::Context, entry::CanPublish, nucleus::ZomeFnCall, NEW_RELIC_LICENSE_KEY,
-};
+use crate::{action::Action, context::Context, entry::CanPublish, nucleus::ZomeFnCall};
 use holochain_core_types::{
     entry::Entry, link::link_data::LinkData, network::entry_aspect::EntryAspect,
 };