Skip to content
This repository was archived by the owner on Feb 3, 2023. It is now read-only.

Basic start to tokio trace #2132

Merged
merged 31 commits into from
Mar 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8795597
Basic start to tokio trace
freesig Feb 25, 2020
a107f34
Merge branch 'develop' of https://github.com/holochain/holochain-rust…
freesig Feb 25, 2020
f4704d5
add filters
freesig Feb 26, 2020
78b4ce9
point at git
freesig Feb 26, 2020
ddff233
test points
freesig Feb 27, 2020
ad7bd00
remove frequent
freesig Feb 27, 2020
39dd900
remove frequent
freesig Feb 27, 2020
147bf4f
Merge branch 'develop' of https://github.com/holochain/holochain-rust…
freesig Feb 27, 2020
066dae1
better output
freesig Feb 27, 2020
ba8beb2
check error
freesig Feb 28, 2020
f7cd0c2
up join space tries
freesig Feb 28, 2020
a7dd569
fix mistake
freesig Feb 28, 2020
bf875a5
await on join
freesig Feb 28, 2020
0c11c60
remove new relic import and just use in macro
freesig Mar 2, 2020
35e6cb2
Merge branch 'develop' of https://github.com/holochain/holochain-rust…
freesig Mar 3, 2020
e27edeb
Clean up
freesig Mar 3, 2020
da7ac16
remove old tracing from sim2h
freesig Mar 3, 2020
9828f5d
allow both jaeger and structured
freesig Mar 3, 2020
be32f58
format
freesig Mar 3, 2020
457405f
Merge branch 'develop' of https://github.com/holochain/holochain-rust…
freesig Mar 3, 2020
cbba4cb
remove extern crate
freesig Mar 4, 2020
e72b5e9
fix for disabling jaeger
freesig Mar 5, 2020
2bf5fa0
Merge branch 'develop' of https://github.com/holochain/holochain-rust…
freesig Mar 5, 2020
d265488
new tracing release
freesig Mar 5, 2020
ada037d
bump lib3h and tracing for quote 1.0.3
zippy Mar 5, 2020
1a3ddae
updated holochain-tracing
zippy Mar 5, 2020
714cba3
bump failure
freesig Mar 5, 2020
5a19816
fix async
freesig Mar 5, 2020
315c1ea
rustfmt
freesig Mar 5, 2020
28949f5
merge branch develop into tokio_tracing
zippy Mar 6, 2020
adea0d8
update changelog
freesig Mar 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG-UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
{{ version-heading }}

### Added

- Adds tokio tracing to sim2h_server. [Description](https://holo.hackmd.io/@c5lIpp4ET0OJJnDT3gzilA/SyRm2YoEU). Also check `sim2h_server --help` for usage instructions.
- Adds the notion of a manager to trycp_server so that we can dynamically manage pools of available nodes for test runs in final-exam [PR#2123](https://github.com/holochain/holochain-rust/pull/2123)

### Changed

- new_relic is behind a feature flag `new-relic`.
### Deprecated

### Removed
- Older rust-tracing traces.

### Fixed

Expand Down
458 changes: 332 additions & 126 deletions Cargo.lock

Large diffs are not rendered by default.

21 changes: 16 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
13 changes: 7 additions & 6 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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"
2 changes: 1 addition & 1 deletion crates/cli/src/cli/chain_log.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{error::DefaultResult, NEW_RELIC_LICENSE_KEY};
use crate::error::DefaultResult;
use colored::*;
use holochain_core::{
agent::{
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/cli/generate.rs
Original file line number Diff line number Diff line change
@@ -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::{
Expand Down
1 change: 0 additions & 1 deletion crates/cli/src/cli/hash_dna.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crate::NEW_RELIC_LICENSE_KEY;
use error::DefaultResult;
use failure::err_msg;
use holochain_conductor_lib::conductor::Conductor;
Expand Down
1 change: 0 additions & 1 deletion crates/cli/src/cli/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion crates/cli/src/cli/keygen.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/cli/package.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/cli/run.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{NetworkingType, NEW_RELIC_LICENSE_KEY};
use crate::NetworkingType;
use cli;
use colored::*;
use error::DefaultResult;
Expand Down
1 change: 0 additions & 1 deletion crates/cli/src/cli/sim2h_client.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crate::NEW_RELIC_LICENSE_KEY;
use dns_lookup::lookup_host;
use in_stream::*;
use lib3h_crypto_api::CryptoSystem;
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/config_files/build.rs
Original file line number Diff line number Diff line change
@@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/util.rs
Original file line number Diff line number Diff line change
@@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion crates/common/src/env_vars.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion crates/conductor_api/src/conductor_api.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions crates/conductor_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion crates/conductor_lib/src/conductor/admin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_lib/src/conductor/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_lib/src/conductor/debug.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion crates/conductor_lib/src/conductor/passphrase_manager.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion crates/conductor_lib/src/conductor/ui_admin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_lib/src/config.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 0 additions & 1 deletion crates/conductor_lib/src/dna_location.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crate::NEW_RELIC_LICENSE_KEY;
use holochain_core_types::error::HolochainError;
use reqwest::{self, Url};
use serde::{
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_lib/src/dpki_instance.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_lib/src/happ_bundle.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
1 change: 0 additions & 1 deletion crates/conductor_lib/src/holo_signing_service.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
5 changes: 1 addition & 4 deletions crates/conductor_lib/src/holochain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion crates/conductor_lib/src/interface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_lib/src/interface_impls/http.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_lib/src/interface_impls/websocket.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/conductor_lib/src/keystore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
1 change: 0 additions & 1 deletion crates/conductor_lib/src/port_utils.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion crates/conductor_lib/src/static_file_server.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::{
config::{InterfaceConfiguration, UiBundleConfiguration, UiInterfaceConfiguration},
error::HolochainResult,
NEW_RELIC_LICENSE_KEY,
};
use hyper::{http::uri, Request};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
1 change: 0 additions & 1 deletion crates/core/src/agent/actions/commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
5 changes: 1 addition & 4 deletions crates/core/src/agent/chain_store.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
1 change: 0 additions & 1 deletion crates/core/src/agent/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down
4 changes: 1 addition & 3 deletions crates/core/src/consistency.rs
Original file line number Diff line number Diff line change
@@ -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,
};
Expand Down
Loading