From 289c030207ff2db4fef0620aa9a47be0414411b2 Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Fri, 6 Mar 2020 10:32:58 -0500 Subject: [PATCH 1/6] remove newrelic from holochain --- crates/cli/src/cli/chain_log.rs | 6 ++--- crates/cli/src/cli/generate.rs | 4 +-- crates/cli/src/cli/hash_dna.rs | 2 +- crates/cli/src/cli/init.rs | 2 +- crates/cli/src/cli/keygen.rs | 2 +- crates/cli/src/cli/package.rs | 6 ++--- crates/cli/src/cli/run.rs | 22 ++++++++-------- crates/cli/src/cli/sim2h_client.rs | 6 ++--- crates/cli/src/config_files/build.rs | 2 +- crates/cli/src/main.rs | 4 +-- crates/cli/src/util.rs | 12 ++++----- crates/conductor_api/src/conductor_api.rs | 4 +-- crates/conductor_lib/src/conductor/admin.rs | 2 +- crates/conductor_lib/src/conductor/base.rs | 6 ++--- crates/conductor_lib/src/conductor/debug.rs | 2 +- .../src/conductor/passphrase_manager.rs | 2 +- .../conductor_lib/src/conductor/ui_admin.rs | 2 +- crates/conductor_lib/src/config.rs | 2 +- crates/conductor_lib/src/dna_location.rs | 2 +- crates/conductor_lib/src/dpki_instance.rs | 2 +- crates/conductor_lib/src/happ_bundle.rs | 2 +- .../conductor_lib/src/holo_signing_service.rs | 2 +- crates/conductor_lib/src/holochain.rs | 2 +- crates/conductor_lib/src/interface.rs | 2 +- .../conductor_lib/src/interface_impls/http.rs | 2 +- .../src/interface_impls/websocket.rs | 2 +- crates/conductor_lib/src/keystore.rs | 2 +- crates/conductor_lib/src/port_utils.rs | 6 ++--- .../conductor_lib/src/static_file_server.rs | 4 +-- .../nickel_static_server.rs | 2 +- crates/core/src/agent/actions/commit.rs | 4 +-- crates/core/src/agent/chain_store.rs | 4 +-- crates/core/src/agent/state.rs | 16 ++++++------ crates/core/src/consistency.rs | 2 +- crates/core/src/context.rs | 2 +- crates/core/src/dht/actions/hold_aspect.rs | 2 +- .../src/dht/actions/queue_holding_workflow.rs | 6 ++--- .../actions/remove_queued_holding_workflow.rs | 4 +-- crates/core/src/dht/aspect_map.rs | 2 +- crates/core/src/dht/dht_inner_reducers.rs | 8 +++--- crates/core/src/dht/dht_reducers.rs | 16 ++++++------ crates/core/src/dht/dht_store.rs | 4 +-- crates/core/src/entry/mod.rs | 2 +- .../core/src/entry/validation_dependencies.rs | 2 +- crates/core/src/instance.rs | 2 +- .../core/src/network/actions/custom_send.rs | 4 +-- .../network/actions/get_validation_package.rs | 4 +-- .../src/network/actions/initialize_network.rs | 2 +- crates/core/src/network/actions/publish.rs | 4 +-- .../network/actions/publish_header_entry.rs | 4 +-- crates/core/src/network/actions/query.rs | 4 +-- crates/core/src/network/actions/shutdown.rs | 4 +-- crates/core/src/network/entry_with_header.rs | 2 +- crates/core/src/network/handler/fetch.rs | 2 +- crates/core/src/network/handler/lists.rs | 8 +++--- crates/core/src/network/handler/mod.rs | 10 +++---- crates/core/src/network/handler/query.rs | 8 +++--- crates/core/src/network/handler/send.rs | 6 ++--- crates/core/src/network/handler/store.rs | 2 +- crates/core/src/network/reducers/clear.rs | 6 ++--- .../network/reducers/clear_action_response.rs | 2 +- .../reducers/get_validation_package.rs | 6 ++--- .../reducers/handle_custom_send_response.rs | 2 +- .../src/network/reducers/handle_get_result.rs | 2 +- .../reducers/handle_get_validation_package.rs | 2 +- crates/core/src/network/reducers/init.rs | 2 +- crates/core/src/network/reducers/mod.rs | 8 +++--- crates/core/src/network/reducers/prune.rs | 2 +- crates/core/src/network/reducers/publish.rs | 12 ++++----- .../network/reducers/publish_header_entry.rs | 6 ++--- crates/core/src/network/reducers/query.rs | 6 ++--- .../reducers/resolve_direct_connection.rs | 2 +- .../reducers/respond_authoring_list.rs | 2 +- .../src/network/reducers/respond_fetch.rs | 4 +-- .../network/reducers/respond_gossip_list.rs | 2 +- .../src/network/reducers/respond_query.rs | 2 +- .../network/reducers/send_direct_message.rs | 6 ++--- crates/core/src/network/reducers/shutdown.rs | 2 +- crates/core/src/network/state.rs | 2 +- .../actions/build_validation_package.rs | 6 ++--- crates/core/src/nucleus/actions/call_init.rs | 2 +- .../src/nucleus/actions/call_zome_function.rs | 26 +++++++++---------- crates/core/src/nucleus/actions/get_entry.rs | 8 +++--- crates/core/src/nucleus/actions/initialize.rs | 8 +++--- .../actions/run_validation_callback.rs | 1 - .../reducers/clear_zome_function_call.rs | 2 +- .../src/nucleus/reducers/init_application.rs | 2 +- .../reducers/queue_zome_function_call.rs | 2 +- .../reducers/return_initialization_result.rs | 2 +- .../reducers/return_zome_function_result.rs | 2 +- crates/core/src/nucleus/state.rs | 2 +- .../src/nucleus/validation/agent_entry.rs | 2 +- .../core/src/nucleus/validation/app_entry.rs | 2 +- .../src/nucleus/validation/build_from_dht.rs | 2 +- .../src/nucleus/validation/header_address.rs | 2 +- .../core/src/nucleus/validation/link_entry.rs | 2 +- crates/core/src/nucleus/validation/mod.rs | 6 ++--- .../src/nucleus/validation/provenances.rs | 2 +- .../src/nucleus/validation/remove_entry.rs | 2 +- crates/core/src/persister.rs | 2 +- crates/core/src/scheduled_jobs/state_dump.rs | 6 ++--- crates/core/src/scheduled_jobs/timeouts.rs | 2 +- crates/core/src/state.rs | 2 +- crates/core/src/state_dump.rs | 2 +- crates/core/src/wasm_engine/api/call.rs | 8 +++--- .../core/src/wasm_engine/api/capabilities.rs | 4 +-- crates/core/src/wasm_engine/api/commit.rs | 2 +- crates/core/src/wasm_engine/api/crypto.rs | 2 +- crates/core/src/wasm_engine/api/debug.rs | 2 +- .../core/src/wasm_engine/api/emit_signal.rs | 2 +- .../core/src/wasm_engine/api/entry_address.rs | 2 +- crates/core/src/wasm_engine/api/get_entry.rs | 2 +- crates/core/src/wasm_engine/api/get_links.rs | 2 +- .../src/wasm_engine/api/get_links_count.rs | 2 +- .../core/src/wasm_engine/api/init_globals.rs | 2 +- crates/core/src/wasm_engine/api/keystore.rs | 14 +++++----- .../core/src/wasm_engine/api/link_entries.rs | 2 +- crates/core/src/wasm_engine/api/meta.rs | 2 +- .../core/src/wasm_engine/api/remove_entry.rs | 2 +- .../core/src/wasm_engine/api/remove_link.rs | 2 +- crates/core/src/wasm_engine/api/send.rs | 2 +- crates/core/src/wasm_engine/api/sign.rs | 4 +-- crates/core/src/wasm_engine/api/sleep.rs | 2 +- .../core/src/wasm_engine/api/update_entry.rs | 2 +- .../src/wasm_engine/api/verify_signature.rs | 2 +- .../core/src/wasm_engine/callback/genesis.rs | 2 +- crates/core/src/wasm_engine/callback/init.rs | 2 +- .../src/wasm_engine/callback/links_utils.rs | 4 +-- crates/core/src/wasm_engine/callback/mod.rs | 8 +++--- .../core/src/wasm_engine/callback/receive.rs | 2 +- .../callback/validation_package.rs | 2 +- crates/core/src/wasm_engine/factories.rs | 4 +-- crates/core/src/wasm_engine/memory.rs | 2 +- crates/core/src/wasm_engine/run_dna.rs | 4 +-- crates/core/src/wasm_engine/runtime.rs | 4 +-- crates/core/src/workflows/application.rs | 2 +- crates/core/src/workflows/author_entry.rs | 2 +- crates/core/src/workflows/get_entry_result.rs | 4 +-- crates/core/src/workflows/get_link_result.rs | 2 +- crates/core/src/workflows/get_links_count.rs | 2 +- .../workflows/handle_custom_direct_message.rs | 2 +- crates/core/src/workflows/hold_entry.rs | 2 +- .../core/src/workflows/hold_entry_remove.rs | 2 +- .../core/src/workflows/hold_entry_update.rs | 2 +- crates/core/src/workflows/hold_link.rs | 2 +- crates/core/src/workflows/remove_link.rs | 2 +- .../respond_validation_package_request.rs | 2 +- crates/dpki/src/key_blob.rs | 8 +++--- crates/dpki/src/key_bundle.rs | 2 +- crates/dpki/src/keypair.rs | 12 ++++----- crates/dpki/src/password_encryption.rs | 10 +++---- crates/dpki/src/seed.rs | 18 ++++++------- crates/dpki/src/utils.rs | 20 +++++++------- crates/holochain/src/main.rs | 6 ++--- .../src/connection/net_connection_thread.rs | 4 +-- crates/net/src/lib3h_worker.rs | 2 +- crates/net/src/p2p_config.rs | 4 +-- crates/net/src/p2p_network.rs | 4 +-- crates/net/src/sim2h_worker.rs | 2 -- 159 files changed, 323 insertions(+), 326 deletions(-) diff --git a/crates/cli/src/cli/chain_log.rs b/crates/cli/src/cli/chain_log.rs index dd3422f3bc..935e2338ef 100644 --- a/crates/cli/src/cli/chain_log.rs +++ b/crates/cli/src/cli/chain_log.rs @@ -16,7 +16,7 @@ use std::{fs, path::PathBuf}; // TODO: use system-agnostic default path const DEFAULT_CHAIN_PATH: &str = "TODO"; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn chain_log(storage_path: Option, instance_id: String) -> DefaultResult<()> { let storage_path = storage_path.ok_or_else(|| { format_err!("Please specify the path to CAS storage with the --path option.") @@ -70,7 +70,7 @@ pub fn chain_log(storage_path: Option, instance_id: String) -> DefaultR Ok(()) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn chain_list(path: Option) { let path = path.unwrap_or_else(|| PathBuf::from(DEFAULT_CHAIN_PATH)); println!("Please specify an instance ID to view its chain."); @@ -81,7 +81,7 @@ pub fn chain_list(path: Option) { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn display_header(header: &ChainHeader, entry: &Entry) { println!( "{} {}", diff --git a/crates/cli/src/cli/generate.rs b/crates/cli/src/cli/generate.rs index 316d1e73ff..9ddfced60d 100644 --- a/crates/cli/src/cli/generate.rs +++ b/crates/cli/src/cli/generate.rs @@ -17,7 +17,7 @@ const RUST_PROC_TEMPLATE_TARBALL_URL: &str = const HOLOCHAIN_VERSION: &str = env!("CARGO_PKG_VERSION"); -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn generate(zome_path: &PathBuf, scaffold: &String) -> DefaultResult<()> { let zome_name = zome_path .components() @@ -81,7 +81,7 @@ pub fn generate(zome_path: &PathBuf, scaffold: &String) -> DefaultResult<()> { Ok(()) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn apply_template_substitution(root_path: &PathBuf, context: Context) -> DefaultResult<()> { let zome_name_component = root_path .components() diff --git a/crates/cli/src/cli/hash_dna.rs b/crates/cli/src/cli/hash_dna.rs index 46911cd4ec..6a27202ef1 100644 --- a/crates/cli/src/cli/hash_dna.rs +++ b/crates/cli/src/cli/hash_dna.rs @@ -5,7 +5,7 @@ use holochain_persistence_api::cas::content::{Address, AddressableContent}; use serde_json::Map; use std::path::PathBuf; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn hash_dna( dna_file_path: &PathBuf, properties: Option>, diff --git a/crates/cli/src/cli/init.rs b/crates/cli/src/cli/init.rs index 9b6503107b..678381eae4 100644 --- a/crates/cli/src/cli/init.rs +++ b/crates/cli/src/cli/init.rs @@ -16,7 +16,7 @@ use std::{ path::PathBuf, }; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn create_test_file( test_folder_path: &PathBuf, test_file_name: &str, diff --git a/crates/cli/src/cli/keygen.rs b/crates/cli/src/cli/keygen.rs index 696186a9e8..6904dcc531 100644 --- a/crates/cli/src/cli/keygen.rs +++ b/crates/cli/src/cli/keygen.rs @@ -8,7 +8,7 @@ use std::{ path::PathBuf, }; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn keygen(path: Option, passphrase: Option, quiet: bool) -> DefaultResult<()> { let passphrase = passphrase.unwrap_or_else(|| { if !quiet { diff --git a/crates/cli/src/cli/package.rs b/crates/cli/src/cli/package.rs index 026069b87f..e0835d410c 100644 --- a/crates/cli/src/cli/package.rs +++ b/crates/cli/src/cli/package.rs @@ -28,7 +28,7 @@ const CARGO_FILE_NAME: &str = "Cargo.toml"; pub type Object = Map; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn hdk_version_compare(hdk_version: &HDKVersion, cargo_toml: &str) -> DefaultResult { let toml: Value = toml::from_str(cargo_toml)?; let dependancies = toml @@ -48,7 +48,7 @@ fn hdk_version_compare(hdk_version: &HDKVersion, cargo_toml: &str) -> DefaultRes struct Packager {} -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] impl Packager { fn new() -> Packager { Packager {} @@ -261,7 +261,7 @@ impl Packager { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn package(output: PathBuf, properties: serde_json::Value) -> DefaultResult<()> { Packager::package(output, properties) } diff --git a/crates/cli/src/cli/run.rs b/crates/cli/src/cli/run.rs index 34230f718c..ac5dba94ac 100644 --- a/crates/cli/src/cli/run.rs +++ b/crates/cli/src/cli/run.rs @@ -21,7 +21,7 @@ pub enum Networking { } /// Starts a minimal configuration Conductor with the current application running -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn run( dna_path: PathBuf, package: bool, @@ -72,7 +72,7 @@ pub fn run( Ok(()) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn get_interface_type_string(given_type: String) -> String { // note that this behaviour is documented within // holochain_common::env_vars module and should be updated @@ -81,7 +81,7 @@ pub fn get_interface_type_string(given_type: String) -> String { EnvVar::Interface.value().ok().unwrap_or_else(|| given_type) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn hc_run_configuration( dna_path: &PathBuf, port: u16, @@ -102,7 +102,7 @@ pub fn hc_run_configuration( }) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn hc_run_bundle_configuration( bundle: &HappBundle, port: u16, @@ -126,7 +126,7 @@ pub fn hc_run_bundle_configuration( pub(crate) const AGENT_NAME_DEFAULT: &str = "testAgent"; const AGENT_CONFIG_ID: &str = "hc-run-agent"; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn agent_configuration(agent_name: String) -> AgentConfiguration { // note that this behaviour is documented within // holochain_common::env_vars module and should be updated @@ -151,7 +151,7 @@ fn agent_configuration(agent_name: String) -> AgentConfiguration { // DNA const DNA_CONFIG_ID: &str = "hc-run-dna"; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn dna_configuration(dna_path: &PathBuf) -> DnaConfiguration { let dna = Conductor::load_dna(dna_path).unwrap_or_else(|_| { panic!( @@ -173,7 +173,7 @@ fn dna_configuration(dna_path: &PathBuf) -> DnaConfiguration { // STORAGE const LOCAL_STORAGE_PATH: &str = ".hc"; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn storage_configuration(persist: bool) -> DefaultResult { if persist { fs::create_dir_all(LOCAL_STORAGE_PATH)?; @@ -189,7 +189,7 @@ fn storage_configuration(persist: bool) -> DefaultResult { // INSTANCE const INSTANCE_CONFIG_ID: &str = "test-instance"; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn instance_configuration(storage: StorageConfiguration) -> InstanceConfiguration { InstanceConfiguration { id: INSTANCE_CONFIG_ID.into(), @@ -202,7 +202,7 @@ fn instance_configuration(storage: StorageConfiguration) -> InstanceConfiguratio // INTERFACE const INTERFACE_CONFIG_ID: &str = "websocket-interface"; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn interface_configuration( interface_type: &String, port: u16, @@ -228,7 +228,7 @@ fn interface_configuration( } // LOGGER -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn logger_configuration(logging: bool) -> LoggerConfiguration { // temporary log rules, should come from a configuration LoggerConfiguration { @@ -243,7 +243,7 @@ fn logger_configuration(logging: bool) -> LoggerConfiguration { } // NETWORKING -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn networking_configuration(networked: Option) -> Option { // create a network config if the --networked flag is set let networked = match networked { diff --git a/crates/cli/src/cli/sim2h_client.rs b/crates/cli/src/cli/sim2h_client.rs index 4dffb55d6b..340c528250 100644 --- a/crates/cli/src/cli/sim2h_client.rs +++ b/crates/cli/src/cli/sim2h_client.rs @@ -14,7 +14,7 @@ use std::{ }; use url2::prelude::*; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn sim2h_client(url_string: String, message_string: String) -> Result<(), String> { let url = match Url2::try_parse(url_string.clone()) { Err(e) => Err(format!( @@ -116,7 +116,7 @@ struct Job { // wss_connection: InStreamWss>, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] impl Job { pub fn new(connect_uri: &Url2) -> Result { let (pub_key, sec_key) = CRYPTO.with(|crypto| { @@ -166,7 +166,7 @@ impl Job { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn await_in_stream_connect(connect_uri: &Url2) -> Result, String> { let timeout = std::time::Instant::now() .checked_add(std::time::Duration::from_millis(60000)) diff --git a/crates/cli/src/config_files/build.rs b/crates/cli/src/config_files/build.rs index b8478285ff..8c7768fceb 100644 --- a/crates/cli/src/config_files/build.rs +++ b/crates/cli/src/config_files/build.rs @@ -19,7 +19,7 @@ pub struct Build { pub artifact: PathBuf, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] impl Build { /// Creates a Build struct from a .hcbuild JSON file and returns it pub fn from_file>(path: T) -> DefaultResult { diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index b01bce5ba5..684124d16a 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -172,7 +172,7 @@ arg_enum! { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn main() { lib3h_sodium::check_init(); run().unwrap_or_else(|err| { @@ -182,7 +182,7 @@ fn main() { }); } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] fn run() -> HolochainResult<()> { let args = Cli::from_args(); diff --git a/crates/cli/src/util.rs b/crates/cli/src/util.rs index b8ba23d905..e702166c15 100644 --- a/crates/cli/src/util.rs +++ b/crates/cli/src/util.rs @@ -8,7 +8,7 @@ use std::{ process::{Command, Stdio}, }; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn run_cmd(base_path: &PathBuf, bin: String, args: &[&str]) -> DefaultResult<()> { let pretty_command = format!("{} {}", bin.green(), args.join(" ").cyan()); @@ -66,7 +66,7 @@ pub fn run_cmd(base_path: &PathBuf, bin: String, args: &[&str]) -> DefaultResult } /// Helper method for getting the standard dna file name built from the directory name and extension -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn std_dna_file_name(path: &PathBuf) -> DefaultResult { let dir_name = file_name_string(path)?; Ok(format!("{}.{}", dir_name, DNA_EXTENSION)) @@ -75,7 +75,7 @@ pub fn std_dna_file_name(path: &PathBuf) -> DefaultResult { pub const DIST_DIR_NAME: &str = "dist"; /// Helper method for obtaining the path to the dist directory, and creating it if it doesn't exist -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn get_dist_path(path: &PathBuf) -> DefaultResult { // create dist folder let dist_path = path.join(&DIST_DIR_NAME); @@ -87,13 +87,13 @@ pub fn get_dist_path(path: &PathBuf) -> DefaultResult { Ok(dist_path) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn std_package_path(path: &PathBuf) -> DefaultResult { Ok(get_dist_path(path)?.join(std_dna_file_name(path)?)) } /// Helper method for obtaining the file name of a path as a String -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn file_name_string(path: &PathBuf) -> DefaultResult { let file_name = path .file_name() @@ -108,7 +108,7 @@ pub fn file_name_string(path: &PathBuf) -> DefaultResult { /// Takes in extra contextual info as strings, and returns a bool /// which should indicate whether the caller should continue with execution /// or perform a graceful and early exit -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)] pub fn check_for_cargo(use_case: &str, extra_help: Option>) -> DefaultResult { match Command::new("cargo").stdout(Stdio::null()).status() { // no problems checking, and cargo is installed diff --git a/crates/conductor_api/src/conductor_api.rs b/crates/conductor_api/src/conductor_api.rs index 49e18c2987..0bda571686 100644 --- a/crates/conductor_api/src/conductor_api.rs +++ b/crates/conductor_api/src/conductor_api.rs @@ -10,7 +10,7 @@ use std::{fmt, sync::Arc}; #[derive(Clone)] pub struct ConductorApi(Arc>); -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_API)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_API)] pub fn send_json_rpc( handle: Arc>, payload: String, @@ -49,7 +49,7 @@ pub fn send_json_rpc( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_API)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_API)] impl ConductorApi { pub fn new(conductor_api: Arc>) -> ConductorApi { ConductorApi(conductor_api) diff --git a/crates/conductor_lib/src/conductor/admin.rs b/crates/conductor_lib/src/conductor/admin.rs index 90165210cc..4d35bdc308 100644 --- a/crates/conductor_lib/src/conductor/admin.rs +++ b/crates/conductor_lib/src/conductor/admin.rs @@ -71,7 +71,7 @@ pub trait ConductorAdmin { ) -> Result<(), HolochainError>; } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl ConductorAdmin for Conductor { /// Installs a DNA package from the file system to the conductor /// If copy=true it will also copy the DNA package to the conductors default diff --git a/crates/conductor_lib/src/conductor/base.rs b/crates/conductor_lib/src/conductor/base.rs index 86ebfe9ba3..07e5ce689e 100644 --- a/crates/conductor_lib/src/conductor/base.rs +++ b/crates/conductor_lib/src/conductor/base.rs @@ -169,7 +169,7 @@ pub fn notify(msg: String) { } #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl Conductor { pub fn from_config(config: Configuration) -> Self { lib3h_sodium::check_init(); @@ -1486,7 +1486,7 @@ fn _make_interface(interface_config: &InterfaceConfiguration) -> Box T>( wanted_port: u16, find_free_port: bool, @@ -1502,7 +1502,7 @@ fn with_port_heuristic T>( Ok(try_with_port(port, f)) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] fn run_interface( interface_config: &InterfaceConfiguration, handler: IoHandler, diff --git a/crates/conductor_lib/src/conductor/debug.rs b/crates/conductor_lib/src/conductor/debug.rs index a6ab899945..621af09a21 100644 --- a/crates/conductor_lib/src/conductor/debug.rs +++ b/crates/conductor_lib/src/conductor/debug.rs @@ -13,7 +13,7 @@ pub trait ConductorDebug { ) -> Result<(String, String), HolochainError>; } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl ConductorDebug for Conductor { fn running_instances(&self) -> Result, HolochainError> { Ok(self.instances.keys().cloned().collect()) diff --git a/crates/conductor_lib/src/conductor/passphrase_manager.rs b/crates/conductor_lib/src/conductor/passphrase_manager.rs index bfdbc1361e..ef5b79294d 100644 --- a/crates/conductor_lib/src/conductor/passphrase_manager.rs +++ b/crates/conductor_lib/src/conductor/passphrase_manager.rs @@ -31,7 +31,7 @@ pub struct PassphraseManager { timeout_kill_switch: Sender<()>, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl PassphraseManager { pub fn new(passphrase_service: Arc>) -> Self { let (kill_switch_tx, kill_switch_rx) = unbounded::<()>(); diff --git a/crates/conductor_lib/src/conductor/ui_admin.rs b/crates/conductor_lib/src/conductor/ui_admin.rs index f804632f54..a0cfe09a09 100644 --- a/crates/conductor_lib/src/conductor/ui_admin.rs +++ b/crates/conductor_lib/src/conductor/ui_admin.rs @@ -27,7 +27,7 @@ pub trait ConductorUiAdmin { fn stop_ui_interface(&mut self, id: &String) -> Result<(), HolochainInstanceError>; } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl ConductorUiAdmin for Conductor { fn install_ui_bundle_from_file( &mut self, diff --git a/crates/conductor_lib/src/config.rs b/crates/conductor_lib/src/config.rs index d538521a9b..8df5ce6626 100644 --- a/crates/conductor_lib/src/config.rs +++ b/crates/conductor_lib/src/config.rs @@ -235,7 +235,7 @@ fn detect_dupes<'a, I: Iterator>( } #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl Configuration { /// This function basically checks if self is a semantically valid configuration. /// This mainly means checking for consistency between config structs that reference others. diff --git a/crates/conductor_lib/src/dna_location.rs b/crates/conductor_lib/src/dna_location.rs index a73738a6e5..34303578da 100644 --- a/crates/conductor_lib/src/dna_location.rs +++ b/crates/conductor_lib/src/dna_location.rs @@ -14,7 +14,7 @@ pub enum DnaLocation { Url(Url), } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl DnaLocation { pub fn get_content(&self) -> Result { match self { diff --git a/crates/conductor_lib/src/dpki_instance.rs b/crates/conductor_lib/src/dpki_instance.rs index b416a4ce4f..cda85e7a76 100644 --- a/crates/conductor_lib/src/dpki_instance.rs +++ b/crates/conductor_lib/src/dpki_instance.rs @@ -37,7 +37,7 @@ fn dpki_cap_request( )) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl DpkiInstance for Holochain { /// wrapper for the dpki create_agent_key trait function fn dpki_create_agent_key(&mut self, agent_name: String) -> Result<(), HolochainError> { diff --git a/crates/conductor_lib/src/happ_bundle.rs b/crates/conductor_lib/src/happ_bundle.rs index 0129c7da3f..4a1a34cbfd 100644 --- a/crates/conductor_lib/src/happ_bundle.rs +++ b/crates/conductor_lib/src/happ_bundle.rs @@ -39,7 +39,7 @@ pub struct HappBundleInstanceReference { pub instance_id: String, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl HappBundle { pub fn id_references_are_consistent(&self) -> Result<(), String> { for bridge in self.bridges.iter() { diff --git a/crates/conductor_lib/src/holo_signing_service.rs b/crates/conductor_lib/src/holo_signing_service.rs index 89929bf6b5..d57c5ff459 100644 --- a/crates/conductor_lib/src/holo_signing_service.rs +++ b/crates/conductor_lib/src/holo_signing_service.rs @@ -3,7 +3,7 @@ use holochain_core_types::{agent::AgentId, error::HolochainError}; use holochain_persistence_api::cas::content::AddressableContent; // this could be used for a lot of external callbacks and can be moved to somewhere more general? -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] pub fn request_service( agent_id: &AgentId, payload: &String, diff --git a/crates/conductor_lib/src/holochain.rs b/crates/conductor_lib/src/holochain.rs index b5b461b1ad..e4a6656bf3 100644 --- a/crates/conductor_lib/src/holochain.rs +++ b/crates/conductor_lib/src/holochain.rs @@ -123,7 +123,7 @@ pub struct Holochain { active: bool, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl Holochain { /// create a new Holochain instance. Ensure that they are built w/ the same /// HDK Version, or log a warning. diff --git a/crates/conductor_lib/src/interface.rs b/crates/conductor_lib/src/interface.rs index 2dddb5d330..11014d72a5 100644 --- a/crates/conductor_lib/src/interface.rs +++ b/crates/conductor_lib/src/interface.rs @@ -98,7 +98,7 @@ pub struct ConductorApiBuilder { io: Box, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl ConductorApiBuilder { pub fn new() -> Self { ConductorApiBuilder { diff --git a/crates/conductor_lib/src/interface_impls/http.rs b/crates/conductor_lib/src/interface_impls/http.rs index a2083813cb..ce024feee1 100644 --- a/crates/conductor_lib/src/interface_impls/http.rs +++ b/crates/conductor_lib/src/interface_impls/http.rs @@ -22,7 +22,7 @@ impl HttpInterface { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl Interface for HttpInterface { fn run( &mut self, diff --git a/crates/conductor_lib/src/interface_impls/websocket.rs b/crates/conductor_lib/src/interface_impls/websocket.rs index 75a544bcda..c955237716 100644 --- a/crates/conductor_lib/src/interface_impls/websocket.rs +++ b/crates/conductor_lib/src/interface_impls/websocket.rs @@ -22,7 +22,7 @@ impl WebsocketInterface { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl Interface for WebsocketInterface { fn run( &mut self, diff --git a/crates/conductor_lib/src/keystore.rs b/crates/conductor_lib/src/keystore.rs index bde7a2e0f6..026193d94f 100644 --- a/crates/conductor_lib/src/keystore.rs +++ b/crates/conductor_lib/src/keystore.rs @@ -114,7 +114,7 @@ fn make_passphrase_check( encrypt_with_passphrase_buf(&mut check_buf, passphrase, hash_config) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl Keystore { /// Create a new keystore. /// This will query `passphrase_manager` immediately to set a passphrase for the keystore. diff --git a/crates/conductor_lib/src/port_utils.rs b/crates/conductor_lib/src/port_utils.rs index 24be6c906e..3a680609c7 100644 --- a/crates/conductor_lib/src/port_utils.rs +++ b/crates/conductor_lib/src/port_utils.rs @@ -3,7 +3,7 @@ use std::{ops::Range, thread, time::Duration}; pub const INTERFACE_CONNECT_ATTEMPTS_MAX: usize = 30; pub const INTERFACE_CONNECT_INTERVAL: Duration = Duration::from_secs(1); -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] pub fn try_with_port T>(port: u16, f: F) -> T { let mut attempts = 0; while attempts <= INTERFACE_CONNECT_ATTEMPTS_MAX { @@ -20,13 +20,13 @@ pub fn try_with_port T>(port: u16, f: F) -> T { f() } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] pub fn port_is_available(port: u16) -> bool { use std::net::TcpListener; TcpListener::bind(format!("0.0.0.0:{}", port)).is_ok() } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] pub fn get_free_port(range: Range) -> Option { for i in range { if port_is_available(i) { diff --git a/crates/conductor_lib/src/static_file_server.rs b/crates/conductor_lib/src/static_file_server.rs index 5f74d9e901..6496b0df95 100644 --- a/crates/conductor_lib/src/static_file_server.rs +++ b/crates/conductor_lib/src/static_file_server.rs @@ -6,14 +6,14 @@ use hyper::{http::uri, Request}; pub const DNA_CONFIG_ROUTE: &str = "/_dna_connections.json"; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] pub fn redirect_request_to_root(req: &mut Request) { let mut original_parts: uri::Parts = req.uri().to_owned().into(); original_parts.path_and_query = Some("/".parse().unwrap()); *req.uri_mut() = uri::Uri::from_parts(original_parts).unwrap(); } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] pub fn dna_connections_response(config: &Option) -> serde_json::Value { let interface = match config { Some(config) => json!(config), diff --git a/crates/conductor_lib/src/static_server_impls/nickel_static_server.rs b/crates/conductor_lib/src/static_server_impls/nickel_static_server.rs index 69caaf0b08..873c02a49f 100644 --- a/crates/conductor_lib/src/static_server_impls/nickel_static_server.rs +++ b/crates/conductor_lib/src/static_server_impls/nickel_static_server.rs @@ -21,7 +21,7 @@ pub struct NickelStaticServer { running: bool, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl ConductorStaticFileServer for NickelStaticServer { fn from_configs( config: UiInterfaceConfiguration, diff --git a/crates/core/src/agent/actions/commit.rs b/crates/core/src/agent/actions/commit.rs index ff23985e1d..93db8305d5 100644 --- a/crates/core/src/agent/actions/commit.rs +++ b/crates/core/src/agent/actions/commit.rs @@ -14,7 +14,7 @@ use std::{pin::Pin, sync::Arc}; /// be called from zome api functions and other contexts that don't care about implementation details. /// /// Returns a future that resolves to an ActionResponse. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn commit_entry( entry: Entry, maybe_link_update_delete: Option
, @@ -40,7 +40,7 @@ pub struct CommitFuture { action: ActionWrapper, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for CommitFuture { type Output = Result; diff --git a/crates/core/src/agent/chain_store.rs b/crates/core/src/agent/chain_store.rs index 3861a19e90..daddc0fd85 100644 --- a/crates/core/src/agent/chain_store.rs +++ b/crates/core/src/agent/chain_store.rs @@ -44,7 +44,7 @@ pub enum ChainStoreQueryResult { Headers(Vec), } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl ChainStore { pub fn new(content_storage: Arc>) -> Self { ChainStore { content_storage } @@ -223,7 +223,7 @@ impl ChainStoreIterator { } /// Follows ChainHeader.link through every previous Entry (of any EntryType) in the chain -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Iterator for ChainStoreIterator { type Item = ChainHeader; diff --git a/crates/core/src/agent/state.rs b/crates/core/src/agent/state.rs index e9bf221bdc..9c0ad9598f 100644 --- a/crates/core/src/agent/state.rs +++ b/crates/core/src/agent/state.rs @@ -40,7 +40,7 @@ pub struct AgentState { } #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl AgentState { /// builds a new, empty AgentState pub fn new(chain_store: ChainStore, initial_agent_address: Address) -> AgentState { @@ -182,7 +182,7 @@ impl From for Response { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn create_new_chain_header( entry: &Entry, agent_state: &AgentState, @@ -230,7 +230,7 @@ pub fn create_new_chain_header( /// Create an entry-with-header for a header. /// Since published headers are treated as entries, the header must also /// have its own header! -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn create_entry_with_header_for_header( root_state: &StateWrapper, chain_header: ChainHeader, @@ -265,7 +265,7 @@ pub fn create_entry_with_header_for_header( /// Intended for use inside the reducer, isolated for unit testing. /// callback checks (e.g. validate_commit) happen elsewhere because callback functions cause /// action reduction to hang -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn reduce_commit_entry( agent_state: &mut AgentState, root_state: &State, @@ -297,7 +297,7 @@ fn reduce_commit_entry( ); } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn reduce_prune(agent_state: &mut AgentState, _root_state: &State, action_wrapper: &ActionWrapper) { assert_eq!(action_wrapper.action(), &Action::Prune); @@ -320,7 +320,7 @@ fn reduce_prune(agent_state: &mut AgentState, _root_state: &State, action_wrappe }); } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn reduce_clear_action_response( agent_state: &mut AgentState, _root_state: &State, @@ -338,7 +338,7 @@ fn reduce_clear_action_response( } /// maps incoming action to the correct handler -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn resolve_reducer(action_wrapper: &ActionWrapper) -> Option { match action_wrapper.action() { Action::ClearActionResponse(_) => Some(reduce_clear_action_response), @@ -349,7 +349,7 @@ fn resolve_reducer(action_wrapper: &ActionWrapper) -> Option { } /// Reduce Agent's state according to provided Action -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce( old_state: Arc, root_state: &State, diff --git a/crates/core/src/consistency.rs b/crates/core/src/consistency.rs index 2ceabaec58..96df67d426 100644 --- a/crates/core/src/consistency.rs +++ b/crates/core/src/consistency.rs @@ -95,7 +95,7 @@ pub struct ConsistencyModel { context: Arc, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl ConsistencyModel { pub fn new(context: Arc) -> Self { Self { diff --git a/crates/core/src/context.rs b/crates/core/src/context.rs index 81d00c4f28..b836ca0e76 100644 --- a/crates/core/src/context.rs +++ b/crates/core/src/context.rs @@ -108,7 +108,7 @@ pub struct Context { pub tracer: Arc, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Context { // test_check_conductor_api() is used to inject a conductor_api with a working // mock of agent/sign to be used in tests. diff --git a/crates/core/src/dht/actions/hold_aspect.rs b/crates/core/src/dht/actions/hold_aspect.rs index d1f99d3fd6..850d568b02 100644 --- a/crates/core/src/dht/actions/hold_aspect.rs +++ b/crates/core/src/dht/actions/hold_aspect.rs @@ -18,7 +18,7 @@ pub struct HoldAspectFuture { aspect: EntryAspect, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for HoldAspectFuture { type Output = Result<(), HolochainError>; diff --git a/crates/core/src/dht/actions/queue_holding_workflow.rs b/crates/core/src/dht/actions/queue_holding_workflow.rs index fee4b24cb2..e826f33b74 100644 --- a/crates/core/src/dht/actions/queue_holding_workflow.rs +++ b/crates/core/src/dht/actions/queue_holding_workflow.rs @@ -11,7 +11,7 @@ use std::{ time::{Duration, SystemTime}, }; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn dispatch_queue_holding_workflow( pending: PendingValidation, delay: Option, @@ -23,7 +23,7 @@ pub fn dispatch_queue_holding_workflow( dispatch_action(context.action_channel(), action_wrapper); } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn queue_holding_workflow( pending: PendingValidation, delay: Option, @@ -52,7 +52,7 @@ pub struct QueueHoldingWorkflowFuture { pending: PendingValidation, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for QueueHoldingWorkflowFuture { type Output = (); diff --git a/crates/core/src/dht/actions/remove_queued_holding_workflow.rs b/crates/core/src/dht/actions/remove_queued_holding_workflow.rs index ec12774ce9..889cc89f12 100644 --- a/crates/core/src/dht/actions/remove_queued_holding_workflow.rs +++ b/crates/core/src/dht/actions/remove_queued_holding_workflow.rs @@ -7,7 +7,7 @@ use crate::{ use futures::{future::Future, task::Poll}; use std::{pin::Pin, sync::Arc}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn remove_queued_holding_workflow(pending: PendingValidation, context: Arc) { let action_wrapper = ActionWrapper::new(Action::RemoveQueuedHoldingWorkflow(pending.clone())); dispatch_action(context.action_channel(), action_wrapper.clone()); @@ -19,7 +19,7 @@ pub struct RemoveQueuedHoldingWorkflowFuture { pending: PendingValidation, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for RemoveQueuedHoldingWorkflowFuture { type Output = (); diff --git a/crates/core/src/dht/aspect_map.rs b/crates/core/src/dht/aspect_map.rs index 42fc09add0..4ec2542e2d 100644 --- a/crates/core/src/dht/aspect_map.rs +++ b/crates/core/src/dht/aspect_map.rs @@ -9,7 +9,7 @@ pub type AspectMapBare = HashMap; #[derive(Clone, Debug, Default, PartialEq)] pub struct AspectMap(AspectMapBare); -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl AspectMap { pub fn new() -> Self { Self::default() diff --git a/crates/core/src/dht/dht_inner_reducers.rs b/crates/core/src/dht/dht_inner_reducers.rs index 97e4a8b444..c57ab5fde4 100644 --- a/crates/core/src/dht/dht_inner_reducers.rs +++ b/crates/core/src/dht/dht_inner_reducers.rs @@ -31,7 +31,7 @@ pub(crate) enum LinkModification { } /// Used as the inner function for both commit and hold reducers -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn reduce_store_entry_inner(store: &mut DhtStore, entry: &Entry) -> HcResult<()> { match store.add(entry) { Ok(()) => create_crud_status_eav(&entry.address(), CrudStatus::Live).map(|status_eav| { @@ -43,7 +43,7 @@ pub(crate) fn reduce_store_entry_inner(store: &mut DhtStore, entry: &Entry) -> H } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn reduce_add_remove_link_inner( store: &mut DhtStore, link: &LinkData, @@ -77,7 +77,7 @@ pub(crate) fn reduce_add_remove_link_inner( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn reduce_update_entry_inner( store: &mut DhtStore, old_address: &Address, @@ -93,7 +93,7 @@ pub(crate) fn reduce_update_entry_inner( Ok(new_address.clone()) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn reduce_remove_entry_inner( store: &mut DhtStore, latest_deleted_address: &Address, diff --git a/crates/core/src/dht/dht_reducers.rs b/crates/core/src/dht/dht_reducers.rs index b5d71a8b2c..ad0ed9c65c 100644 --- a/crates/core/src/dht/dht_reducers.rs +++ b/crates/core/src/dht/dht_reducers.rs @@ -23,7 +23,7 @@ type DhtReducer = fn(&DhtStore, &ActionWrapper) -> Option; /// DHT state-slice Reduce entry point. /// Note: Can't block when dispatching action here because we are inside the reduce's mutex -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce(old_store: Arc, action_wrapper: &ActionWrapper) -> Arc { // Get reducer let reducer = match resolve_reducer(action_wrapper) { @@ -40,7 +40,7 @@ pub fn reduce(old_store: Arc, action_wrapper: &ActionWrapper) -> Arc Option { match action_wrapper.action() { Action::Commit(_) => Some(reduce_commit_entry), @@ -52,7 +52,7 @@ fn resolve_reducer(action_wrapper: &ActionWrapper) -> Option { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn reduce_commit_entry( old_store: &DhtStore, action_wrapper: &ActionWrapper, @@ -68,7 +68,7 @@ pub(crate) fn reduce_commit_entry( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn reduce_hold_aspect( old_store: &DhtStore, action_wrapper: &ActionWrapper, @@ -150,7 +150,7 @@ pub(crate) fn reduce_hold_aspect( } #[allow(dead_code)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn reduce_get_links( _old_store: &DhtStore, _action_wrapper: &ActionWrapper, @@ -161,7 +161,7 @@ pub(crate) fn reduce_get_links( #[allow(unknown_lints)] #[allow(clippy::needless_pass_by_value)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_queue_holding_workflow( old_store: &DhtStore, action_wrapper: &ActionWrapper, @@ -194,7 +194,7 @@ pub fn reduce_queue_holding_workflow( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_prune(old_store: &DhtStore, _action_wrapper: &ActionWrapper) -> Option { let pruned_queue = old_store .queued_holding_workflows @@ -219,7 +219,7 @@ pub fn reduce_prune(old_store: &DhtStore, _action_wrapper: &ActionWrapper) -> Op #[allow(unknown_lints)] #[allow(clippy::needless_pass_by_value)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_remove_queued_holding_workflow( old_store: &DhtStore, action_wrapper: &ActionWrapper, diff --git a/crates/core/src/dht/dht_store.rs b/crates/core/src/dht/dht_store.rs index e718a4ed98..75633c25fd 100644 --- a/crates/core/src/dht/dht_store.rs +++ b/crates/core/src/dht/dht_store.rs @@ -95,7 +95,7 @@ impl AddressableContent for DhtStoreSnapshot { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn create_get_links_eavi_query<'a>( address: Address, link_type: Option, @@ -130,7 +130,7 @@ pub fn create_get_links_eavi_query<'a>( )) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl DhtStore { // LifeCycle // ========= diff --git a/crates/core/src/entry/mod.rs b/crates/core/src/entry/mod.rs index 0142c1fc7f..354fee0b0c 100644 --- a/crates/core/src/entry/mod.rs +++ b/crates/core/src/entry/mod.rs @@ -9,7 +9,7 @@ pub trait CanPublish { fn can_publish(&self, context: &Context) -> bool; } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl CanPublish for EntryType { fn can_publish(&self, context: &Context) -> bool { match self { diff --git a/crates/core/src/entry/validation_dependencies.rs b/crates/core/src/entry/validation_dependencies.rs index 995e6d9395..bb2921244c 100644 --- a/crates/core/src/entry/validation_dependencies.rs +++ b/crates/core/src/entry/validation_dependencies.rs @@ -6,7 +6,7 @@ pub trait ValidationDependencies { fn get_validation_dependencies(&self) -> Vec
; } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl ValidationDependencies for EntryWithHeader { fn get_validation_dependencies(&self) -> Vec
{ match &self.entry { diff --git a/crates/core/src/instance.rs b/crates/core/src/instance.rs index addc2b6fac..fcb315d69a 100644 --- a/crates/core/src/instance.rs +++ b/crates/core/src/instance.rs @@ -65,7 +65,7 @@ pub struct Observer { pub static DISPATCH_WITHOUT_CHANNELS: &str = "dispatch called without channels open"; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Instance { /// This is initializing and starting the redux action loop and adding channels to dispatch /// actions and observers to the context diff --git a/crates/core/src/network/actions/custom_send.rs b/crates/core/src/network/actions/custom_send.rs index 52c1c3f297..d06f79b19e 100644 --- a/crates/core/src/network/actions/custom_send.rs +++ b/crates/core/src/network/actions/custom_send.rs @@ -15,7 +15,7 @@ use std::{pin::Pin, sync::Arc, time::SystemTime}; /// This triggers the network module to open a synchronous node-to-node connection /// by sending the given CustomDirectMessage and preparing to receive a response. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn custom_send( to_agent: Address, custom_direct_message: CustomDirectMessage, @@ -50,7 +50,7 @@ pub struct SendResponseFuture { id: String, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for SendResponseFuture { type Output = Result; diff --git a/crates/core/src/network/actions/get_validation_package.rs b/crates/core/src/network/actions/get_validation_package.rs index 087b153d27..7f4736c49c 100644 --- a/crates/core/src/network/actions/get_validation_package.rs +++ b/crates/core/src/network/actions/get_validation_package.rs @@ -19,7 +19,7 @@ use std::{pin::Pin, sync::Arc}; /// /// Returns a future that resolves to Option (or HolochainError). /// If that is None this means that we couldn't get a validation package from the source. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn get_validation_package( header: ChainHeader, context: &Arc, @@ -42,7 +42,7 @@ pub struct GetValidationPackageFuture { address: Address, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for GetValidationPackageFuture { type Output = HcResult>; diff --git a/crates/core/src/network/actions/initialize_network.rs b/crates/core/src/network/actions/initialize_network.rs index 48a012ec59..b0a54d02fc 100644 --- a/crates/core/src/network/actions/initialize_network.rs +++ b/crates/core/src/network/actions/initialize_network.rs @@ -12,7 +12,7 @@ use std::{pin::Pin, sync::Arc}; /// Creates a network proxy object and stores DNA and agent hash in the network state. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn initialize_network(context: &Arc) -> HcResult<()> { let (dna_address, agent_id) = get_dna_and_agent(context).await?; let handler = create_handler(&context, dna_address.to_string()); diff --git a/crates/core/src/network/actions/publish.rs b/crates/core/src/network/actions/publish.rs index 0cd666cfa6..d9136ed63a 100644 --- a/crates/core/src/network/actions/publish.rs +++ b/crates/core/src/network/actions/publish.rs @@ -14,7 +14,7 @@ use std::{pin::Pin, sync::Arc}; /// be called from zome api functions and other contexts that don't care about implementation details. /// /// Returns a future that resolves to an ActionResponse. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn publish(address: Address, context: &Arc) -> HcResult
{ let action_wrapper = ActionWrapper::new(Action::Publish(address)); dispatch_action(context.action_channel(), action_wrapper.clone()); @@ -32,7 +32,7 @@ pub struct PublishFuture { action: ActionWrapper, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for PublishFuture { type Output = HcResult
; diff --git a/crates/core/src/network/actions/publish_header_entry.rs b/crates/core/src/network/actions/publish_header_entry.rs index 079839a0db..8ca2bd4d26 100644 --- a/crates/core/src/network/actions/publish_header_entry.rs +++ b/crates/core/src/network/actions/publish_header_entry.rs @@ -11,7 +11,7 @@ use std::{pin::Pin, sync::Arc}; /// Publish Header Entry Action Creator /// Returns a future that resolves to an ActionResponse. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn publish_header_entry(address: Address, context: &Arc) -> HcResult
{ let action_wrapper = ActionWrapper::new(Action::PublishHeaderEntry(address)); dispatch_action(context.action_channel(), action_wrapper.clone()); @@ -29,7 +29,7 @@ pub struct PublishHeaderEntryFuture { action: ActionWrapper, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for PublishHeaderEntryFuture { type Output = HcResult
; diff --git a/crates/core/src/network/actions/query.rs b/crates/core/src/network/actions/query.rs index 3a9038b53b..53fd5fc2d9 100644 --- a/crates/core/src/network/actions/query.rs +++ b/crates/core/src/network/actions/query.rs @@ -29,7 +29,7 @@ pub enum QueryMethod { Link(GetLinksArgs, GetLinksNetworkQuery), } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn query( context: Arc, method: QueryMethod, @@ -84,7 +84,7 @@ pub struct QueryFuture { key: QueryKey, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for QueryFuture { type Output = HcResult; diff --git a/crates/core/src/network/actions/shutdown.rs b/crates/core/src/network/actions/shutdown.rs index b09459955d..f6e94d0c36 100644 --- a/crates/core/src/network/actions/shutdown.rs +++ b/crates/core/src/network/actions/shutdown.rs @@ -13,7 +13,7 @@ use std::{pin::Pin, sync::Arc}; /// Shutdown the network /// This tells the network to untrack this instance and then stops the network thread /// and sets the P2pNetwork instance in the state to None. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn shutdown( state: Arc>, action_channel: &ActionSender, @@ -33,7 +33,7 @@ pub struct ShutdownFuture { state: Arc>, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for ShutdownFuture { type Output = HcResult<()>; diff --git a/crates/core/src/network/entry_with_header.rs b/crates/core/src/network/entry_with_header.rs index 36c3379fde..ba033b694c 100644 --- a/crates/core/src/network/entry_with_header.rs +++ b/crates/core/src/network/entry_with_header.rs @@ -12,7 +12,7 @@ pub struct EntryWithHeader { pub header: ChainHeader, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl EntryWithHeader { pub fn new(entry: Entry, header: ChainHeader) -> EntryWithHeader { EntryWithHeader { entry, header } diff --git a/crates/core/src/network/handler/fetch.rs b/crates/core/src/network/handler/fetch.rs index 3c20ceee33..98282f534c 100644 --- a/crates/core/src/network/handler/fetch.rs +++ b/crates/core/src/network/handler/fetch.rs @@ -13,7 +13,7 @@ use std::{collections::HashSet, sync::Arc}; /// The network has requested a DHT entry from us. /// Lets try to get it and trigger a response. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_fetch_entry(get_dht_data: FetchEntryData, context: Arc) { let address = get_dht_data.entry_address.clone(); let mut aspects: HashSet = HashSet::new(); diff --git a/crates/core/src/network/handler/lists.rs b/crates/core/src/network/handler/lists.rs index efa918ce25..c1964651e7 100644 --- a/crates/core/src/network/handler/lists.rs +++ b/crates/core/src/network/handler/lists.rs @@ -19,7 +19,7 @@ use lib3h_protocol::{ use std::sync::Arc; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_get_authoring_list(get_list_data: GetListData, context: Arc) { let c = context.clone(); let closure = async move || { @@ -38,7 +38,7 @@ pub fn handle_get_authoring_list(get_list_data: GetListData, context: Arc) -> AspectMap { let mut address_map: AspectMapBare = AspectMapBare::new(); for entry_address in get_all_public_chain_entries(context.clone()) { @@ -110,7 +110,7 @@ fn create_authoring_map(context: Arc) -> AspectMap { address_map.into() } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_all_public_chain_entries(context: Arc) -> Vec
{ let chain = context.state().unwrap().agent().iter_chain(); chain @@ -119,7 +119,7 @@ fn get_all_public_chain_entries(context: Arc) -> Vec
{ .collect() } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_get_gossip_list(get_list_data: GetListData, context: Arc) { let c = context.clone(); let closure = async move || { diff --git a/crates/core/src/network/handler/mod.rs b/crates/core/src/network/handler/mod.rs index 310566e599..c3433d0a29 100644 --- a/crates/core/src/network/handler/mod.rs +++ b/crates/core/src/network/handler/mod.rs @@ -128,7 +128,7 @@ fn handle_failure_result( /// Creates the network handler. /// The returned closure is called by the network thread for every network event that core /// has to handle. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn create_handler(c: &Arc, my_dna_address: String) -> NetHandler { let context = c.clone(); NetHandler::new(Box::new(move |message| { @@ -300,7 +300,7 @@ pub fn create_handler(c: &Arc, my_dna_address: String) -> NetHandler { /// NB: this can be optimized by starting with a CAS lookup for the entry directly, /// to avoid traversing the chain unnecessarily in the case of a miss /// (https://github.com/holochain/holochain-rust/pull/1727#discussion_r330258624) -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_content_aspect( entry_address: &Address, context: Arc, @@ -391,7 +391,7 @@ fn get_content_aspect( /// base address to which it is meta, if the entry is the source entry of a meta aspect, /// i.e. a CRUD or link entry. /// If the entry is not that it returns None. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn entry_to_meta_aspect(entry: Entry, header: ChainHeader) -> Option<(Address, EntryAspect)> { match entry { Entry::App(app_type, app_value) => header.link_update_delete().map(|updated_entry| { @@ -416,7 +416,7 @@ fn entry_to_meta_aspect(entry: Entry, header: ChainHeader) -> Option<(Address, E } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_meta_aspects_from_chain( entry_address: &Address, context: Arc, @@ -451,7 +451,7 @@ fn get_meta_aspects_from_chain( .collect::>()) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_meta_aspects_from_dht_eav( entry_address: &Address, context: Arc, diff --git a/crates/core/src/network/handler/query.rs b/crates/core/src/network/handler/query.rs index c40a241778..1aa405dd29 100644 --- a/crates/core/src/network/handler/query.rs +++ b/crates/core/src/network/handler/query.rs @@ -25,7 +25,7 @@ use lib3h_protocol::data_types::{QueryEntryData, QueryEntryResultData}; use std::{convert::TryInto, sync::Arc}; pub type LinkTag = String; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_links( context: &Arc, base: Address, @@ -138,7 +138,7 @@ fn get_links( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_entry(context: &Arc, address: Address) -> Option { nucleus::actions::get_entry::get_entry_with_meta(&context, address.clone()) .map(|entry_with_meta_opt| { @@ -177,7 +177,7 @@ fn get_entry(context: &Arc, address: Address) -> Option) { let query_json = JsonString::from_json(&std::str::from_utf8(&*query_data.query.clone()).unwrap()); @@ -233,7 +233,7 @@ pub fn handle_query_entry_data(query_data: QueryEntryData, context: Arc /// The network comes back with a result to our previous query with a result, so we /// examine the query result for its type and dispatch different actions according to variant #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_query_entry_result(query_result_data: QueryEntryResultData, context: Arc) { let query_result_json = JsonString::from_json( std::str::from_utf8(&*query_result_data.clone().query_result).unwrap(), diff --git a/crates/core/src/network/handler/send.rs b/crates/core/src/network/handler/send.rs index effb9328a1..a72f2dd2bb 100644 --- a/crates/core/src/network/handler/send.rs +++ b/crates/core/src/network/handler/send.rs @@ -15,7 +15,7 @@ use lib3h_protocol::data_types::DirectMessageData; use std::convert::TryFrom; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn parse_direct_message(content: &[u8]) -> Result { DirectMessage::try_from(JsonString::from_json( std::str::from_utf8(content) @@ -26,7 +26,7 @@ fn parse_direct_message(content: &[u8]) -> Result { /// We got a ProtocolWrapper::SendMessage, this means somebody initiates message roundtrip /// -> we are being called #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_send_message(message_data: DirectMessageData, context: Arc) { let message = match parse_direct_message(&*message_data.content.clone()) { Ok(message) => message, @@ -86,7 +86,7 @@ pub fn handle_send_message(message_data: DirectMessageData, context: Arc) { let response = match parse_direct_message(&message_data.content.clone()) { Ok(message) => message, diff --git a/crates/core/src/network/handler/store.rs b/crates/core/src/network/handler/store.rs index 7fc84897ad..0ed0435734 100644 --- a/crates/core/src/network/handler/store.rs +++ b/crates/core/src/network/handler/store.rs @@ -15,7 +15,7 @@ use std::{ /// The network requests us to store (i.e. hold) the given entry aspect data. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_store(dht_data: StoreEntryAspectData, context: Arc) { let aspect_json = JsonString::from_json(std::str::from_utf8(&*dht_data.entry_aspect.aspect).unwrap()); diff --git a/crates/core/src/network/reducers/clear.rs b/crates/core/src/network/reducers/clear.rs index 114af8eaef..1b8b3a8958 100644 --- a/crates/core/src/network/reducers/clear.rs +++ b/crates/core/src/network/reducers/clear.rs @@ -4,7 +4,7 @@ use crate::{ state::State, }; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_clear_query_result( network_state: &mut NetworkState, _root_state: &State, @@ -15,7 +15,7 @@ pub fn reduce_clear_query_result( network_state.get_query_results.remove(query_key); } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_clear_validation_package_result( network_state: &mut NetworkState, _root_state: &State, @@ -26,7 +26,7 @@ pub fn reduce_clear_validation_package_result( network_state.get_validation_package_results.remove(address); } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_clear_custom_send_response( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/clear_action_response.rs b/crates/core/src/network/reducers/clear_action_response.rs index 6c9128b796..d0c47a21bc 100644 --- a/crates/core/src/network/reducers/clear_action_response.rs +++ b/crates/core/src/network/reducers/clear_action_response.rs @@ -4,7 +4,7 @@ use crate::{ state::State, }; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_clear_action_response( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/get_validation_package.rs b/crates/core/src/network/reducers/get_validation_package.rs index c825645a7c..c75a853fa9 100644 --- a/crates/core/src/network/reducers/get_validation_package.rs +++ b/crates/core/src/network/reducers/get_validation_package.rs @@ -10,7 +10,7 @@ use std::time::{Duration, SystemTime}; // Should probably also be configurable via config or env vars const GET_VALIDATION_PACKAGE_MESSAGE_TIMEOUT_MS: u64 = 10000; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn inner(network_state: &mut NetworkState, header: &ChainHeader) -> Result<(), HolochainError> { network_state.initialized()?; @@ -23,7 +23,7 @@ fn inner(network_state: &mut NetworkState, header: &ChainHeader) -> Result<(), H send_message(network_state, source_address, direct_message) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_get_validation_package( network_state: &mut NetworkState, _root_state: &State, @@ -50,7 +50,7 @@ pub fn reduce_get_validation_package( .get_validation_package_timeouts .insert(entry_address, timeout); } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_get_validation_package_timeout( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/handle_custom_send_response.rs b/crates/core/src/network/reducers/handle_custom_send_response.rs index ef9636bb31..fa814f0ca5 100644 --- a/crates/core/src/network/reducers/handle_custom_send_response.rs +++ b/crates/core/src/network/reducers/handle_custom_send_response.rs @@ -2,7 +2,7 @@ use crate::{action::ActionWrapper, network::state::NetworkState, state::State}; use holochain_core_types::error::HolochainError; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_handle_custom_send_response( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/handle_get_result.rs b/crates/core/src/network/reducers/handle_get_result.rs index b1db6a414c..07e7f0f78c 100644 --- a/crates/core/src/network/reducers/handle_get_result.rs +++ b/crates/core/src/network/reducers/handle_get_result.rs @@ -1,5 +1,5 @@ use crate::{action::ActionWrapper, network::state::NetworkState, state::State}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_handle_get_result( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/handle_get_validation_package.rs b/crates/core/src/network/reducers/handle_get_validation_package.rs index 012cebe8dc..5a74fd4a8c 100644 --- a/crates/core/src/network/reducers/handle_get_validation_package.rs +++ b/crates/core/src/network/reducers/handle_get_validation_package.rs @@ -1,6 +1,6 @@ use crate::{action::ActionWrapper, network::state::NetworkState, state::State}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_handle_get_validation_package( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/init.rs b/crates/core/src/network/reducers/init.rs index fc39121a13..6ca9d07c7d 100644 --- a/crates/core/src/network/reducers/init.rs +++ b/crates/core/src/network/reducers/init.rs @@ -11,7 +11,7 @@ use lib3h_protocol::{data_types::SpaceData, protocol_client::Lib3hClientProtocol use log::{debug, error, info}; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_init(state: &mut NetworkState, root_state: &State, action_wrapper: &ActionWrapper) { let action = action_wrapper.action(); let network_settings = unwrap_to!(action => Action::InitNetwork); diff --git a/crates/core/src/network/reducers/mod.rs b/crates/core/src/network/reducers/mod.rs index 0902db3ad0..72d79992e8 100644 --- a/crates/core/src/network/reducers/mod.rs +++ b/crates/core/src/network/reducers/mod.rs @@ -63,7 +63,7 @@ use std::sync::Arc; /// maps incoming action to the correct handler #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn resolve_reducer(action_wrapper: &ActionWrapper) -> Option { match action_wrapper.action() { Action::ClearActionResponse(_) => Some(reduce_clear_action_response), @@ -94,7 +94,7 @@ fn resolve_reducer(action_wrapper: &ActionWrapper) -> Option { } #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce( old_state: Arc, root_state: &State, @@ -114,7 +114,7 @@ pub fn reduce( /// Sends the given Lib3hClientProtocol over the network using the network proxy instance /// that lives in the NetworkState. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn send( network_state: &mut NetworkState, msg: Lib3hClientProtocol, @@ -141,7 +141,7 @@ pub fn send( /// request-response pattern. This function therefore logs the open connection /// (expecting a response) in network_state.direct_message_connections. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn send_message( network_state: &mut NetworkState, to_agent_id: &Address, diff --git a/crates/core/src/network/reducers/prune.rs b/crates/core/src/network/reducers/prune.rs index b1fb29f14a..83ea2b8ab8 100644 --- a/crates/core/src/network/reducers/prune.rs +++ b/crates/core/src/network/reducers/prune.rs @@ -5,7 +5,7 @@ use crate::{ }; use std::time::Duration; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_prune( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/publish.rs b/crates/core/src/network/reducers/publish.rs index 538ad816e3..5161cfc44c 100644 --- a/crates/core/src/network/reducers/publish.rs +++ b/crates/core/src/network/reducers/publish.rs @@ -24,7 +24,7 @@ use lib3h_protocol::{ use crate::network::actions::Response; use holochain_persistence_api::cas::content::{Address, AddressableContent}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn entry_data_to_entry_aspect_data(ea: &EntryAspect) -> EntryAspectData { let type_hint = ea.type_hint(); let aspect_address = ea.address(); @@ -39,7 +39,7 @@ pub fn entry_data_to_entry_aspect_data(ea: &EntryAspect) -> EntryAspectData { } /// Send to network a PublishDhtData message -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn publish_entry( network_state: &mut NetworkState, entry_with_header: &EntryWithHeader, @@ -61,7 +61,7 @@ fn publish_entry( } /// Send to network a publish request for either delete or update aspect information -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn publish_update_delete_meta( network_state: &mut NetworkState, orig_entry_address: Address, @@ -101,7 +101,7 @@ fn publish_update_delete_meta( } /// Send to network a PublishMeta message holding a link metadata to `entry_with_header` -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn publish_link_meta( network_state: &mut NetworkState, entry_with_header: &EntryWithHeader, @@ -138,7 +138,7 @@ fn publish_link_meta( ) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn reduce_publish_inner( network_state: &mut NetworkState, root_state: &State, @@ -183,7 +183,7 @@ fn reduce_publish_inner( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_publish( network_state: &mut NetworkState, root_state: &State, diff --git a/crates/core/src/network/reducers/publish_header_entry.rs b/crates/core/src/network/reducers/publish_header_entry.rs index 2fab67d3d0..3ff6c5df66 100644 --- a/crates/core/src/network/reducers/publish_header_entry.rs +++ b/crates/core/src/network/reducers/publish_header_entry.rs @@ -21,7 +21,7 @@ use holochain_persistence_api::cas::content::{Address, AddressableContent}; /// Send to network a request to publish a header entry alone /// This is similar to publishing a regular entry but it has its own special dummy header. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn publish_header( network_state: &mut NetworkState, root_state: &State, @@ -44,7 +44,7 @@ fn publish_header( ) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn reduce_publish_header_entry_inner( network_state: &mut NetworkState, root_state: &State, @@ -55,7 +55,7 @@ fn reduce_publish_header_entry_inner( publish_header(network_state, root_state, entry_with_header.header) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_publish_header_entry( network_state: &mut NetworkState, root_state: &State, diff --git a/crates/core/src/network/reducers/query.rs b/crates/core/src/network/reducers/query.rs index c13fbd26c4..cc3a5cebe5 100644 --- a/crates/core/src/network/reducers/query.rs +++ b/crates/core/src/network/reducers/query.rs @@ -7,7 +7,7 @@ use holochain_core_types::error::HolochainError; use holochain_json_api::json::JsonString; use lib3h_protocol::{data_types::QueryEntryData, protocol_client::Lib3hClientProtocol}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn reduce_query_inner( network_state: &mut NetworkState, key: QueryKey, @@ -31,7 +31,7 @@ fn reduce_query_inner( ) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_query( network_state: &mut NetworkState, _root_state: &State, @@ -61,7 +61,7 @@ pub fn reduce_query( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_query_timeout( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/resolve_direct_connection.rs b/crates/core/src/network/reducers/resolve_direct_connection.rs index f52fb77674..4d4303c6a0 100644 --- a/crates/core/src/network/reducers/resolve_direct_connection.rs +++ b/crates/core/src/network/reducers/resolve_direct_connection.rs @@ -1,6 +1,6 @@ use crate::{action::ActionWrapper, network::state::NetworkState, state::State}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_resolve_direct_connection( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/respond_authoring_list.rs b/crates/core/src/network/reducers/respond_authoring_list.rs index 1600f9e8dd..9e9b233e29 100644 --- a/crates/core/src/network/reducers/respond_authoring_list.rs +++ b/crates/core/src/network/reducers/respond_authoring_list.rs @@ -5,7 +5,7 @@ use crate::{ }; use lib3h_protocol::protocol_client::Lib3hClientProtocol; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_respond_authoring_list( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/respond_fetch.rs b/crates/core/src/network/reducers/respond_fetch.rs index 05b1f4e11a..9008171fa8 100644 --- a/crates/core/src/network/reducers/respond_fetch.rs +++ b/crates/core/src/network/reducers/respond_fetch.rs @@ -18,7 +18,7 @@ use lib3h_protocol::{ /// Send back to network a HandleFetchEntryResult, no matter what. /// Will return an empty content field if it actually doesn't have the data. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn reduce_respond_fetch_data_inner( network_state: &mut NetworkState, fetch_data: &FetchEntryData, @@ -42,7 +42,7 @@ fn reduce_respond_fetch_data_inner( ) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_respond_fetch_data( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/respond_gossip_list.rs b/crates/core/src/network/reducers/respond_gossip_list.rs index 2a58dedca9..4f98e8528b 100644 --- a/crates/core/src/network/reducers/respond_gossip_list.rs +++ b/crates/core/src/network/reducers/respond_gossip_list.rs @@ -5,7 +5,7 @@ use crate::{ }; use lib3h_protocol::protocol_client::Lib3hClientProtocol; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_respond_gossip_list( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/respond_query.rs b/crates/core/src/network/reducers/respond_query.rs index 3a9ea8b873..bf7afa1681 100644 --- a/crates/core/src/network/reducers/respond_query.rs +++ b/crates/core/src/network/reducers/respond_query.rs @@ -15,7 +15,7 @@ use lib3h_protocol::{ protocol_client::Lib3hClientProtocol, }; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn reduce_respond_query_inner( network_state: &mut NetworkState, network_query_result: &NetworkQueryResult, diff --git a/crates/core/src/network/reducers/send_direct_message.rs b/crates/core/src/network/reducers/send_direct_message.rs index 68e47a5cae..7a1ddf8fa1 100644 --- a/crates/core/src/network/reducers/send_direct_message.rs +++ b/crates/core/src/network/reducers/send_direct_message.rs @@ -10,7 +10,7 @@ use lib3h_protocol::{ }; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn inner( network_state: &mut NetworkState, direct_message_data: &DirectMessageData, @@ -40,7 +40,7 @@ fn inner( } #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_send_direct_message( network_state: &mut NetworkState, _root_state: &State, @@ -58,7 +58,7 @@ pub fn reduce_send_direct_message( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_send_direct_message_timeout( network_state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/reducers/shutdown.rs b/crates/core/src/network/reducers/shutdown.rs index ff135e03e8..963eeeae78 100644 --- a/crates/core/src/network/reducers/shutdown.rs +++ b/crates/core/src/network/reducers/shutdown.rs @@ -11,7 +11,7 @@ use log::error; use std::{thread::sleep, time::Duration}; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_shutdown( state: &mut NetworkState, _root_state: &State, diff --git a/crates/core/src/network/state.rs b/crates/core/src/network/state.rs index 606ff80911..18933e67fa 100644 --- a/crates/core/src/network/state.rs +++ b/crates/core/src/network/state.rs @@ -57,7 +57,7 @@ impl PartialEq for NetworkState { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl NetworkState { pub fn new() -> Self { NetworkState { diff --git a/crates/core/src/nucleus/actions/build_validation_package.rs b/crates/core/src/nucleus/actions/build_validation_package.rs index e413cdeeb3..480d342add 100644 --- a/crates/core/src/nucleus/actions/build_validation_package.rs +++ b/crates/core/src/nucleus/actions/build_validation_package.rs @@ -17,7 +17,7 @@ use holochain_core_types::{ }; use std::{sync::Arc, vec::Vec}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn build_validation_package<'a>( entry: &'a Entry, context: Arc, @@ -150,7 +150,7 @@ pub fn build_validation_package<'a>( } // given a slice of headers return the entries for those marked public -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn public_chain_entries_from_headers( context: &Arc, headers: &[ChainHeader], @@ -171,7 +171,7 @@ fn public_chain_entries_from_headers( .collect::>() } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn all_chain_headers_before_header( context: &Arc, header: &ChainHeader, diff --git a/crates/core/src/nucleus/actions/call_init.rs b/crates/core/src/nucleus/actions/call_init.rs index f00d56a4e3..2b5e532ef9 100644 --- a/crates/core/src/nucleus/actions/call_init.rs +++ b/crates/core/src/nucleus/actions/call_init.rs @@ -9,7 +9,7 @@ use holochain_core_types::{ use std::sync::Arc; /// Creates a network proxy object and stores DNA and agent hash in the network state. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn call_init(dna: Dna, context: &Arc) -> HcResult<()> { // map init across every zome. Find which zomes init callback errored, if any let errors: Vec<(String, String)> = dna diff --git a/crates/core/src/nucleus/actions/call_zome_function.rs b/crates/core/src/nucleus/actions/call_zome_function.rs index 187b4e5a72..0d0fd44f2c 100644 --- a/crates/core/src/nucleus/actions/call_zome_function.rs +++ b/crates/core/src/nucleus/actions/call_zome_function.rs @@ -32,7 +32,7 @@ pub struct ExecuteZomeFnResponse { result: ZomeFnResult, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl ExecuteZomeFnResponse { pub fn new(call: ZomeFnCall, result: Result) -> Self { ExecuteZomeFnResponse { call, result } @@ -63,7 +63,7 @@ impl ExecuteZomeFnResponse { /// /// Use Context::block_on to wait for the call result. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn call_zome_function( zome_call: ZomeFnCall, context: Arc, @@ -107,7 +107,7 @@ pub async fn call_zome_function( } /// validates that a given zome function call specifies a correct zome function and capability grant -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn validate_call( context: Arc, fn_call: &ZomeFnCall, @@ -145,12 +145,12 @@ pub fn validate_call( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn is_token_the_agent(context: Arc, request: &CapabilityRequest) -> bool { context.agent_id.pub_sign_key == request.cap_token.to_string() } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_grant(context: &Arc, address: &Address) -> Option { match get_entry_from_agent_chain(context, address).ok()?? { Entry::CapTokenGrant(grant) => Some(grant), @@ -160,7 +160,7 @@ fn get_grant(context: &Arc, address: &Address) -> Option /// checks to see if a given function call is allowable according to the capabilities /// that have been registered to callers by looking for grants in the chain. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn check_capability(context: Arc, fn_call: &ZomeFnCall) -> bool { let maybe_grant = get_grant(&context.clone(), &fn_call.cap_token()); match maybe_grant { @@ -169,13 +169,13 @@ pub fn check_capability(context: Arc, fn_call: &ZomeFnCall) -> bool { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn encode_call_data_for_signing>(function: &str, parameters: J) -> String { base64::encode(&format!("{}:{}", function, parameters.into())) } // temporary function to create a mock signature of for a zome call cap request -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn make_call_sig>( context: Arc, function: &str, @@ -191,7 +191,7 @@ fn make_call_sig>( } // temporary function to verify a mock signature of for a zome call cap request -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn verify_call_sig>( provenance: &Provenance, function: &str, @@ -202,7 +202,7 @@ pub fn verify_call_sig>( } /// creates a capability request for a zome call by signing the function name and parameters -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn make_cap_request_for_call>( callers_context: Arc, cap_token: Address, @@ -217,7 +217,7 @@ pub fn make_cap_request_for_call>( } /// verifies that this grant is valid for a given requester and token value -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn verify_grant(context: Arc, grant: &CapTokenGrant, fn_call: &ZomeFnCall) -> bool { let cap_functions = grant.functions(); let maybe_zome_grants = cap_functions.get(&fn_call.zome_name); @@ -284,7 +284,7 @@ pub fn verify_grant(context: Arc, grant: &CapTokenGrant, fn_call: &Zome } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn spawn_zome_function(context: Arc, zome_call: ZomeFnCall) { std::thread::Builder::new() .name(format!("{:?}", zome_call)) @@ -327,7 +327,7 @@ pub struct CallResultFuture { } impl Unpin for CallResultFuture {} -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for CallResultFuture { type Output = Result; diff --git a/crates/core/src/nucleus/actions/get_entry.rs b/crates/core/src/nucleus/actions/get_entry.rs index ee29ceadc8..03a2a0f212 100644 --- a/crates/core/src/nucleus/actions/get_entry.rs +++ b/crates/core/src/nucleus/actions/get_entry.rs @@ -8,7 +8,7 @@ use holochain_core_types::{ use holochain_persistence_api::{cas::content::Address, eav::IndexFilter}; use std::{collections::BTreeSet, str::FromStr, sync::Arc}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn get_entry_from_agent_chain( context: &Arc, address: &Address, @@ -26,7 +26,7 @@ pub fn get_entry_from_agent_chain( agent.chain_store().get(address) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn get_entry_from_dht( context: &Arc, address: &Address, @@ -34,7 +34,7 @@ pub(crate) fn get_entry_from_dht( context.state().unwrap().dht().get(address) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn get_entry_crud_meta_from_dht( context: &Arc, address: &Address, @@ -98,7 +98,7 @@ pub(crate) fn get_entry_crud_meta_from_dht( Ok(Some((crud_status, maybe_link_update_delete))) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn get_entry_with_meta( context: &Arc, address: Address, diff --git a/crates/core/src/nucleus/actions/initialize.rs b/crates/core/src/nucleus/actions/initialize.rs index 3b9a0c50af..975b68f12b 100644 --- a/crates/core/src/nucleus/actions/initialize.rs +++ b/crates/core/src/nucleus/actions/initialize.rs @@ -28,7 +28,7 @@ pub struct Initialization { payload: Option, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Initialization { pub fn new() -> Initialization { Initialization::default() @@ -51,7 +51,7 @@ const INITIALIZATION_TIMEOUT: u64 = 60; /// /// Use futures::executor::block_on to wait for an initialized instance. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn initialize_chain( dna: Dna, context: &Arc, @@ -191,7 +191,7 @@ pub struct InitializingFuture { context: Arc, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for InitializingFuture { type Output = Result; @@ -229,7 +229,7 @@ pub struct InitializationFuture { created_at: Instant, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Future for InitializationFuture { type Output = Result; diff --git a/crates/core/src/nucleus/actions/run_validation_callback.rs b/crates/core/src/nucleus/actions/run_validation_callback.rs index 06f5af313c..e7a7aa6f1f 100644 --- a/crates/core/src/nucleus/actions/run_validation_callback.rs +++ b/crates/core/src/nucleus/actions/run_validation_callback.rs @@ -18,7 +18,6 @@ use holochain_metrics::with_latency_publishing; /// Dispatches an `Action::ReturnValidationResult` after completion of the WASM call. /// Returns a future that waits for the result to appear in the nucleus state. #[no_autotrace] // TODO: get autotrace working for this future -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn run_validation_callback( _address: Address, call: CallbackFnCall, diff --git a/crates/core/src/nucleus/reducers/clear_zome_function_call.rs b/crates/core/src/nucleus/reducers/clear_zome_function_call.rs index d357989d23..ab9a18f303 100644 --- a/crates/core/src/nucleus/reducers/clear_zome_function_call.rs +++ b/crates/core/src/nucleus/reducers/clear_zome_function_call.rs @@ -4,7 +4,7 @@ use crate::{ state::State, }; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_clear_zome_function_call( nucleus_state: &mut NucleusState, _root_state: &State, diff --git a/crates/core/src/nucleus/reducers/init_application.rs b/crates/core/src/nucleus/reducers/init_application.rs index 2f6499ca52..5f18472206 100644 --- a/crates/core/src/nucleus/reducers/init_application.rs +++ b/crates/core/src/nucleus/reducers/init_application.rs @@ -9,7 +9,7 @@ use crate::{ /// already initialized, or initializing instance. #[allow(unknown_lints)] #[allow(clippy::needless_pass_by_value)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_initialize_chain( state: &mut NucleusState, _root_state: &State, diff --git a/crates/core/src/nucleus/reducers/queue_zome_function_call.rs b/crates/core/src/nucleus/reducers/queue_zome_function_call.rs index af09088416..c1de4d04c6 100644 --- a/crates/core/src/nucleus/reducers/queue_zome_function_call.rs +++ b/crates/core/src/nucleus/reducers/queue_zome_function_call.rs @@ -10,7 +10,7 @@ use crate::{ /// the entry's address. #[allow(unknown_lints)] #[allow(clippy::needless_pass_by_value)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_queue_zome_function_call( state: &mut NucleusState, _root_state: &State, diff --git a/crates/core/src/nucleus/reducers/return_initialization_result.rs b/crates/core/src/nucleus/reducers/return_initialization_result.rs index 9942f4ba80..883cac6d5b 100644 --- a/crates/core/src/nucleus/reducers/return_initialization_result.rs +++ b/crates/core/src/nucleus/reducers/return_initialization_result.rs @@ -9,7 +9,7 @@ use crate::{ /// otherwise set the failed message #[allow(unknown_lints)] #[allow(clippy::needless_pass_by_value)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_return_initialization_result( state: &mut NucleusState, _root_state: &State, diff --git a/crates/core/src/nucleus/reducers/return_zome_function_result.rs b/crates/core/src/nucleus/reducers/return_zome_function_result.rs index fd4bd84b28..47743b717c 100644 --- a/crates/core/src/nucleus/reducers/return_zome_function_result.rs +++ b/crates/core/src/nucleus/reducers/return_zome_function_result.rs @@ -6,7 +6,7 @@ use crate::{ /// Reduce ReturnZomeFunctionResult Action. /// Simply drops function call into zome_calls state. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_return_zome_function_result( state: &mut NucleusState, _root_state: &State, diff --git a/crates/core/src/nucleus/state.rs b/crates/core/src/nucleus/state.rs index c96f0d7d33..69a811e6ba 100644 --- a/crates/core/src/nucleus/state.rs +++ b/crates/core/src/nucleus/state.rs @@ -107,7 +107,7 @@ pub struct NucleusState { pub zome_call_results: HashMap>, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl NucleusState { pub fn new() -> Self { NucleusState { diff --git a/crates/core/src/nucleus/validation/agent_entry.rs b/crates/core/src/nucleus/validation/agent_entry.rs index 2f849ccaeb..57fee6699f 100644 --- a/crates/core/src/nucleus/validation/agent_entry.rs +++ b/crates/core/src/nucleus/validation/agent_entry.rs @@ -17,7 +17,7 @@ use holochain_wasm_utils::api_serialization::validation::AgentIdValidationArgs; use futures::{future, future::FutureExt}; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn validate_agent_entry( entry: Entry, validation_data: ValidationData, diff --git a/crates/core/src/nucleus/validation/app_entry.rs b/crates/core/src/nucleus/validation/app_entry.rs index 8013545e26..5a9754d65d 100644 --- a/crates/core/src/nucleus/validation/app_entry.rs +++ b/crates/core/src/nucleus/validation/app_entry.rs @@ -17,7 +17,7 @@ use holochain_persistence_api::cas::content::{Address, AddressableContent}; use holochain_wasm_utils::api_serialization::validation::EntryValidationArgs; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn validate_app_entry( entry: Entry, app_entry_type: AppEntryType, diff --git a/crates/core/src/nucleus/validation/build_from_dht.rs b/crates/core/src/nucleus/validation/build_from_dht.rs index a39e8df8cd..01ce2a8eff 100644 --- a/crates/core/src/nucleus/validation/build_from_dht.rs +++ b/crates/core/src/nucleus/validation/build_from_dht.rs @@ -14,7 +14,7 @@ use std::sync::Arc; const GET_TIMEOUT_MS: usize = 1000; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] async fn all_chain_headers_before_header_dht( context: Arc, header: &ChainHeader, diff --git a/crates/core/src/nucleus/validation/header_address.rs b/crates/core/src/nucleus/validation/header_address.rs index 31507e565b..12563da5e6 100644 --- a/crates/core/src/nucleus/validation/header_address.rs +++ b/crates/core/src/nucleus/validation/header_address.rs @@ -4,7 +4,7 @@ use holochain_core_types::{chain_header::ChainHeader, entry::Entry}; use holochain_persistence_api::cas::content::AddressableContent; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn validate_header_address(entry: &Entry, header: &ChainHeader) -> ValidationResult { (entry.address() == *header.entry_address()) .ok_or(ValidationError::Fail("Wrong header for entry".to_string())) diff --git a/crates/core/src/nucleus/validation/link_entry.rs b/crates/core/src/nucleus/validation/link_entry.rs index 2ed1050c4a..74ee1c20d4 100644 --- a/crates/core/src/nucleus/validation/link_entry.rs +++ b/crates/core/src/nucleus/validation/link_entry.rs @@ -18,7 +18,7 @@ use holochain_persistence_api::cas::content::AddressableContent; use holochain_wasm_utils::api_serialization::validation::{LinkDirection, LinkValidationArgs}; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn validate_link_entry( entry: Entry, validation_data: ValidationData, diff --git a/crates/core/src/nucleus/validation/mod.rs b/crates/core/src/nucleus/validation/mod.rs index e3e84a6a14..368fa66d91 100644 --- a/crates/core/src/nucleus/validation/mod.rs +++ b/crates/core/src/nucleus/validation/mod.rs @@ -72,7 +72,7 @@ impl From for HolochainError { /// /// All of this actually happens in the functions of the sub modules. This function is the /// main validation entry point and, like a workflow, stays high-level. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn validate_entry( entry: Entry, link: Option
, @@ -128,7 +128,7 @@ pub async fn validate_entry( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn entry_to_validation_data( context: Arc, entry: &Entry, @@ -185,7 +185,7 @@ pub fn entry_to_validation_data( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_entry_with_header( context: Arc, address: &Address, diff --git a/crates/core/src/nucleus/validation/provenances.rs b/crates/core/src/nucleus/validation/provenances.rs index a7b6478f48..29657c3ae3 100644 --- a/crates/core/src/nucleus/validation/provenances.rs +++ b/crates/core/src/nucleus/validation/provenances.rs @@ -3,7 +3,7 @@ use boolinator::Boolinator; use holochain_core_types::validation::ValidationData; use holochain_dpki::utils::Verify; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn validate_provenances(validation_data: &ValidationData) -> ValidationResult { let header = &validation_data.package.chain_header; header diff --git a/crates/core/src/nucleus/validation/remove_entry.rs b/crates/core/src/nucleus/validation/remove_entry.rs index 76bc3310fb..2b044fc6d1 100644 --- a/crates/core/src/nucleus/validation/remove_entry.rs +++ b/crates/core/src/nucleus/validation/remove_entry.rs @@ -13,7 +13,7 @@ use holochain_persistence_api::cas::content::AddressableContent; use holochain_wasm_utils::api_serialization::validation::EntryValidationArgs; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn validate_remove_entry( entry: Entry, validation_data: ValidationData, diff --git a/crates/core/src/persister.rs b/crates/core/src/persister.rs index aadcd7bd20..18e1727bef 100644 --- a/crates/core/src/persister.rs +++ b/crates/core/src/persister.rs @@ -39,7 +39,7 @@ impl PartialEq for SimplePersister { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Persister for SimplePersister { fn save(&mut self, state: &StateWrapper) -> Result<(), HolochainError> { let lock = &*self.storage.clone(); diff --git a/crates/core/src/scheduled_jobs/state_dump.rs b/crates/core/src/scheduled_jobs/state_dump.rs index 1827da8ba7..3f433fcecc 100644 --- a/crates/core/src/scheduled_jobs/state_dump.rs +++ b/crates/core/src/scheduled_jobs/state_dump.rs @@ -7,7 +7,7 @@ use holochain_core_types::chain_header::ChainHeader; use holochain_persistence_api::cas::content::{Address, AddressableContent}; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn header_to_string(h: &ChainHeader) -> String { format!( r#"===========Header=========== @@ -29,7 +29,7 @@ Prev. address: {:?} ) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn address_to_content_string(address: &Address, context: Arc) -> String { let maybe_content = address_to_content_and_type(address, context); maybe_content @@ -45,7 +45,7 @@ fn address_to_content_string(address: &Address, context: Arc) -> String }) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn state_dump(context: Arc) { let dump = StateDump::from(context.clone()); diff --git a/crates/core/src/scheduled_jobs/timeouts.rs b/crates/core/src/scheduled_jobs/timeouts.rs index 6af2604281..fe0cce86d6 100644 --- a/crates/core/src/scheduled_jobs/timeouts.rs +++ b/crates/core/src/scheduled_jobs/timeouts.rs @@ -5,7 +5,7 @@ use crate::{ }; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn check_network_processes_for_timeouts(context: Arc) { let state = context.state().expect("Couldn't get state in timeout job"); for (key, (time, duration)) in state.network().query_timeouts.iter() { diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index 341c33a3d4..437fe03735 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -64,7 +64,7 @@ pub struct State { pub conductor_api: ConductorApi, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl State { pub fn new(context: Arc) -> Self { // @TODO file table diff --git a/crates/core/src/state_dump.rs b/crates/core/src/state_dump.rs index 593acdad48..733d4d9231 100644 --- a/crates/core/src/state_dump.rs +++ b/crates/core/src/state_dump.rs @@ -91,7 +91,7 @@ impl From> for StateDump { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn address_to_content_and_type( address: &Address, context: Arc, diff --git a/crates/core/src/wasm_engine/api/call.rs b/crates/core/src/wasm_engine/api/call.rs index 303f36d895..8959586e9a 100644 --- a/crates/core/src/wasm_engine/api/call.rs +++ b/crates/core/src/wasm_engine/api/call.rs @@ -17,7 +17,7 @@ use std::{convert::TryFrom, sync::Arc}; use wasmi::{RuntimeArgs, RuntimeValue}; // ZomeFnCallArgs to ZomeFnCall -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl ZomeFnCall { fn from_args(context: Arc, args: ZomeFnCallArgs) -> Self { // TODO we are currently signing the call ourself. This signature @@ -44,7 +44,7 @@ impl ZomeFnCall { /// Launch an Action::Call with newly formed ZomeFnCall- /// Waits for a ZomeFnResult /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_call(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args @@ -96,7 +96,7 @@ pub fn invoke_call(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { } #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn local_call(runtime: &mut Runtime, input: ZomeFnCallArgs) -> Result { let context = runtime.context().map_err(|_| { HolochainError::ErrorGeneric( @@ -117,7 +117,7 @@ fn local_call(runtime: &mut Runtime, input: ZomeFnCallArgs) -> Result Result { let context = runtime.context().map_err(|_| { HolochainError::ErrorGeneric( diff --git a/crates/core/src/wasm_engine/api/capabilities.rs b/crates/core/src/wasm_engine/api/capabilities.rs index d7ce915568..a892acc663 100644 --- a/crates/core/src/wasm_engine/api/capabilities.rs +++ b/crates/core/src/wasm_engine/api/capabilities.rs @@ -17,7 +17,7 @@ use holochain_wasm_utils::api_serialization::capabilities::{ use std::convert::TryFrom; use wasmi::{RuntimeArgs, RuntimeValue}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_commit_capability_grant(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args @@ -42,7 +42,7 @@ pub fn invoke_commit_capability_grant(runtime: &mut Runtime, args: &RuntimeArgs) runtime.store_result(task_result) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_commit_capability_claim(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args diff --git a/crates/core/src/wasm_engine/api/commit.rs b/crates/core/src/wasm_engine/api/commit.rs index 1513d21230..78c19e69d0 100644 --- a/crates/core/src/wasm_engine/api/commit.rs +++ b/crates/core/src/wasm_engine/api/commit.rs @@ -13,7 +13,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected complex argument: CommitEntryArg /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_commit_app_entry(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; diff --git a/crates/core/src/wasm_engine/api/crypto.rs b/crates/core/src/wasm_engine/api/crypto.rs index 8648fffa3a..7e27d32a11 100644 --- a/crates/core/src/wasm_engine/api/crypto.rs +++ b/crates/core/src/wasm_engine/api/crypto.rs @@ -8,7 +8,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected argument: u64 /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_crypto(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; diff --git a/crates/core/src/wasm_engine/api/debug.rs b/crates/core/src/wasm_engine/api/debug.rs index ed1fb27a08..9abd302d48 100644 --- a/crates/core/src/wasm_engine/api/debug.rs +++ b/crates/core/src/wasm_engine/api/debug.rs @@ -5,7 +5,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expecting a string as complex input argument /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_debug(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; let payload = runtime.load_json_string_from_args(args); diff --git a/crates/core/src/wasm_engine/api/emit_signal.rs b/crates/core/src/wasm_engine/api/emit_signal.rs index 3e6986d874..e2305807c5 100644 --- a/crates/core/src/wasm_engine/api/emit_signal.rs +++ b/crates/core/src/wasm_engine/api/emit_signal.rs @@ -10,7 +10,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expecting a string as complex input argument /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_emit_signal(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; diff --git a/crates/core/src/wasm_engine/api/entry_address.rs b/crates/core/src/wasm_engine/api/entry_address.rs index ca1458b7d3..f821e87223 100644 --- a/crates/core/src/wasm_engine/api/entry_address.rs +++ b/crates/core/src/wasm_engine/api/entry_address.rs @@ -10,7 +10,7 @@ use holochain_persistence_api::cas::content::AddressableContent; use std::{convert::TryFrom, str::FromStr}; use wasmi::{RuntimeArgs, RuntimeValue}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn get_entry_type(dna: &Dna, entry_type_name: &str) -> Result> { let entry_type = EntryType::from_str(&entry_type_name).map_err(|_| { Some(RuntimeValue::I64( diff --git a/crates/core/src/wasm_engine/api/get_entry.rs b/crates/core/src/wasm_engine/api/get_entry.rs index 8850032086..0889de6f6c 100644 --- a/crates/core/src/wasm_engine/api/get_entry.rs +++ b/crates/core/src/wasm_engine/api/get_entry.rs @@ -10,7 +10,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected complex argument: GetEntryArgs /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_get_entry(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args diff --git a/crates/core/src/wasm_engine/api/get_links.rs b/crates/core/src/wasm_engine/api/get_links.rs index 8e7f09475b..7dea5ff90b 100644 --- a/crates/core/src/wasm_engine/api/get_links.rs +++ b/crates/core/src/wasm_engine/api/get_links.rs @@ -10,7 +10,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected complex argument: GetLinksArgs /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_get_links(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args diff --git a/crates/core/src/wasm_engine/api/get_links_count.rs b/crates/core/src/wasm_engine/api/get_links_count.rs index a85c759f33..59e642c384 100644 --- a/crates/core/src/wasm_engine/api/get_links_count.rs +++ b/crates/core/src/wasm_engine/api/get_links_count.rs @@ -6,7 +6,7 @@ use holochain_wasm_utils::api_serialization::get_links::GetLinksArgs; use std::convert::TryFrom; use wasmi::{RuntimeArgs, RuntimeValue}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_get_links_count(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args diff --git a/crates/core/src/wasm_engine/api/init_globals.rs b/crates/core/src/wasm_engine/api/init_globals.rs index 383ffb5a78..b0e9883f00 100644 --- a/crates/core/src/wasm_engine/api/init_globals.rs +++ b/crates/core/src/wasm_engine/api/init_globals.rs @@ -15,7 +15,7 @@ use wasmi::RuntimeArgs; /// args: [0] encoded MemoryAllocation as u64 /// Not expecting any complex input /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_init_globals(runtime: &mut Runtime, _args: &RuntimeArgs) -> ZomeApiResult { let call_data = runtime.call_data()?; let dna = runtime diff --git a/crates/core/src/wasm_engine/api/keystore.rs b/crates/core/src/wasm_engine/api/keystore.rs index f45270b52d..5de0ad63d3 100644 --- a/crates/core/src/wasm_engine/api/keystore.rs +++ b/crates/core/src/wasm_engine/api/keystore.rs @@ -13,7 +13,7 @@ use snowflake::ProcessUniqueId; use std::sync::Arc; use wasmi::{RuntimeArgs, RuntimeValue}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn conductor_callback>( method: S, params: S, @@ -50,7 +50,7 @@ fn conductor_callback>( } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_keystore_list(runtime: &mut Runtime, _args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; let result = conductor_callback("agent/keystore/list", "{}", context.clone()); @@ -69,7 +69,7 @@ pub fn invoke_keystore_list(runtime: &mut Runtime, _args: &RuntimeArgs) -> ZomeA runtime.store_result(Ok(KeystoreListResult { ids: string_list })) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_keystore_new_random(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; @@ -95,7 +95,7 @@ pub fn invoke_keystore_new_random(runtime: &mut Runtime, args: &RuntimeArgs) -> runtime.store_result(Ok(())) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_keystore_derive_seed(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args @@ -121,7 +121,7 @@ pub fn invoke_keystore_derive_seed(runtime: &mut Runtime, args: &RuntimeArgs) -> runtime.store_result(Ok(())) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_keystore_derive_key(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args @@ -161,7 +161,7 @@ pub fn invoke_keystore_derive_key(runtime: &mut Runtime, args: &RuntimeArgs) -> runtime.store_result(Ok(JsonString::from_json(&string))) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_keystore_sign(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args @@ -199,7 +199,7 @@ pub fn invoke_keystore_sign(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeAp runtime.store_result(Ok(JsonString::from_json(&string))) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_keystore_get_public_key(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args diff --git a/crates/core/src/wasm_engine/api/link_entries.rs b/crates/core/src/wasm_engine/api/link_entries.rs index 55fa6e4747..b36f25f9dc 100644 --- a/crates/core/src/wasm_engine/api/link_entries.rs +++ b/crates/core/src/wasm_engine/api/link_entries.rs @@ -16,7 +16,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// ZomeApiFunction::LinkEntries function code /// args: [0] encoded MemoryAllocation as u64 /// Expected complex argument: LinkEntriesArgs -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_link_entries(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args diff --git a/crates/core/src/wasm_engine/api/meta.rs b/crates/core/src/wasm_engine/api/meta.rs index 6370493407..8f9fed2826 100644 --- a/crates/core/src/wasm_engine/api/meta.rs +++ b/crates/core/src/wasm_engine/api/meta.rs @@ -8,7 +8,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expecting a string as complex input argument /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_meta(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; diff --git a/crates/core/src/wasm_engine/api/remove_entry.rs b/crates/core/src/wasm_engine/api/remove_entry.rs index 197c682f1f..7792988b96 100644 --- a/crates/core/src/wasm_engine/api/remove_entry.rs +++ b/crates/core/src/wasm_engine/api/remove_entry.rs @@ -17,7 +17,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation /// Expected Address argument /// Stores/returns a RibosomeEncodedValue -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_remove_entry(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; diff --git a/crates/core/src/wasm_engine/api/remove_link.rs b/crates/core/src/wasm_engine/api/remove_link.rs index 823c4579c8..74371ba163 100644 --- a/crates/core/src/wasm_engine/api/remove_link.rs +++ b/crates/core/src/wasm_engine/api/remove_link.rs @@ -27,7 +27,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected complex argument: GetLinksArgs /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_remove_link(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args diff --git a/crates/core/src/wasm_engine/api/send.rs b/crates/core/src/wasm_engine/api/send.rs index 057eb02065..4e84d6d78b 100644 --- a/crates/core/src/wasm_engine/api/send.rs +++ b/crates/core/src/wasm_engine/api/send.rs @@ -11,7 +11,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected complex argument: SendArgs /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_send(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let span = runtime .call_data() diff --git a/crates/core/src/wasm_engine/api/sign.rs b/crates/core/src/wasm_engine/api/sign.rs index e1ed48e8a6..ab97d756d7 100644 --- a/crates/core/src/wasm_engine/api/sign.rs +++ b/crates/core/src/wasm_engine/api/sign.rs @@ -10,7 +10,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected argument: u64 /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_sign_one_time(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; @@ -32,7 +32,7 @@ pub fn invoke_sign_one_time(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeAp } /// creates a one-time private key and sign data returning the signature and the public key -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn sign_one_time(payloads: Vec) -> HcResult { let mut sign_keys = generate_random_sign_keypair()?; let mut signatures = Vec::new(); diff --git a/crates/core/src/wasm_engine/api/sleep.rs b/crates/core/src/wasm_engine/api/sleep.rs index 28c028e7ae..3e1eb51e24 100644 --- a/crates/core/src/wasm_engine/api/sleep.rs +++ b/crates/core/src/wasm_engine/api/sleep.rs @@ -6,7 +6,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected argument: u64 /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_sleep(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { // deserialize args let args_str = runtime.load_json_string_from_args(&args); diff --git a/crates/core/src/wasm_engine/api/update_entry.rs b/crates/core/src/wasm_engine/api/update_entry.rs index ac5ed8dd12..9a9d07f06a 100644 --- a/crates/core/src/wasm_engine/api/update_entry.rs +++ b/crates/core/src/wasm_engine/api/update_entry.rs @@ -14,7 +14,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected complex argument: UpdateEntryArgs /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_update_entry(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; // deserialize args diff --git a/crates/core/src/wasm_engine/api/verify_signature.rs b/crates/core/src/wasm_engine/api/verify_signature.rs index 0eb5df07e0..204b4d1f58 100644 --- a/crates/core/src/wasm_engine/api/verify_signature.rs +++ b/crates/core/src/wasm_engine/api/verify_signature.rs @@ -8,7 +8,7 @@ use wasmi::{RuntimeArgs, RuntimeValue}; /// args: [0] encoded MemoryAllocation as u64 /// Expected argument: u64 /// Returns an HcApiReturnCode as I64 -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn invoke_verify_signature(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { let context = runtime.context()?; diff --git a/crates/core/src/wasm_engine/callback/genesis.rs b/crates/core/src/wasm_engine/callback/genesis.rs index 59ef2a5d0f..5dc242a39a 100644 --- a/crates/core/src/wasm_engine/callback/genesis.rs +++ b/crates/core/src/wasm_engine/callback/genesis.rs @@ -6,7 +6,7 @@ use crate::{ use std::sync::Arc; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn init( context: Arc, zome: &str, diff --git a/crates/core/src/wasm_engine/callback/init.rs b/crates/core/src/wasm_engine/callback/init.rs index 521044ea33..76237b75be 100644 --- a/crates/core/src/wasm_engine/callback/init.rs +++ b/crates/core/src/wasm_engine/callback/init.rs @@ -6,7 +6,7 @@ use crate::{ use std::sync::Arc; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn init( context: Arc, zome: &str, diff --git a/crates/core/src/wasm_engine/callback/links_utils.rs b/crates/core/src/wasm_engine/callback/links_utils.rs index a1990f4f94..3c64bd58ed 100644 --- a/crates/core/src/wasm_engine/callback/links_utils.rs +++ b/crates/core/src/wasm_engine/callback/links_utils.rs @@ -9,7 +9,7 @@ use std::sync::Arc; /// Retrieves the base and target entries of the link and returns both. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn get_link_entries( link: &Link, context: &Arc, @@ -64,7 +64,7 @@ pub struct LinkDefinitionPath { /// zomes, entry types and their links and returns the first match. /// /// Returns a LinkDefinitionPath to uniquely reference the link definition in the DNA. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn find_link_definition_by_type( link_type: &String, context: &Arc, diff --git a/crates/core/src/wasm_engine/callback/mod.rs b/crates/core/src/wasm_engine/callback/mod.rs index 8503423bcb..ec1ff14767 100644 --- a/crates/core/src/wasm_engine/callback/mod.rs +++ b/crates/core/src/wasm_engine/callback/mod.rs @@ -61,7 +61,7 @@ impl FromStr for Callback { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Callback { // cannot test this because PartialEq is not implemented for fns #[cfg_attr(tarpaulin, skip)] @@ -82,7 +82,7 @@ impl Callback { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Defn for Callback { fn as_str(&self) -> &'static str { match *self { @@ -170,7 +170,7 @@ impl From for CallbackResult { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub(crate) fn run_callback(context: Arc, call: CallbackFnCall) -> CallbackResult { match wasm_engine::run_dna( Some(call.clone().parameters.to_bytes()), @@ -188,7 +188,7 @@ pub(crate) fn run_callback(context: Arc, call: CallbackFnCall) -> Callb } #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn call( context: Arc, zome: &str, diff --git a/crates/core/src/wasm_engine/callback/receive.rs b/crates/core/src/wasm_engine/callback/receive.rs index 78855984ab..174b75f2ac 100644 --- a/crates/core/src/wasm_engine/callback/receive.rs +++ b/crates/core/src/wasm_engine/callback/receive.rs @@ -16,7 +16,7 @@ use std::sync::Arc; struct ReceiveReturnValue(Result); #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn receive( context: Arc, zome: &str, diff --git a/crates/core/src/wasm_engine/callback/validation_package.rs b/crates/core/src/wasm_engine/callback/validation_package.rs index 96e1a174d9..a74deca122 100644 --- a/crates/core/src/wasm_engine/callback/validation_package.rs +++ b/crates/core/src/wasm_engine/callback/validation_package.rs @@ -19,7 +19,7 @@ use holochain_wasm_utils::api_serialization::validation::LinkValidationPackageAr use std::{convert::TryFrom, sync::Arc}; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn get_validation_package_definition( entry: &Entry, context: Arc, diff --git a/crates/core/src/wasm_engine/factories.rs b/crates/core/src/wasm_engine/factories.rs index c75d0cb4d1..f2e19e9710 100644 --- a/crates/core/src/wasm_engine/factories.rs +++ b/crates/core/src/wasm_engine/factories.rs @@ -7,14 +7,14 @@ use wasmi::{ }; /// Creates a WASM module, that is the executable program, from a given WASM binary byte array. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn wasm_module_factory(wasm: Arc>) -> Result { wasmi::Module::from_buffer(&*wasm).map_err(|e| HolochainError::ErrorGeneric(e.into())) } /// Creates a runnable WASM module instance from a module reference. /// Adds the Holochain specific API functions as imports. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn wasm_instance_factory(module: &Module) -> Result { // invoke_index and resolve_func work together to enable callable host functions // within WASM modules, which is how the core API functions diff --git a/crates/core/src/wasm_engine/memory.rs b/crates/core/src/wasm_engine/memory.rs index 0280ca22cd..1616c817ad 100644 --- a/crates/core/src/wasm_engine/memory.rs +++ b/crates/core/src/wasm_engine/memory.rs @@ -31,7 +31,7 @@ pub struct WasmPageManager { /// Return code of 0 means success, while any other value means a failure and gives the error code. /// In the future, to handle bigger memory needs, we could do same with an i64 instead /// and handle multiple memory Pages. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl WasmPageManager { pub fn new(wasm_instance: &ModuleRef) -> Self { // get wasm memory reference from module diff --git a/crates/core/src/wasm_engine/run_dna.rs b/crates/core/src/wasm_engine/run_dna.rs index 41acf683b0..1ede7e2af8 100644 --- a/crates/core/src/wasm_engine/run_dna.rs +++ b/crates/core/src/wasm_engine/run_dna.rs @@ -25,7 +25,7 @@ use wasmi::RuntimeValue; /// inside the DirectCall specialisation for WasmCallData. /// /// For ZomeCalls and CallbackCalls it gets the according module from the DNA. -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn get_module(data: WasmCallData) -> Result { let (context, zome_name) = if let WasmCallData::DirectCall(_, wasm) = data { let transient_module = ModuleArc::new(wasm_module_factory(wasm)?); @@ -57,7 +57,7 @@ fn get_module(data: WasmCallData) -> Result { /// Multithreaded function /// panics if wasm binary isn't valid. #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn run_dna(parameters: Option>, data: WasmCallData) -> ZomeFnResult { let wasm_module = get_module(data.clone())?; let wasm_instance = wasm_instance_factory(&wasm_module)?; diff --git a/crates/core/src/wasm_engine/runtime.rs b/crates/core/src/wasm_engine/runtime.rs index aa4f7f5e91..22eec41ec9 100644 --- a/crates/core/src/wasm_engine/runtime.rs +++ b/crates/core/src/wasm_engine/runtime.rs @@ -51,7 +51,7 @@ impl fmt::Display for BadCallError { impl HostError for BadCallError {} -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl WasmCallData { pub fn new_zome_call(context: Arc, call: ZomeFnCall) -> Self { WasmCallData::ZomeCall(ZomeCallData { context, call }) @@ -105,7 +105,7 @@ pub struct Runtime { pub data: WasmCallData, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Runtime { pub fn zome_call_data(&self) -> Result { match &self.data { diff --git a/crates/core/src/workflows/application.rs b/crates/core/src/workflows/application.rs index 37099231d2..d174a4d7d1 100644 --- a/crates/core/src/workflows/application.rs +++ b/crates/core/src/workflows/application.rs @@ -10,7 +10,7 @@ use holochain_core_types::{ }; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn initialize( instance: &Instance, maybe_dna: Option, diff --git a/crates/core/src/workflows/author_entry.rs b/crates/core/src/workflows/author_entry.rs index 361542fe73..9168f47faa 100644 --- a/crates/core/src/workflows/author_entry.rs +++ b/crates/core/src/workflows/author_entry.rs @@ -22,7 +22,7 @@ use holochain_wasm_utils::api_serialization::commit_entry::CommitEntryResult; use crate::wasm_engine::callback::links_utils::get_link_entries; use std::{sync::Arc, vec::Vec}; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn author_entry<'a>( entry: &'a Entry, maybe_link_update_delete: Option
, diff --git a/crates/core/src/workflows/get_entry_result.rs b/crates/core/src/workflows/get_entry_result.rs index 3b144775cd..a49a4d7a29 100644 --- a/crates/core/src/workflows/get_entry_result.rs +++ b/crates/core/src/workflows/get_entry_result.rs @@ -15,7 +15,7 @@ use holochain_wasm_utils::api_serialization::get_entry::{ use std::sync::Arc; /// Get Entry workflow -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn get_entry_with_meta_workflow<'a>( context: &'a Arc, address: &'a Address, @@ -68,7 +68,7 @@ pub async fn get_entry_with_meta_workflow<'a>( } /// Get GetEntryResult workflow -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn get_entry_result_workflow<'a>( context: &'a Arc, args: &'a GetEntryArgs, diff --git a/crates/core/src/workflows/get_link_result.rs b/crates/core/src/workflows/get_link_result.rs index 2f1cb7b429..5e802b44c3 100644 --- a/crates/core/src/workflows/get_link_result.rs +++ b/crates/core/src/workflows/get_link_result.rs @@ -15,7 +15,7 @@ use holochain_wasm_utils::api_serialization::get_links::{ }; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn get_link_result_workflow<'a>( context: &'a Arc, link_args: &'a GetLinksArgs, diff --git a/crates/core/src/workflows/get_links_count.rs b/crates/core/src/workflows/get_links_count.rs index 6aba42de11..51069227d2 100644 --- a/crates/core/src/workflows/get_links_count.rs +++ b/crates/core/src/workflows/get_links_count.rs @@ -10,7 +10,7 @@ use holochain_core_types::error::HolochainError; use holochain_wasm_utils::api_serialization::get_links::{GetLinksArgs, GetLinksResultCount}; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn get_link_result_count_workflow<'a>( context: Arc, link_args: &'a GetLinksArgs, diff --git a/crates/core/src/workflows/handle_custom_direct_message.rs b/crates/core/src/workflows/handle_custom_direct_message.rs index 2707515e5d..d9cc4b1013 100644 --- a/crates/core/src/workflows/handle_custom_direct_message.rs +++ b/crates/core/src/workflows/handle_custom_direct_message.rs @@ -14,7 +14,7 @@ use std::sync::Arc; /// handles receiving a message from an api send call /// call the receive call back, and sends the result back to the /// source of the send message which is in the from_agent_id param -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn handle_custom_direct_message( from_agent_id: Address, msg_id: String, diff --git a/crates/core/src/workflows/hold_entry.rs b/crates/core/src/workflows/hold_entry.rs index e619812dce..7eb027a9e7 100644 --- a/crates/core/src/workflows/hold_entry.rs +++ b/crates/core/src/workflows/hold_entry.rs @@ -14,7 +14,7 @@ use holochain_persistence_api::cas::content::AddressableContent; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn hold_entry_workflow( entry_with_header: &EntryWithHeader, context: Arc, diff --git a/crates/core/src/workflows/hold_entry_remove.rs b/crates/core/src/workflows/hold_entry_remove.rs index de661db886..16c877db3a 100644 --- a/crates/core/src/workflows/hold_entry_remove.rs +++ b/crates/core/src/workflows/hold_entry_remove.rs @@ -11,7 +11,7 @@ use holochain_core_types::{ }; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn hold_remove_workflow( entry_with_header: &EntryWithHeader, context: Arc, diff --git a/crates/core/src/workflows/hold_entry_update.rs b/crates/core/src/workflows/hold_entry_update.rs index be5a87910a..8968b77bdd 100644 --- a/crates/core/src/workflows/hold_entry_update.rs +++ b/crates/core/src/workflows/hold_entry_update.rs @@ -12,7 +12,7 @@ use holochain_core_types::{ }; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn hold_update_workflow( entry_with_header: &EntryWithHeader, context: Arc, diff --git a/crates/core/src/workflows/hold_link.rs b/crates/core/src/workflows/hold_link.rs index 4ecb430abd..06a5f68374 100644 --- a/crates/core/src/workflows/hold_link.rs +++ b/crates/core/src/workflows/hold_link.rs @@ -15,7 +15,7 @@ use holochain_core_types::{ }; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn hold_link_workflow( entry_with_header: &EntryWithHeader, context: Arc, diff --git a/crates/core/src/workflows/remove_link.rs b/crates/core/src/workflows/remove_link.rs index 5cd0e63678..6ede67716e 100644 --- a/crates/core/src/workflows/remove_link.rs +++ b/crates/core/src/workflows/remove_link.rs @@ -13,7 +13,7 @@ use holochain_core_types::{ }; use std::sync::Arc; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn remove_link_workflow( entry_with_header: &EntryWithHeader, context: Arc, diff --git a/crates/core/src/workflows/respond_validation_package_request.rs b/crates/core/src/workflows/respond_validation_package_request.rs index ca046fcd96..95361162c7 100644 --- a/crates/core/src/workflows/respond_validation_package_request.rs +++ b/crates/core/src/workflows/respond_validation_package_request.rs @@ -13,7 +13,7 @@ use holochain_persistence_api::cas::content::Address; use std::{sync::Arc, vec::Vec}; #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn respond_validation_package_request( to_agent_id: Address, msg_id: String, diff --git a/crates/dpki/src/key_blob.rs b/crates/dpki/src/key_blob.rs index e495a3988e..fb877c4a20 100755 --- a/crates/dpki/src/key_blob.rs +++ b/crates/dpki/src/key_blob.rs @@ -96,7 +96,7 @@ pub trait Blobbable { // Seed //-------------------------------------------------------------------------------------------------- -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl Blobbable for Seed { fn blob_type() -> BlobType { BlobType::Seed @@ -159,7 +159,7 @@ const KEYBUNDLE_BLOB_SIZE: usize = 1 // version byte pub const KEYBUNDLE_BLOB_SIZE_ALIGNED: usize = ((KEYBUNDLE_BLOB_SIZE + 8 - 1) / 8) * 8; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl Blobbable for KeyBundle { fn blob_type() -> BlobType { BlobType::KeyBundle @@ -279,7 +279,7 @@ const SIGNING_KEY_BLOB_SIZE: usize = 1 // version byte pub const SIGNING_KEY_BLOB_SIZE_ALIGNED: usize = ((SIGNING_KEY_BLOB_SIZE + 8 - 1) / 8) * 8; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl Blobbable for SigningKeyPair { fn blob_type() -> BlobType { BlobType::SigningKey @@ -378,7 +378,7 @@ const ENCRYPTING_KEY_BLOB_SIZE: usize = 1 // version byte pub const ENCRYPTING_KEY_BLOB_SIZE_ALIGNED: usize = ((ENCRYPTING_KEY_BLOB_SIZE + 8 - 1) / 8) * 8; -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl Blobbable for EncryptingKeyPair { fn blob_type() -> BlobType { BlobType::EncryptingKey diff --git a/crates/dpki/src/key_bundle.rs b/crates/dpki/src/key_bundle.rs index 5480da28af..f9718f99b4 100755 --- a/crates/dpki/src/key_bundle.rs +++ b/crates/dpki/src/key_bundle.rs @@ -19,7 +19,7 @@ pub struct KeyBundle { pub enc_keys: EncryptingKeyPair, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl KeyBundle { /// create a new KeyBundle pub fn new(sign_keys: SigningKeyPair, enc_keys: EncryptingKeyPair) -> HcResult { diff --git a/crates/dpki/src/keypair.rs b/crates/dpki/src/keypair.rs index 5577ded098..f41099fbdb 100755 --- a/crates/dpki/src/keypair.rs +++ b/crates/dpki/src/keypair.rs @@ -62,7 +62,7 @@ pub struct SigningKeyPair { pub private: SecBuf, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl KeyPair for SigningKeyPair { fn public(&self) -> String { self.public.clone() @@ -92,7 +92,7 @@ impl KeyPair for SigningKeyPair { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl SigningKeyPair { /// Standard Constructor pub fn new(public: Base32, private: SecBuf) -> Self { @@ -134,7 +134,7 @@ pub struct EncryptingKeyPair { pub private: SecBuf, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl KeyPair for EncryptingKeyPair { fn public(&self) -> String { self.public.clone() @@ -165,7 +165,7 @@ impl KeyPair for EncryptingKeyPair { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl EncryptingKeyPair { /// Standard Constructor pub fn new(public: String, private: SecBuf) -> Self { @@ -246,12 +246,12 @@ impl EncryptingKeyPair { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub fn generate_random_sign_keypair() -> HcResult { let mut seed = utils::generate_random_seed_buf(); SigningKeyPair::new_from_seed(&mut seed) } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub fn generate_random_enc_keypair() -> HcResult { let mut seed = utils::generate_random_seed_buf(); EncryptingKeyPair::new_from_seed(&mut seed) diff --git a/crates/dpki/src/password_encryption.rs b/crates/dpki/src/password_encryption.rs index 8f4f949e98..380e9b725a 100644 --- a/crates/dpki/src/password_encryption.rs +++ b/crates/dpki/src/password_encryption.rs @@ -25,7 +25,7 @@ pub(crate) struct EncryptedData { /// @param {SecBuf} hash_result - Empty SecBuf to receive the resulting hash. /// @param {Option} config - Optional hashing settings /// TODO make salt optional -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub(crate) fn pw_hash( password: &mut SecBuf, salt: &mut SecBuf, @@ -46,7 +46,7 @@ pub(crate) fn pw_hash( /// @param {SecBuf} passphrase - the passphrase to use for encrypting /// @param {Option} config - Optional encrypting settings /// @return {EncryptedData} - the resulting encrypted data -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub(crate) fn pw_enc( data: &mut SecBuf, passphrase: &mut SecBuf, @@ -67,7 +67,7 @@ pub(crate) fn pw_enc( /// @param {SecBuf} passphrase - the passphrase to use for encrypting /// @param {Option} config - Optional encrypting settings /// @return {EncryptedData} - the resulting encrypted data -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub(crate) fn pw_enc_zero_nonce( data: &mut SecBuf, passphrase: &mut SecBuf, @@ -82,7 +82,7 @@ pub(crate) fn pw_enc_zero_nonce( } /// Private general wrapper of pw_enc -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] fn pw_enc_base( data: &mut SecBuf, passphrase: &mut SecBuf, @@ -111,7 +111,7 @@ fn pw_enc_base( /// @param {SecBuf} passphrase - the passphrase to use for encrypting /// @param {SecBuf} decrypted_data - the dresulting ecrypted data /// @param {Option} config - Optional decrypting settings -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub(crate) fn pw_dec( encrypted_data: &EncryptedData, passphrase: &mut SecBuf, diff --git a/crates/dpki/src/seed.rs b/crates/dpki/src/seed.rs index c97756dbdb..7f5152e566 100644 --- a/crates/dpki/src/seed.rs +++ b/crates/dpki/src/seed.rs @@ -88,7 +88,7 @@ pub struct Seed { pub buf: SecBuf, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl Seed { pub fn new(seed_buf: SecBuf, seed_type: SeedType) -> Self { assert_eq!(seed_buf.len(), SEED_SIZE); @@ -160,7 +160,7 @@ pub struct RootSeed { inner: Seed, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl SeedTrait for RootSeed { fn seed(&self) -> &Seed { &self.inner @@ -170,7 +170,7 @@ impl SeedTrait for RootSeed { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl RootSeed { /// Construct from a 32 bytes seed buffer pub fn new(seed_buf: SecBuf) -> Self { @@ -201,7 +201,7 @@ pub struct DeviceSeed { inner: Seed, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl SeedTrait for DeviceSeed { fn seed(&self) -> &Seed { &self.inner @@ -211,7 +211,7 @@ impl SeedTrait for DeviceSeed { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl DeviceSeed { /// Construct from a 32 bytes seed buffer pub fn new(seed_buf: SecBuf) -> Self { @@ -243,7 +243,7 @@ pub struct DevicePinSeed { inner: Seed, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl SeedTrait for DevicePinSeed { fn seed(&self) -> &Seed { &self.inner @@ -253,7 +253,7 @@ impl SeedTrait for DevicePinSeed { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl DevicePinSeed { /// Construct from a 32 bytes seed buffer pub fn new(seed_buf: SecBuf) -> Self { @@ -287,7 +287,7 @@ pub struct EncryptedSeed { data: EncryptedData, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl EncryptedSeed { fn new(data: EncryptedData, kind: SeedType) -> Self { Self { kind, data } @@ -308,7 +308,7 @@ impl EncryptedSeed { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl MnemonicableSeed for EncryptedSeed { fn new_with_mnemonic(phrase: String, seed_type: SeedType) -> HcResult { // split out the two phrases, decode then combine the bytes diff --git a/crates/dpki/src/utils.rs b/crates/dpki/src/utils.rs index 22d3ecb2b8..4bd0ce6059 100644 --- a/crates/dpki/src/utils.rs +++ b/crates/dpki/src/utils.rs @@ -17,7 +17,7 @@ pub trait Verify { fn verify(&self, data: String) -> HcResult; } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] impl Verify for Provenance { fn verify(&self, data: String) -> HcResult { crate::utils::verify(self.source(), data, self.signature()) @@ -28,7 +28,7 @@ impl Verify for Provenance { /// @param {Base32} pub_key_b32 - Public signing key to decode /// @param {HcidEncoding} codec - The configured HCID decoder to use /// @return {SecBuf} Resulting decoded key -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub(crate) fn decode_pub_key(pub_key_b32: Base32, codec: &HcidEncoding) -> HcResult { // Decode Base32 public key let pub_key = codec.decode(&pub_key_b32)?; @@ -43,7 +43,7 @@ pub(crate) fn decode_pub_key(pub_key_b32: Base32, codec: &HcidEncoding) -> HcRes /// @param {SecBuf} pub_key_sec - Public signing key to encode /// @param {HcidEncoding} codec - The configured HCID encoder to use /// @return {Base32} Resulting HCID encoded key -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub(crate) fn encode_pub_key(pub_key_sec: &mut SecBuf, codec: &HcidEncoding) -> HcResult { let locker = pub_key_sec.read_lock(); Ok(codec.encode(&locker[0..SEED_SIZE])?) @@ -69,7 +69,7 @@ pub fn verify(source: Address, data: String, signature: Signature) -> HcResult Self { assert_eq!(data.len(), CONTEXT_SIZE); @@ -99,7 +99,7 @@ impl SeedContext { } /// derive a seed from a source seed -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub fn generate_derived_seed_buf( mut src_seed: &mut SecBuf, seed_context: &SeedContext, @@ -116,7 +116,7 @@ pub fn generate_derived_seed_buf( } /// returns a random buf -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub fn generate_random_buf(size: usize) -> SecBuf { let mut seed = SecBuf::with_insecure(size); seed.randomize(); @@ -124,13 +124,13 @@ pub fn generate_random_buf(size: usize) -> SecBuf { } /// returns a random seed buf -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub fn generate_random_seed_buf() -> SecBuf { generate_random_buf(SEED_SIZE) } /// encrypt and base64 encode a secbuf -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub fn encrypt_with_passphrase_buf( data_buf: &mut SecBuf, passphrase: &mut SecBuf, @@ -144,7 +144,7 @@ pub fn encrypt_with_passphrase_buf( } /// unencode base64 and decrypt a passphrase encrypted blob -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_DPKI)] pub fn decrypt_with_passphrase_buf( blob: &str, passphrase: &mut SecBuf, diff --git a/crates/holochain/src/main.rs b/crates/holochain/src/main.rs index a9ac8b0406..44d50cd061 100755 --- a/crates/holochain/src/main.rs +++ b/crates/holochain/src/main.rs @@ -68,7 +68,7 @@ impl Default for SignalConfiguration { const MAGIC_STRING: &str = "*** Done. All interfaces started."; #[cfg_attr(tarpaulin, skip)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR)] fn main() { let _ = spawn_locksmith_guard_watcher(); @@ -162,7 +162,7 @@ fn main() { } #[cfg_attr(tarpaulin, skip)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR)] fn bootstrap_from_config(path: &str) -> Result<(), HolochainError> { let config = load_config_file(&String::from(path))?; config @@ -187,7 +187,7 @@ fn bootstrap_from_config(path: &str) -> Result<(), HolochainError> { } #[cfg_attr(tarpaulin, skip)] -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR)] fn load_config_file(path: &String) -> Result { let mut f = File::open(path)?; let mut contents = String::new(); diff --git a/crates/net/src/connection/net_connection_thread.rs b/crates/net/src/connection/net_connection_thread.rs index 95870d8cac..20de109aa1 100644 --- a/crates/net/src/connection/net_connection_thread.rs +++ b/crates/net/src/connection/net_connection_thread.rs @@ -30,7 +30,7 @@ pub struct NetConnectionThread { pub endpoint: String, pub p2p_endpoint: url::Url, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] + impl NetSend for NetConnectionThread { /// send a message to the worker within NetConnectionThread's child thread. fn send(&mut self, data: Lib3hClientProtocolWrapped) -> NetResult<()> { @@ -38,7 +38,7 @@ impl NetSend for NetConnectionThread { Ok(()) } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] + impl NetConnectionThread { /// NetSendThread Constructor. /// Spawns a thread that will create and run a NetWorker with the given factory, handler and diff --git a/crates/net/src/lib3h_worker.rs b/crates/net/src/lib3h_worker.rs index 1e417c56f6..8070b9e297 100644 --- a/crates/net/src/lib3h_worker.rs +++ b/crates/net/src/lib3h_worker.rs @@ -35,7 +35,7 @@ impl Lib3hWorker { } /// Constructors -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] impl Lib3hWorker { /// Create a new websocket worker connected to the lib3h NetworkEngine pub fn with_wss_transport(handler: NetHandler, real_config: EngineConfig) -> NetResult { diff --git a/crates/net/src/p2p_config.rs b/crates/net/src/p2p_config.rs index b5d1f14193..ed1764bc96 100644 --- a/crates/net/src/p2p_config.rs +++ b/crates/net/src/p2p_config.rs @@ -87,7 +87,7 @@ impl P2pConfig { } // Constructors -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] impl P2pConfig { pub fn new( backend_kind: P2pBackendKind, @@ -191,7 +191,7 @@ impl P2pConfig { } /// end_user config -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] impl P2pConfig { pub fn default_end_user_config() -> serde_json::Value { json!({ diff --git a/crates/net/src/p2p_network.rs b/crates/net/src/p2p_network.rs index f400aa9f88..7ec06483fd 100644 --- a/crates/net/src/p2p_network.rs +++ b/crates/net/src/p2p_network.rs @@ -37,7 +37,7 @@ pub struct P2pNetwork { connection: NetConnectionThread, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] impl P2pNetwork { /// Constructor /// `config` is the configuration of the p2p module `handler` is the closure for handling Protocol messages received from the network module. @@ -199,7 +199,7 @@ impl std::fmt::Debug for P2pNetwork { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] +//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] impl NetSend for P2pNetwork { /// send a Protocol message to the p2p network instance fn send(&mut self, data: Lib3hClientProtocolWrapped) -> NetResult<()> { diff --git a/crates/net/src/sim2h_worker.rs b/crates/net/src/sim2h_worker.rs index ee6716c51c..e6b39a412c 100644 --- a/crates/net/src/sim2h_worker.rs +++ b/crates/net/src/sim2h_worker.rs @@ -91,7 +91,6 @@ pub struct Sim2hWorker { tracer: Option, } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] impl Sim2hWorker { pub fn advertise(self) -> url::Url { Url::parse("ws://example.com").unwrap() @@ -603,7 +602,6 @@ impl Sim2hWorker { } } -#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_NET)] impl NetWorker for Sim2hWorker { /// We got a message from core /// -> forward it to the NetworkEngine From f54995786d74130fc3f92c0ab81880940a157988 Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Fri, 6 Mar 2020 10:38:26 -0500 Subject: [PATCH 2/6] remove newrelic from cargo.toml --- Cargo.lock | 8 -------- crates/cli/Cargo.toml | 1 - crates/conductor_api/Cargo.toml | 1 - crates/conductor_lib/Cargo.toml | 2 +- crates/core/Cargo.toml | 1 - crates/dpki/Cargo.toml | 1 - crates/holochain/Cargo.toml | 1 - crates/metrics/Cargo.toml | 1 - crates/net/Cargo.toml | 1 - 9 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2dc2d4ba68..f9ed430ad7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1111,7 +1111,6 @@ dependencies = [ "lib3h_protocol 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustyline 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1224,7 +1223,6 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1277,7 +1275,6 @@ dependencies = [ "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "nickel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1312,7 +1309,6 @@ dependencies = [ "jsonrpc-core 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-lite 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "snowflake 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1365,7 +1361,6 @@ dependencies = [ "lib3h_protocol 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1435,7 +1430,6 @@ dependencies = [ "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1520,7 +1514,6 @@ dependencies = [ "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1572,7 +1565,6 @@ dependencies = [ "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_zombie_actor 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index a39a9331c8..9ab623dee1 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -17,7 +17,6 @@ holochain_dpki = { version = "=0.0.44-alpha3", path = "../dpki" } holochain_locksmith = { version = "=0.0.44-alpha3", path = "../locksmith" } 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.39" in_stream = { version = "=0.0.44-alpha3", path = "../in_stream" } diff --git a/crates/conductor_api/Cargo.toml b/crates/conductor_api/Cargo.toml index 5dae9f99b5..8fe6a2c3c6 100644 --- a/crates/conductor_api/Cargo.toml +++ b/crates/conductor_api/Cargo.toml @@ -14,7 +14,6 @@ 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.22" holochain_common = { version = "=0.0.44-alpha3", path = "../common" } -newrelic="0.2" jsonrpc-core = "=14.0.1" jsonrpc-lite = "=0.5.0" serde = { version = "=1.0.104", features = ["rc"] } diff --git a/crates/conductor_lib/Cargo.toml b/crates/conductor_lib/Cargo.toml index 5ce1419a96..c04a6fc0f5 100644 --- a/crates/conductor_lib/Cargo.toml +++ b/crates/conductor_lib/Cargo.toml @@ -55,7 +55,7 @@ holochain_logging = "=0.0.7" nickel = "=0.11.0" url = { version = "=2.1.0", features = ["serde"] } snowflake = "=1.3.0" -newrelic="0.2" + [dev-dependencies] test_utils = { version = "=0.0.44-alpha3", path = "../../test_utils" } tempfile = "=3.0.7" diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index d71ed1876c..ad1bc3ec17 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -58,7 +58,6 @@ rand = "=0.7.3" threadpool = "=1.7.1" im = { version = "=14.0.0", features = ["serde"] } itertools = "0.8.2" -newrelic="0.2" [dev-dependencies] wabt = "=0.7.4" diff --git a/crates/dpki/Cargo.toml b/crates/dpki/Cargo.toml index a0ad812700..1a7234f3a8 100644 --- a/crates/dpki/Cargo.toml +++ b/crates/dpki/Cargo.toml @@ -13,7 +13,6 @@ lazy_static = "=1.4.0" base64 = "=0.10.1" holochain_core_types = { version = "=0.0.44-alpha3", path = "../core_types" } holochain_tracing_macros = "=0.0.22" -newrelic="0.2" lib3h_sodium = "=0.0.39" holochain_persistence_api = "=0.0.17" serde = "=1.0.104" diff --git a/crates/holochain/Cargo.toml b/crates/holochain/Cargo.toml index f436bd92c1..6fac723957 100644 --- a/crates/holochain/Cargo.toml +++ b/crates/holochain/Cargo.toml @@ -21,7 +21,6 @@ tiny_http = "=0.6.2" lazy_static = "=1.4.0" ws = "=0.8.0" log = "=0.4.8" -newrelic="0.2" [target.'cfg(unix)'.dependencies] signal-hook = "=0.1.10" diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml index d888197e68..9d430e09e8 100644 --- a/crates/metrics/Cargo.toml +++ b/crates/metrics/Cargo.toml @@ -37,7 +37,6 @@ strip-ansi-escapes = "=0.1.0" snowflake = "=1.3.0" crossbeam-channel = "=0.3.8" chrono = "0.4.6" -newrelic="0.2" [dev-dependencies] tempfile = "=3.0.7" diff --git a/crates/net/Cargo.toml b/crates/net/Cargo.toml index e9b57139b9..764eb55883 100644 --- a/crates/net/Cargo.toml +++ b/crates/net/Cargo.toml @@ -50,4 +50,3 @@ parking_lot = "=0.8.0" env_logger = "=0.6.1" holochain_logging = "=0.0.7" log = "0.4.8" -newrelic="0.2" From 896e6b6d77a14153f2334ae7c4da7da6e49a9c8a Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Sun, 8 Mar 2020 10:35:50 -0400 Subject: [PATCH 3/6] more removal of newrelic --- Cargo.lock | 2 -- crates/cli/src/main.rs | 4 ++-- crates/common/src/env_vars.rs | 3 ++- crates/conductor_api/src/lib.rs | 6 +++--- crates/conductor_lib/src/lib.rs | 6 +++--- crates/core/src/lib.rs | 6 +++--- .../core/src/wasm_engine/callback/genesis.rs | 2 +- crates/dpki/src/lib.rs | 6 +++--- crates/holochain/src/main.rs | 6 +++--- crates/metrics/src/cloudwatch.rs | 8 ++++---- crates/metrics/src/config.rs | 4 ++-- crates/metrics/src/lib.rs | 6 +++--- crates/metrics/src/logger.rs | 4 ++-- crates/net/src/lib.rs | 6 +++--- crates/sim2h/Cargo.toml | 2 +- crates/sim2h/src/connection_state.rs | 4 ++-- crates/sim2h/src/crypto.rs | 14 ++++++------- crates/sim2h/src/lib.rs | 10 +++++----- crates/sim2h/src/message_log.rs | 4 ++-- crates/sim2h/src/naive_sharding.rs | 8 ++++---- crates/sim2h/src/websocket/mem.rs | 4 ++-- crates/sim2h/src/websocket/streams.rs | 4 ++-- crates/sim2h/src/websocket/tcp.rs | 4 ++-- crates/sim2h/src/websocket/tls.rs | 6 +++--- crates/sim2h/src/websocket/wss_info.rs | 4 ++-- crates/sim2h/src/wire_message.rs | 4 ++-- crates/sim2h_server/Cargo.toml | 2 +- crates/sim2h_server/src/main.rs | 20 +++++++++---------- 28 files changed, 79 insertions(+), 80 deletions(-) mode change 100644 => 100755 crates/sim2h/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index f9ed430ad7..5fec0698e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4048,7 +4048,6 @@ dependencies = [ "lib3h_zombie_actor 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "nanoid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4084,7 +4083,6 @@ dependencies = [ "lib3h_protocol 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "sim2h 0.0.44-alpha3", "structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "tracing-log 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 684124d16a..f1bd5ece51 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -1,5 +1,5 @@ #![warn(unused_extern_crates)] -#[macro_use] +//#[macro_use] extern crate holochain_common; extern crate holochain_conductor_lib; extern crate holochain_core; @@ -44,7 +44,7 @@ use crate::error::{HolochainError, HolochainResult}; use holochain_conductor_lib::happ_bundle::HappBundle; use std::{fs::File, io::Read, path::PathBuf, str::FromStr}; use structopt::{clap::arg_enum, StructOpt}; -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); #[derive(StructOpt)] /// A command line for Holochain diff --git a/crates/common/src/env_vars.rs b/crates/common/src/env_vars.rs index 1eeea625fb..68ad301bc1 100644 --- a/crates/common/src/env_vars.rs +++ b/crates/common/src/env_vars.rs @@ -42,6 +42,7 @@ impl EnvVar { } } +/* #[macro_export] macro_rules! new_relic_setup { ($x:expr) => { @@ -50,7 +51,7 @@ macro_rules! new_relic_setup { std::env::var_os($x).and_then(|s| s.into_string().ok()); } }; -} +}*/ #[test] fn test_macro() { diff --git a/crates/conductor_api/src/lib.rs b/crates/conductor_api/src/lib.rs index 913c8d336e..e5870f1adb 100644 --- a/crates/conductor_api/src/lib.rs +++ b/crates/conductor_api/src/lib.rs @@ -1,8 +1,8 @@ -#[macro_use] -extern crate holochain_common; +//#[macro_use] +//extern crate holochain_common; pub mod conductor_api; pub use conductor_api::ConductorApi; pub use holochain_wasm_utils::api_serialization::crypto::CryptoMethod; -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); diff --git a/crates/conductor_lib/src/lib.rs b/crates/conductor_lib/src/lib.rs index b6aedb38c0..6a4d101bff 100644 --- a/crates/conductor_lib/src/lib.rs +++ b/crates/conductor_lib/src/lib.rs @@ -111,8 +111,8 @@ extern crate lazy_static; extern crate pretty_assertions; #[macro_use] extern crate nickel; -#[macro_use] -extern crate holochain_common; +//#[macro_use] +//extern crate holochain_common; pub mod conductor; pub mod config; @@ -135,4 +135,4 @@ pub mod static_server_impls; pub use crate::holochain::Holochain; -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index ad89a6113c..c8bef10379 100755 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -28,8 +28,8 @@ extern crate holochain_logging; extern crate holochain_tracing as ht; #[macro_use] extern crate holochain_tracing_macros; -#[macro_use] -extern crate holochain_common; +//#[macro_use] +//extern crate holochain_common; #[macro_use] pub mod macros; @@ -67,4 +67,4 @@ pub mod state_dump; pub mod wasm_engine; pub mod workflows; -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); diff --git a/crates/core/src/wasm_engine/callback/genesis.rs b/crates/core/src/wasm_engine/callback/genesis.rs index 5dc242a39a..241bcd321d 100644 --- a/crates/core/src/wasm_engine/callback/genesis.rs +++ b/crates/core/src/wasm_engine/callback/genesis.rs @@ -1,7 +1,7 @@ use super::call; use crate::{ context::Context, - nucleus::ribosome::callback::{Callback, CallbackParams, CallbackResult},NEW_RELIC_LICENSE_KEY + nucleus::ribosome::callback::{Callback, CallbackParams, CallbackResult},//NEW_RELIC_LICENSE_KEY }; use std::sync::Arc; diff --git a/crates/dpki/src/lib.rs b/crates/dpki/src/lib.rs index 725035c58a..f400481703 100644 --- a/crates/dpki/src/lib.rs +++ b/crates/dpki/src/lib.rs @@ -6,8 +6,8 @@ #[macro_use] extern crate lazy_static; -#[macro_use] -extern crate holochain_common; +//#[macro_use] +//extern crate holochain_common; pub const CONTEXT_SIZE: usize = 8; pub const SEED_SIZE: usize = 32; @@ -28,4 +28,4 @@ pub mod password_encryption; pub mod seed; pub mod utils; -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); diff --git a/crates/holochain/src/main.rs b/crates/holochain/src/main.rs index 44d50cd061..5569980006 100755 --- a/crates/holochain/src/main.rs +++ b/crates/holochain/src/main.rs @@ -17,8 +17,8 @@ extern crate holochain_conductor_lib; extern crate holochain_core_types; extern crate holochain_locksmith; -#[macro_use] -extern crate holochain_common; +//#[macro_use] +//extern crate holochain_common; extern crate lib3h_sodium; #[cfg(unix)] extern crate signal_hook; @@ -37,7 +37,7 @@ use signal_hook::{iterator::Signals, SIGINT, SIGTERM}; use std::{fs::File, io::prelude::*, path::PathBuf, sync::Arc}; use structopt::StructOpt; -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); #[derive(StructOpt, Debug)] #[structopt(name = "holochain")] diff --git a/crates/metrics/src/cloudwatch.rs b/crates/metrics/src/cloudwatch.rs index a9ef0fd409..17e82c1db3 100644 --- a/crates/metrics/src/cloudwatch.rs +++ b/crates/metrics/src/cloudwatch.rs @@ -13,7 +13,7 @@ use std::{ }; use chrono::prelude::*; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use rusoto_sts::{StsAssumeRoleSessionCredentialsProvider, StsClient}; use std::collections::HashMap; use structopt::StructOpt; @@ -177,7 +177,7 @@ pub struct CloudwatchLogsOptions { pub query_args: QueryArgs, } -#[newrelic_autotrace(HOLOCHAIN_METRICS)] +//#[newrelic_autotrace(HOLOCHAIN_METRICS)] impl CloudWatchLogger { /// Query the cloudwatch logger given a start and stop time interval. /// Produces a raw vector of result field rows (each as a vector). @@ -397,7 +397,7 @@ impl CloudWatchLogger { const PUBLISH_CHUNK_SIZE: usize = 10; -#[newrelic_autotrace(HOLOCHAIN_METRICS)] +//#[newrelic_autotrace(HOLOCHAIN_METRICS)] impl MetricPublisher for CloudWatchLogger { fn publish(&mut self, metric: &Metric) { self.metrics_to_publish.push(metric.clone()); @@ -409,7 +409,7 @@ impl MetricPublisher for CloudWatchLogger { } } -#[newrelic_autotrace(HOLOCHAIN_METRICS)] +//#[newrelic_autotrace(HOLOCHAIN_METRICS)] impl CloudWatchLogger { fn publish_internal(&mut self) { let log_events = self diff --git a/crates/metrics/src/config.rs b/crates/metrics/src/config.rs index 1b03a1cf84..eff8c773e3 100644 --- a/crates/metrics/src/config.rs +++ b/crates/metrics/src/config.rs @@ -1,6 +1,6 @@ use crate::{cloudwatch::CloudWatchLogger, logger::LoggerMetricPublisher, MetricPublisher}; use holochain_locksmith::RwLock; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use std::sync::Arc; /// Unifies all possible metric publisher configurations @@ -30,7 +30,7 @@ impl Default for MetricPublisherConfig { } } -#[newrelic_autotrace(HOLOCHAIN_METRICS)] +//#[newrelic_autotrace(HOLOCHAIN_METRICS)] impl MetricPublisherConfig { /// Instantiates a new metric publisher given this configuration instance. pub fn create_metric_publisher(&self) -> Arc> { diff --git a/crates/metrics/src/lib.rs b/crates/metrics/src/lib.rs index 1ee0fc3c1c..fd29085ce4 100644 --- a/crates/metrics/src/lib.rs +++ b/crates/metrics/src/lib.rs @@ -14,8 +14,8 @@ extern crate lazy_static; #[macro_use] extern crate serde_derive; -#[macro_use] -extern crate holochain_common; +//#[macro_use] +//extern crate holochain_common; pub mod cloudwatch; pub mod config; @@ -26,4 +26,4 @@ pub mod stats; pub use cloudwatch::*; pub use config::*; pub use metrics::*; -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); diff --git a/crates/metrics/src/logger.rs b/crates/metrics/src/logger.rs index abdbbb0537..77f599b4e0 100644 --- a/crates/metrics/src/logger.rs +++ b/crates/metrics/src/logger.rs @@ -1,6 +1,6 @@ use crate::{Metric, MetricPublisher}; use chrono::prelude::*; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use regex::Regex; use std::{ convert::{TryFrom, TryInto}, @@ -133,7 +133,7 @@ impl TryFrom for Metric { } /// Produces an iterator of metric data given a log file name. -#[newrelic_autotrace(HOLOCHAIN_METRICS)] +//#[newrelic_autotrace(HOLOCHAIN_METRICS)] pub fn metrics_from_file(log_file: PathBuf) -> std::io::Result>> { let file = std::fs::File::open(log_file.clone())?; let reader = BufReader::new(file); diff --git a/crates/net/src/lib.rs b/crates/net/src/lib.rs index e4f4f1588b..1dafc75acf 100755 --- a/crates/net/src/lib.rs +++ b/crates/net/src/lib.rs @@ -7,8 +7,8 @@ #[macro_use] extern crate failure; -#[macro_use] -extern crate holochain_common; +//#[macro_use] +//extern crate holochain_common; #[macro_use] pub extern crate holochain_json_derive; extern crate holochain_tracing as ht; @@ -33,4 +33,4 @@ pub mod p2p_network; pub mod sim2h_worker; pub mod tweetlog; -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); diff --git a/crates/sim2h/Cargo.toml b/crates/sim2h/Cargo.toml index a06debad4d..a86db76114 100644 --- a/crates/sim2h/Cargo.toml +++ b/crates/sim2h/Cargo.toml @@ -54,7 +54,7 @@ openssl = "=0.10.25" tungstenite = "=0.9.2" threadpool = "=1.7.1" chashmap = "=2.2.2" -newrelic="0.2" +#newrelic="0.2" tracing = "=0.1.13" tracing-futures = "=0.2.2" twox-hash = "1.5.0" diff --git a/crates/sim2h/src/connection_state.rs b/crates/sim2h/src/connection_state.rs index a00f1d7762..1338bed498 100644 --- a/crates/sim2h/src/connection_state.rs +++ b/crates/sim2h/src/connection_state.rs @@ -4,7 +4,7 @@ use lib3h_protocol::types::{AgentPubKey, SpaceHash}; pub type AgentId = AgentPubKey; use crate::error::*; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; #[derive(Debug, Clone, PartialEq)] pub enum ConnectionState { @@ -13,7 +13,7 @@ pub enum ConnectionState { Joined(SpaceHash, AgentId), } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl ConnectionState { pub fn new() -> ConnectionState { ConnectionState::Limbo(Box::new(Vec::new())) diff --git a/crates/sim2h/src/crypto.rs b/crates/sim2h/src/crypto.rs index e33a988980..fdc6947c89 100644 --- a/crates/sim2h/src/crypto.rs +++ b/crates/sim2h/src/crypto.rs @@ -13,7 +13,7 @@ use holochain_core_types::{ use lib3h_protocol::{data_types::Opaque, types::AgentPubKey}; use lib3h_sodium::{secbuf::SecBuf, sign}; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use lazy_static::lazy_static; use serde::{Deserialize, Serialize}; use std::convert::TryFrom; @@ -24,7 +24,7 @@ pub struct SignedWireMessage { pub payload: Opaque, } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl SignedWireMessage { pub fn new(payload: Opaque, provenance: Provenance) -> Self { SignedWireMessage { @@ -109,7 +109,7 @@ lazy_static! { /// @param {Base32} pub_key_b32 - Public signing key to decode /// @param {HcidEncoding} codec - The configured HCID decoder to use /// @return {SecBuf} Resulting decoded key -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] pub(crate) fn decode_pub_key(pub_key_b32: Base32, codec: &HcidEncoding) -> HcResult { // Decode Base32 public key let pub_key = codec.decode(&pub_key_b32)?; @@ -127,7 +127,7 @@ pub(crate) fn decode_pub_key(pub_key_b32: Base32, codec: &HcidEncoding) -> HcRes /// @param {HcidEncoding} codec - The configured HCID encoder to use /// @return {Base32} Resulting HCID encoded key #[allow(dead_code)] //used in test only -#[newrelic_autotrace(SIM2H)] + //#[newrelic_autotrace(SIM2H)] pub(crate) fn encode_pub_key(pub_key_sec: &mut SecBuf, codec: &HcidEncoding) -> HcResult { let locker = pub_key_sec.read_lock(); Ok(codec.encode(&locker[0..SEED_SIZE])?) @@ -138,7 +138,7 @@ pub(crate) fn encode_pub_key(pub_key_sec: &mut SecBuf, codec: &HcidEncoding) -> /// @param {SecBuf} data - Data buffer to verify /// @param {SecBuf} signature - Candidate signature for that data buffer /// @return true if verification succeeded -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] pub fn verify_bufs( pub_sign_key_b32: Base32, data: &mut SecBuf, @@ -149,7 +149,7 @@ pub fn verify_bufs( } /// returns a random buf -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] pub fn generate_random_buf(size: usize) -> SecBuf { let mut seed = SecBuf::with_insecure(size); seed.randomize(); @@ -157,7 +157,7 @@ pub fn generate_random_buf(size: usize) -> SecBuf { } /// returns a random seed buf -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] pub fn generate_random_seed_buf() -> SecBuf { generate_random_buf(SEED_SIZE) } diff --git a/crates/sim2h/src/lib.rs b/crates/sim2h/src/lib.rs old mode 100644 new mode 100755 index 30d55907e3..3d69ed4894 --- a/crates/sim2h/src/lib.rs +++ b/crates/sim2h/src/lib.rs @@ -39,11 +39,11 @@ use std::{ io::prelude::*, }; -use holochain_common::new_relic_setup; +//use holochain_common::new_relic_setup; use holochain_locksmith::Mutex; use holochain_metrics::{config::MetricPublisherConfig, Metric}; use holochain_tracing as ht; -use holochain_tracing_macros::{autotrace, newrelic_autotrace}; +//use holochain_tracing_macros::{autotrace, newrelic_autotrace}; use ht::prelude::*; use lazy_static::lazy_static; use sim2h_im_state::{MonoAspectHash, MonoEntryHash, StoreRef}; @@ -82,7 +82,7 @@ lazy_static! { const MAX_LOCK_TIMEOUT: u64 = 20000; //set up license_key -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); /// extention trait for making sure deadlocks are fatal pub(crate) trait MutexExt { @@ -1157,8 +1157,8 @@ pub struct Sim2h { metric_gen: MetricsTimerGenerator, } -#[autotrace] -#[newrelic_autotrace(SIM2H)] +//#[autotrace] +//#[newrelic_autotrace(SIM2H)] impl Sim2h { /// create a new Sim2h server instance pub fn new( diff --git a/crates/sim2h/src/message_log.rs b/crates/sim2h/src/message_log.rs index ed75c7cacd..5c5ed34ee0 100644 --- a/crates/sim2h/src/message_log.rs +++ b/crates/sim2h/src/message_log.rs @@ -1,7 +1,7 @@ use crate::WireMessage; use chrono::{DateTime, Utc}; use holochain_tracing::prelude::*; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use lazy_static::lazy_static; use lib3h_protocol::{types::AgentPubKey, uri::Lib3hUri}; use parking_lot::Mutex; @@ -37,7 +37,7 @@ pub struct MessageLogger { running: bool, } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl MessageLogger { pub fn new() -> Self { MessageLogger { diff --git a/crates/sim2h/src/naive_sharding.rs b/crates/sim2h/src/naive_sharding.rs index 62b76e80a8..acf478c629 100644 --- a/crates/sim2h/src/naive_sharding.rs +++ b/crates/sim2h/src/naive_sharding.rs @@ -1,4 +1,4 @@ -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use lib3h::rrdht_util::*; use lib3h_crypto_api::CryptoSystem; use lib3h_protocol::types::EntryHash; @@ -6,7 +6,7 @@ use lib3h_protocol::types::EntryHash; #[allow(clippy::borrowed_box)] /// ack - lib3h can only convert agent_ids to locations right now /// work around this in a dorky manner -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] pub fn anything_to_location(crypto: &Box, anything: &str) -> Location { match calc_location_for_id(crypto, anything) { Ok(loc) => loc, @@ -27,7 +27,7 @@ pub fn anything_to_location(crypto: &Box, anything: &str) -> L } #[allow(clippy::borrowed_box)] -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] pub fn entry_location(crypto: &Box, entry_hash: &EntryHash) -> Location { let entry_hash_str: String = entry_hash.clone().into(); anything_to_location(crypto, &entry_hash_str) @@ -37,7 +37,7 @@ pub fn entry_location(crypto: &Box, entry_hash: &EntryHash) -> /// to distribute data when node counts go > 50 // NOTE - don't decorate this function with tracing // it gets called often enough that performance suffers -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] pub fn naive_sharding_should_store( agent_loc: Location, data_addr_loc: Location, diff --git a/crates/sim2h/src/websocket/mem.rs b/crates/sim2h/src/websocket/mem.rs index d79ef6accc..fb65eadc4e 100644 --- a/crates/sim2h/src/websocket/mem.rs +++ b/crates/sim2h/src/websocket/mem.rs @@ -1,10 +1,10 @@ use crate::websocket::{mem_stream::*, streams::*, tls::TlsConfig, wss_info::WssInfo}; use lib3h::transport::error::*; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use url2::prelude::*; -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl StreamManager { pub fn with_mem_stream(tls_config: TlsConfig) -> Self { let bind: Bind = Box::new(move |url| Self::mem_bind(&Url2::from(url))); diff --git a/crates/sim2h/src/websocket/streams.rs b/crates/sim2h/src/websocket/streams.rs index 77a982cea4..80a3ab9543 100644 --- a/crates/sim2h/src/websocket/streams.rs +++ b/crates/sim2h/src/websocket/streams.rs @@ -5,7 +5,7 @@ use crate::websocket::{ WssSrvMidHandshake, WssStream, }; use holochain_tracing::prelude::*; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use lib3h::transport::error::{TransportError, TransportResult}; @@ -92,7 +92,7 @@ pub struct StreamManager { acceptor: TransportResult>, } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl StreamManager { pub fn new(stream_factory: StreamFactory, bind: Bind, tls_config: TlsConfig) -> Self { StreamManager { diff --git a/crates/sim2h/src/websocket/tcp.rs b/crates/sim2h/src/websocket/tcp.rs index 599e861d37..bbf08832e3 100644 --- a/crates/sim2h/src/websocket/tcp.rs +++ b/crates/sim2h/src/websocket/tcp.rs @@ -1,6 +1,6 @@ //! abstraction for working with Websocket connections //! TcpStream specific functions -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use lib3h::transport::error::{ErrorKind, TransportError, TransportResult}; use crate::websocket::{ @@ -13,7 +13,7 @@ use url2::prelude::*; use std::net::{TcpListener, TcpStream}; -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl StreamManager { /// convenience constructor for creating a websocket "Transport" /// instance that is based of the rust std TcpStream diff --git a/crates/sim2h/src/websocket/tls.rs b/crates/sim2h/src/websocket/tls.rs index f6aa0c9265..da30ceb1dd 100644 --- a/crates/sim2h/src/websocket/tls.rs +++ b/crates/sim2h/src/websocket/tls.rs @@ -2,7 +2,7 @@ use crate::websocket::{FAKE_PASS, FAKE_PKCS12}; use lib3h::transport::error::TransportResult; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use openssl::{ asn1::Asn1Time, bn::{BigNum, MsbOption}, @@ -53,7 +53,7 @@ pub struct TlsCertificate { pub(in crate::websocket) passphrase: String, } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl TlsCertificate { /// Creates a self-signed certificate with an entropy key and passphrase. /// This makes it possible to use a TLS encrypted connection securely between two @@ -84,7 +84,7 @@ pub enum TlsConfig { SuppliedCertificate(TlsCertificate), } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl TlsConfig { pub fn build_from_entropy() -> Self { TlsConfig::SuppliedCertificate(TlsCertificate::build_from_entropy()) diff --git a/crates/sim2h/src/websocket/wss_info.rs b/crates/sim2h/src/websocket/wss_info.rs index 9372a8dbe6..66c1689867 100644 --- a/crates/sim2h/src/websocket/wss_info.rs +++ b/crates/sim2h/src/websocket/wss_info.rs @@ -1,5 +1,5 @@ use crate::websocket::{streams::WebsocketStreamState, BaseStream, TransportResult}; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; /// Represents an individual connection #[derive(Debug)] @@ -10,7 +10,7 @@ pub struct WssInfo { pub(in crate::websocket) stateful_socket: WebsocketStreamState, } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl WssInfo { pub fn close(&mut self) -> TransportResult<()> { if let WebsocketStreamState::ReadyWss(socket) = &mut self.stateful_socket { diff --git a/crates/sim2h/src/wire_message.rs b/crates/sim2h/src/wire_message.rs index 6da8533ce7..81c2dddee6 100644 --- a/crates/sim2h/src/wire_message.rs +++ b/crates/sim2h/src/wire_message.rs @@ -1,7 +1,7 @@ //! encapsulates lib3h ghostmessage for sim2h including security challenge use crate::error::Sim2hError; use holochain_tracing as ht; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use lib3h_protocol::{data_types::Opaque, protocol::*, types::SpaceHash}; use serde::{Deserialize, Serialize}; use std::{collections::BTreeMap, convert::TryFrom}; @@ -51,7 +51,7 @@ pub enum WireMessage { DebugResponse(BTreeMap), } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl WireMessage { pub fn message_type(&self) -> String { String::from(match self { diff --git a/crates/sim2h_server/Cargo.toml b/crates/sim2h_server/Cargo.toml index 407c2e38ac..2e49075c7e 100644 --- a/crates/sim2h_server/Cargo.toml +++ b/crates/sim2h_server/Cargo.toml @@ -17,7 +17,7 @@ sim2h = { version = "=0.0.44-alpha3", path = "../sim2h" } holochain_common = { version = "=0.0.44-alpha3", path = "../common" } holochain_tracing = "=0.0.22" holochain_tracing_macros = "=0.0.22" -newrelic="0.2" +#newrelic="0.2" detach = "=0.0.19" futures = "=0.3.2" lib3h = "=0.0.39" diff --git a/crates/sim2h_server/src/main.rs b/crates/sim2h_server/src/main.rs index 36eec0e977..3cd4c3d2c3 100644 --- a/crates/sim2h_server/src/main.rs +++ b/crates/sim2h_server/src/main.rs @@ -1,15 +1,15 @@ extern crate holochain_tracing as ht; extern crate lib3h_sodium; extern crate log; -extern crate newrelic; +//extern crate newrelic; extern crate structopt; -#[macro_use(new_relic_setup)] +//#[macro_use(new_relic_setup)] extern crate holochain_common; -use holochain_tracing::prelude::*; +//use holochain_tracing::prelude::*; use lib3h_protocol::uri::Builder; use lib3h_sodium::SodiumCryptoSystem; -use newrelic::{LogLevel, LogOutput, NewRelicConfig}; +//use newrelic::{LogLevel, LogOutput, NewRelicConfig}; use sim2h::{run_sim2h, DhtAlgorithm, MESSAGE_LOGGER}; use std::path::PathBuf; use structopt::StructOpt; @@ -60,14 +60,14 @@ struct Cli { structured: ht::structured::Output, } -new_relic_setup!("NEW_RELIC_LICENSE_KEY"); -#[holochain_tracing_macros::newrelic_autotrace(SIM2H_SERVER)] +//new_relic_setup!("NEW_RELIC_LICENSE_KEY"); +//#[holochain_tracing_macros::newrelic_autotrace(SIM2H_SERVER)] fn main() { //this set up new relic needs - NewRelicConfig::default() - .logging(LogLevel::Error, LogOutput::StdErr) - .init() - .unwrap_or_else(|_| warn!("Could not configure new relic daemon")); + /* NewRelicConfig::default() + .logging(LogLevel::Error, LogOutput::StdErr) + .init() + .unwrap_or_else(|_| warn!("Could not configure new relic daemon"));*/ let args = Cli::from_args(); ht::structured::init_fmt(args.structured, args.tracing_name) From 2b8ce5b3744012d5b3779cfd55cce47370e74bb6 Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Sun, 8 Mar 2020 10:59:14 -0400 Subject: [PATCH 4/6] missed removal of newrelic --- crates/common/src/env_vars.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/common/src/env_vars.rs b/crates/common/src/env_vars.rs index 68ad301bc1..7a1f69bec9 100644 --- a/crates/common/src/env_vars.rs +++ b/crates/common/src/env_vars.rs @@ -51,10 +51,11 @@ macro_rules! new_relic_setup { std::env::var_os($x).and_then(|s| s.into_string().ok()); } }; -}*/ +} #[test] fn test_macro() { new_relic_setup!("NEW_RELIC_LICENSE_KEY"); assert_eq!(*NEW_RELIC_LICENSE_KEY, None); } +*/ From ec8576da12754a7f7c2f093df642d2076fcc5c6a Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Sun, 8 Mar 2020 14:48:40 -0400 Subject: [PATCH 5/6] one more missed removal --- crates/metrics/src/stats.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/metrics/src/stats.rs b/crates/metrics/src/stats.rs index 2ceccb7962..edd6c41c8c 100644 --- a/crates/metrics/src/stats.rs +++ b/crates/metrics/src/stats.rs @@ -12,7 +12,7 @@ use std::{ iter::FromIterator, }; -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use regex::Regex; /// Generic representation of descriptive statistics. @@ -357,7 +357,7 @@ impl Default for LessThanStatCheck { } } -#[newrelic_autotrace(HOLOCHAIN_METRICS)] +//#[newrelic_autotrace(HOLOCHAIN_METRICS)] impl StatCheck for LessThanStatCheck { fn check( &self, @@ -480,7 +480,7 @@ impl GroupingKey { #[shrinkwrap(mutable)] pub struct StatsByMetric(pub HashMap); -#[newrelic_autotrace(HOLOCHAIN_METRICS)] +//#[newrelic_autotrace(HOLOCHAIN_METRICS)] impl<'a, D: DescriptiveStats + Clone + 'a> StatsByMetric { pub fn to_records(&self) -> Box + 'a> { let me = self.0.clone(); From a56c2a7bdb6a12e6f574f6e6510634c7099282aa Mon Sep 17 00:00:00 2001 From: Eric Harris-Braun Date: Sun, 8 Mar 2020 15:28:23 -0400 Subject: [PATCH 6/6] more removal --- Cargo.lock | 42 ------------------- crates/cli/Cargo.toml | 2 +- crates/conductor_api/Cargo.toml | 2 +- crates/conductor_lib/Cargo.toml | 2 +- crates/conductor_lib/src/conductor/base.rs | 2 +- crates/conductor_lib/src/config.rs | 2 +- crates/conductor_lib/src/lib.rs | 4 +- crates/core/Cargo.toml | 2 +- crates/core/src/agent/state.rs | 2 +- crates/core/src/context.rs | 14 +++---- crates/core/src/dht/mod.rs | 6 +-- crates/core/src/instance.rs | 6 +-- crates/core/src/lib.rs | 28 ++++++------- .../core/src/network/actions/custom_send.rs | 2 +- .../src/network/actions/initialize_network.rs | 2 +- crates/core/src/network/actions/mod.rs | 14 +++---- crates/core/src/network/handler/fetch.rs | 2 +- crates/core/src/network/handler/lists.rs | 2 +- crates/core/src/network/handler/mod.rs | 12 +++--- crates/core/src/network/handler/query.rs | 4 +- crates/core/src/network/handler/send.rs | 6 +-- crates/core/src/network/handler/store.rs | 2 +- crates/core/src/network/mod.rs | 4 +- .../reducers/handle_custom_send_response.rs | 2 +- crates/core/src/network/reducers/init.rs | 2 +- crates/core/src/network/reducers/mod.rs | 8 ++-- .../network/reducers/send_direct_message.rs | 4 +- crates/core/src/network/reducers/shutdown.rs | 2 +- .../src/nucleus/actions/call_zome_function.rs | 2 +- crates/core/src/nucleus/actions/initialize.rs | 2 +- .../actions/run_validation_callback.rs | 2 +- crates/core/src/nucleus/state.rs | 2 +- crates/core/src/state.rs | 8 ++-- crates/core/src/wasm_engine/api/call.rs | 4 +- .../core/src/wasm_engine/callback/genesis.rs | 2 +- crates/core/src/wasm_engine/callback/init.rs | 2 +- .../src/wasm_engine/callback/links_utils.rs | 2 +- crates/core/src/wasm_engine/callback/mod.rs | 2 +- .../core/src/wasm_engine/callback/receive.rs | 2 +- .../callback/validation_package.rs | 2 +- crates/core/src/wasm_engine/mod.rs | 2 +- crates/core/src/wasm_engine/run_dna.rs | 2 +- crates/core/src/workflows/mod.rs | 28 ++++++------- .../respond_validation_package_request.rs | 2 +- crates/dpki/Cargo.toml | 2 +- crates/holochain/Cargo.toml | 2 +- crates/metrics/Cargo.toml | 2 +- crates/net/Cargo.toml | 2 +- crates/net/src/lib.rs | 4 +- crates/net/src/sim2h_worker.rs | 2 +- crates/sim2h/Cargo.toml | 2 +- crates/sim2h/src/lib.rs | 2 +- crates/sim2h/src/websocket/mem_stream.rs | 12 +++--- crates/sim2h_server/Cargo.toml | 2 +- 54 files changed, 119 insertions(+), 161 deletions(-) mode change 100644 => 100755 crates/conductor_lib/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 5fec0698e4..d68f3adfe2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1101,7 +1101,6 @@ dependencies = [ "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_file 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_wasm_utils 0.0.44-alpha3", "ignore 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "in_stream 0.0.44-alpha3", @@ -1219,7 +1218,6 @@ dependencies = [ "holochain_core_types 0.0.44-alpha3", "holochain_locksmith 0.0.44-alpha3", "holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1263,7 +1261,6 @@ dependencies = [ "holochain_persistence_mem 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_pickle 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_wasm_utils 0.0.44-alpha3", "hyper 0.12.25 (registry+https://github.com/rust-lang/crates.io-index)", "json-patch 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1304,7 +1301,6 @@ dependencies = [ "holochain_common 0.0.44-alpha3", "holochain_core_types 0.0.44-alpha3", "holochain_locksmith 0.0.44-alpha3", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_wasm_utils 0.0.44-alpha3", "jsonrpc-core 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-lite 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1351,7 +1347,6 @@ dependencies = [ "holochain_persistence_lmdb 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_mem 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_wasm_utils 0.0.44-alpha3", "im 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1427,7 +1422,6 @@ dependencies = [ "holochain_common 0.0.44-alpha3", "holochain_core_types 0.0.44-alpha3", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_sodium 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1511,7 +1505,6 @@ dependencies = [ "holochain_common 0.0.44-alpha3", "holochain_locksmith 0.0.44-alpha3", "holochain_logging 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1555,7 +1548,6 @@ dependencies = [ "holochain_metrics 0.0.44-alpha3", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "in_stream 0.0.44-alpha3", "jsonrpc-core 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1734,21 +1726,6 @@ dependencies = [ "tracing-subscriber 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "holochain_tracing_macros" -version = "0.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "holochain_wasm_utils" version = "0.0.44-alpha3" @@ -2532,20 +2509,6 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "newrelic" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "newrelic-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "newrelic-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "nickel" version = "0.11.0" @@ -4037,7 +4000,6 @@ dependencies = [ "holochain_metrics 0.0.44-alpha3", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "im 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "in_stream 0.0.44-alpha3", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4077,7 +4039,6 @@ dependencies = [ "futures 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_common 0.0.44-alpha3", "holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "lib3h_protocol 0.0.39 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5631,7 +5592,6 @@ dependencies = [ "checksum holochain_persistence_mem 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "bf45bd3a7d8e7a0b32ee78f1793d2a6c8b38e3c047a4622f896c5af5dbd21aec" "checksum holochain_persistence_pickle 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dd09d8cefe9229380445dc616b15077f6ffe94d1afd6082ffd7b51cb11e911cb" "checksum holochain_tracing 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "9172240b1df04a67e151ba7b9f71fa97e69f11dfc1aa88cd930d3edee642d8ba" -"checksum holochain_tracing_macros 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "99f1f9a41d4218f9cdd855332b1ca8b4c1eefe67e1ee2267204236eeef699dd8" "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e" "checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" "checksum http_req 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23fdb3445813f5f5e7fdb9d93df8f1c7e382237f2656b21c42e93e3a63e25c11" @@ -5707,8 +5667,6 @@ dependencies = [ "checksum nanoid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef553a0f07a7a45c731f0c5d83cf9ef9caddf7407e413142731db416504bfe0f" "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -"checksum newrelic 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7ec1eb312ccd33c2d88ff317d59164465a41014ad465ba8a67e2c062343e3a8" -"checksum newrelic-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a9b9030b5f433ac2afb956eeaf89020e07d3cb9b0561cd07f1737c97a4af93a" "checksum nickel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5061a832728db2dacb61cefe0ce303b58f85764ec680e71d9138229640a46d9" "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" "checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 9ab623dee1..4171f4de6b 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -16,7 +16,7 @@ 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.22" -holochain_tracing_macros = "=0.0.22" +#holochain_tracing_macros = "=0.0.22" sim2h = { version = "=0.0.44-alpha3", path = "../sim2h" } lib3h_crypto_api = "=0.0.39" in_stream = { version = "=0.0.44-alpha3", path = "../in_stream" } diff --git a/crates/conductor_api/Cargo.toml b/crates/conductor_api/Cargo.toml index 8fe6a2c3c6..5cae726725 100644 --- a/crates/conductor_api/Cargo.toml +++ b/crates/conductor_api/Cargo.toml @@ -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.22" +#holochain_tracing_macros = "=0.0.22" holochain_common = { version = "=0.0.44-alpha3", path = "../common" } jsonrpc-core = "=14.0.1" jsonrpc-lite = "=0.5.0" diff --git a/crates/conductor_lib/Cargo.toml b/crates/conductor_lib/Cargo.toml index c04a6fc0f5..0d25c1d310 100644 --- a/crates/conductor_lib/Cargo.toml +++ b/crates/conductor_lib/Cargo.toml @@ -23,7 +23,7 @@ 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.22" -holochain_tracing_macros = "=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" } diff --git a/crates/conductor_lib/src/conductor/base.rs b/crates/conductor_lib/src/conductor/base.rs index 07e5ce689e..ebec22a142 100644 --- a/crates/conductor_lib/src/conductor/base.rs +++ b/crates/conductor_lib/src/conductor/base.rs @@ -168,7 +168,7 @@ pub fn notify(msg: String) { println!("{}", msg); } -#[autotrace] +////#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl Conductor { pub fn from_config(config: Configuration) -> Self { diff --git a/crates/conductor_lib/src/config.rs b/crates/conductor_lib/src/config.rs index 8df5ce6626..9fa9bfe477 100644 --- a/crates/conductor_lib/src/config.rs +++ b/crates/conductor_lib/src/config.rs @@ -234,7 +234,7 @@ fn detect_dupes<'a, I: Iterator>( } } -#[autotrace] +////#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CONDUCTOR_LIB)] impl Configuration { /// This function basically checks if self is a semantically valid configuration. diff --git a/crates/conductor_lib/src/lib.rs b/crates/conductor_lib/src/lib.rs old mode 100644 new mode 100755 index 75353dfde0..56f7747456 --- a/crates/conductor_lib/src/lib.rs +++ b/crates/conductor_lib/src/lib.rs @@ -89,8 +89,8 @@ extern crate holochain_core; #[macro_use] extern crate holochain_json_derive; -#[macro_use] -extern crate holochain_tracing_macros; +//#[macro_use] +//extern crate holochain_tracing_macros; #[macro_use] extern crate log; #[macro_use] diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index ad1bc3ec17..c33a94287f 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -41,7 +41,7 @@ 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.22" -holochain_tracing_macros = "=0.0.22" +#holochain_tracing_macros = "=0.0.22" log = "=0.4.8" holochain_logging = "=0.0.7" boolinator = "=2.4.0" diff --git a/crates/core/src/agent/state.rs b/crates/core/src/agent/state.rs index 9c0ad9598f..44e9536d37 100644 --- a/crates/core/src/agent/state.rs +++ b/crates/core/src/agent/state.rs @@ -39,7 +39,7 @@ pub struct AgentState { initial_agent_address: Address, } -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl AgentState { /// builds a new, empty AgentState diff --git a/crates/core/src/context.rs b/crates/core/src/context.rs index b836ca0e76..677dd6a749 100644 --- a/crates/core/src/context.rs +++ b/crates/core/src/context.rs @@ -222,7 +222,7 @@ impl Context { self.state = Some(state); } - #[autotrace] + //#[autotrace] pub fn state(&self) -> Option { self.state.as_ref().map(|s| { while self.redux_wants_write.load(Relaxed) { @@ -236,7 +236,7 @@ impl Context { /// Returns immediately either with the lock or with None if the lock /// is occupied already. /// Also returns None if the context was not initialized with a state. - #[no_autotrace] + //#[no_autotrace] pub fn try_state(&self) -> Option> { if self.redux_wants_write.load(Relaxed) { None @@ -252,7 +252,7 @@ impl Context { self.state().map(move |state| state.network()) } - #[autotrace] + //#[autotrace] pub fn get_dna(&self) -> Option { // In the case of init we encounter race conditions with regards to setting the DNA. // Init gets called asynchronously right after dispatching an action that sets the DNA in @@ -284,7 +284,7 @@ impl Context { dna } - #[autotrace] + //#[autotrace] pub fn get_wasm(&self, zome: &str) -> Option { let dna = self.get_dna().expect("Callback called without DNA set!"); dna.get_wasm_from_zome_name(zome) @@ -353,7 +353,7 @@ impl Context { /// Custom future executor that enables nested futures and nested calls of `block_on`. /// This makes use of the redux action loop and the observers. /// The given future gets polled everytime the instance's state got changed. - #[autotrace] + //#[autotrace] pub fn block_on(&self, future: F) -> ::Output { let tick_rx = self.create_observer(); pin_utils::pin_mut!(future); @@ -382,7 +382,7 @@ impl Context { } /// returns the public capability token (if any) - #[autotrace] + //#[autotrace] pub fn get_public_token(&self) -> Result { let state = self.state().ok_or("State uninitialized!")?; let top = state @@ -440,7 +440,7 @@ impl Context { } } -#[autotrace] +//#[autotrace] pub async fn get_dna_and_agent(context: &Arc) -> HcResult<(Address, String)> { let state = context .state() diff --git a/crates/core/src/dht/mod.rs b/crates/core/src/dht/mod.rs index 6c3d347adb..8ed59b5624 100644 --- a/crates/core/src/dht/mod.rs +++ b/crates/core/src/dht/mod.rs @@ -1,12 +1,12 @@ //! DHT is the module that handles the agent's local shard of data and p2p communications -#[autotrace] +//#[autotrace] pub mod actions; pub mod aspect_map; pub mod dht_reducers; -#[autotrace] +//#[autotrace] pub mod dht_store; pub mod pending_validations; -#[autotrace] +//#[autotrace] mod dht_inner_reducers; diff --git a/crates/core/src/instance.rs b/crates/core/src/instance.rs index fcb315d69a..c2b89ba1fc 100644 --- a/crates/core/src/instance.rs +++ b/crates/core/src/instance.rs @@ -64,7 +64,7 @@ pub struct Observer { pub static DISPATCH_WITHOUT_CHANNELS: &str = "dispatch called without channels open"; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] impl Instance { /// This is initializing and starting the redux action loop and adding channels to dispatch @@ -457,7 +457,7 @@ impl Instance { } #[allow(clippy::needless_lifetimes)] - #[no_autotrace] + //#[no_autotrace] pub async fn shutdown_network(&self) -> HcResult<()> { network::actions::shutdown::shutdown( self.state.clone(), @@ -488,7 +488,7 @@ impl Drop for Instance { /// # Panics /// /// Panics if the channels passed are disconnected. -#[autotrace] +//#[autotrace] pub fn dispatch_action(action_channel: &ActionSender, action_wrapper: ActionWrapper) { lax_send_wrapped(action_channel.clone(), action_wrapper, "dispatch_action"); } diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index c8bef10379..b167d102a8 100755 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -26,43 +26,43 @@ extern crate log; #[macro_use] extern crate holochain_logging; extern crate holochain_tracing as ht; -#[macro_use] -extern crate holochain_tracing_macros; +//#[macro_use] +//extern crate holochain_tracing_macros; //#[macro_use] //extern crate holochain_common; #[macro_use] pub mod macros; -// #[autotrace] +//#[autotrace] pub mod action; -// #[autotrace] +//#[autotrace] pub mod agent; -// #[autotrace] +//#[autotrace] pub mod consistency; -// #[autotrace] +//#[autotrace] pub mod content_store; -// #[autotrace] +//#[autotrace] pub mod context; pub mod dht; pub mod entry; -#[autotrace] +//#[autotrace] pub mod instance; #[cfg(test)] pub mod link_tests; pub mod logger; -// #[autotrace] +//#[autotrace] pub mod network; -// #[autotrace] +//#[autotrace] pub mod nucleus; -// #[autotrace] +//#[autotrace] pub mod persister; pub mod scheduled_jobs; -// #[autotrace] +//#[autotrace] pub mod signal; -// #[autotrace] +//#[autotrace] pub mod state; -// #[autotrace] +//#[autotrace] pub mod state_dump; pub mod wasm_engine; pub mod workflows; diff --git a/crates/core/src/network/actions/custom_send.rs b/crates/core/src/network/actions/custom_send.rs index d06f79b19e..410dde76c5 100644 --- a/crates/core/src/network/actions/custom_send.rs +++ b/crates/core/src/network/actions/custom_send.rs @@ -14,7 +14,7 @@ use std::{pin::Pin, sync::Arc, time::SystemTime}; /// SendDirectMessage Action Creator for custom (=app) messages /// This triggers the network module to open a synchronous node-to-node connection /// by sending the given CustomDirectMessage and preparing to receive a response. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn custom_send( to_agent: Address, diff --git a/crates/core/src/network/actions/initialize_network.rs b/crates/core/src/network/actions/initialize_network.rs index b0a54d02fc..c3ddba288e 100644 --- a/crates/core/src/network/actions/initialize_network.rs +++ b/crates/core/src/network/actions/initialize_network.rs @@ -11,7 +11,7 @@ use holochain_persistence_api::cas::content::Address; use std::{pin::Pin, sync::Arc}; /// Creates a network proxy object and stores DNA and agent hash in the network state. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn initialize_network(context: &Arc) -> HcResult<()> { let (dna_address, agent_id) = get_dna_and_agent(context).await?; diff --git a/crates/core/src/network/actions/mod.rs b/crates/core/src/network/actions/mod.rs index 2980928e47..91cdf55210 100644 --- a/crates/core/src/network/actions/mod.rs +++ b/crates/core/src/network/actions/mod.rs @@ -1,16 +1,16 @@ -#[autotrace] +//#[autotrace] pub mod custom_send; -#[autotrace] +//#[autotrace] pub mod get_validation_package; -#[autotrace] +//#[autotrace] pub mod initialize_network; -#[autotrace] +//#[autotrace] pub mod publish; -#[autotrace] +//#[autotrace] pub mod publish_header_entry; -#[autotrace] +//#[autotrace] pub mod query; -#[autotrace] +//#[autotrace] pub mod shutdown; use crate::state::ActionResponse; diff --git a/crates/core/src/network/handler/fetch.rs b/crates/core/src/network/handler/fetch.rs index 98282f534c..51d518f667 100644 --- a/crates/core/src/network/handler/fetch.rs +++ b/crates/core/src/network/handler/fetch.rs @@ -12,7 +12,7 @@ use std::{collections::HashSet, sync::Arc}; /// The network has requested a DHT entry from us. /// Lets try to get it and trigger a response. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_fetch_entry(get_dht_data: FetchEntryData, context: Arc) { let address = get_dht_data.entry_address.clone(); diff --git a/crates/core/src/network/handler/lists.rs b/crates/core/src/network/handler/lists.rs index c1964651e7..e7bbbfae52 100644 --- a/crates/core/src/network/handler/lists.rs +++ b/crates/core/src/network/handler/lists.rs @@ -18,7 +18,7 @@ use lib3h_protocol::{ }; use std::sync::Arc; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_get_authoring_list(get_list_data: GetListData, context: Arc) { let c = context.clone(); diff --git a/crates/core/src/network/handler/mod.rs b/crates/core/src/network/handler/mod.rs index c3433d0a29..13a7af891c 100644 --- a/crates/core/src/network/handler/mod.rs +++ b/crates/core/src/network/handler/mod.rs @@ -1,14 +1,14 @@ use crate::{agent::state::create_entry_with_header_for_header, content_store::GetContent}; use holochain_logging::prelude::*; -#[autotrace] +//#[autotrace] pub mod fetch; -#[autotrace] +//#[autotrace] pub mod lists; -#[autotrace] +//#[autotrace] pub mod query; -#[autotrace] +//#[autotrace] pub mod send; -#[autotrace] +//#[autotrace] pub mod store; use crate::{ @@ -112,7 +112,7 @@ MessageData {{ } // TODO Implement a failure workflow? -#[autotrace] +//#[autotrace] fn handle_failure_result( context: &Arc, failure_data: GenericResultData, diff --git a/crates/core/src/network/handler/query.rs b/crates/core/src/network/handler/query.rs index 1aa405dd29..e364a453f0 100644 --- a/crates/core/src/network/handler/query.rs +++ b/crates/core/src/network/handler/query.rs @@ -176,7 +176,7 @@ fn get_entry(context: &Arc, address: Address) -> Option) { let query_json = @@ -232,7 +232,7 @@ pub fn handle_query_entry_data(query_data: QueryEntryData, context: Arc /// The network comes back with a result to our previous query with a result, so we /// examine the query result for its type and dispatch different actions according to variant -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_query_entry_result(query_result_data: QueryEntryResultData, context: Arc) { let query_result_json = JsonString::from_json( diff --git a/crates/core/src/network/handler/send.rs b/crates/core/src/network/handler/send.rs index a72f2dd2bb..be718d2a9a 100644 --- a/crates/core/src/network/handler/send.rs +++ b/crates/core/src/network/handler/send.rs @@ -14,7 +14,7 @@ use holochain_json_api::{error::JsonError, json::JsonString}; use lib3h_protocol::data_types::DirectMessageData; use std::convert::TryFrom; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn parse_direct_message(content: &[u8]) -> Result { DirectMessage::try_from(JsonString::from_json( @@ -25,7 +25,7 @@ fn parse_direct_message(content: &[u8]) -> Result { /// We got a ProtocolWrapper::SendMessage, this means somebody initiates message roundtrip /// -> we are being called -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_send_message(message_data: DirectMessageData, context: Arc) { let message = match parse_direct_message(&*message_data.content.clone()) { @@ -85,7 +85,7 @@ pub fn handle_send_message(message_data: DirectMessageData, context: Arc) { let response = match parse_direct_message(&message_data.content.clone()) { diff --git a/crates/core/src/network/handler/store.rs b/crates/core/src/network/handler/store.rs index 0ed0435734..820352960e 100644 --- a/crates/core/src/network/handler/store.rs +++ b/crates/core/src/network/handler/store.rs @@ -14,7 +14,7 @@ use std::{ }; /// The network requests us to store (i.e. hold) the given entry aspect data. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn handle_store(dht_data: StoreEntryAspectData, context: Arc) { let aspect_json = diff --git a/crates/core/src/network/mod.rs b/crates/core/src/network/mod.rs index 1d85fcb0b3..c60c3c9362 100644 --- a/crates/core/src/network/mod.rs +++ b/crates/core/src/network/mod.rs @@ -1,9 +1,9 @@ pub mod actions; pub mod direct_message; pub mod entry_with_header; -#[autotrace] +//#[autotrace] pub mod handler; -#[autotrace] +//#[autotrace] pub mod reducers; pub mod state; #[cfg(test)] diff --git a/crates/core/src/network/reducers/handle_custom_send_response.rs b/crates/core/src/network/reducers/handle_custom_send_response.rs index fa814f0ca5..20d8a0222c 100644 --- a/crates/core/src/network/reducers/handle_custom_send_response.rs +++ b/crates/core/src/network/reducers/handle_custom_send_response.rs @@ -1,7 +1,7 @@ use crate::{action::ActionWrapper, network::state::NetworkState, state::State}; use holochain_core_types::error::HolochainError; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_handle_custom_send_response( network_state: &mut NetworkState, diff --git a/crates/core/src/network/reducers/init.rs b/crates/core/src/network/reducers/init.rs index 6ca9d07c7d..8546df3376 100644 --- a/crates/core/src/network/reducers/init.rs +++ b/crates/core/src/network/reducers/init.rs @@ -10,7 +10,7 @@ use holochain_persistence_api::cas::content::AddressableContent; use lib3h_protocol::{data_types::SpaceData, protocol_client::Lib3hClientProtocol, Address}; use log::{debug, error, info}; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_init(state: &mut NetworkState, root_state: &State, action_wrapper: &ActionWrapper) { let action = action_wrapper.action(); diff --git a/crates/core/src/network/reducers/mod.rs b/crates/core/src/network/reducers/mod.rs index 72d79992e8..63ca23b279 100644 --- a/crates/core/src/network/reducers/mod.rs +++ b/crates/core/src/network/reducers/mod.rs @@ -62,7 +62,7 @@ use snowflake::ProcessUniqueId; use std::sync::Arc; /// maps incoming action to the correct handler -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn resolve_reducer(action_wrapper: &ActionWrapper) -> Option { match action_wrapper.action() { @@ -93,7 +93,7 @@ fn resolve_reducer(action_wrapper: &ActionWrapper) -> Option { } } -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce( old_state: Arc, @@ -113,7 +113,7 @@ pub fn reduce( /// Sends the given Lib3hClientProtocol over the network using the network proxy instance /// that lives in the NetworkState. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn send( network_state: &mut NetworkState, @@ -140,7 +140,7 @@ pub fn send( /// This creates a transient connection as every node-to-node communication follows a /// request-response pattern. This function therefore logs the open connection /// (expecting a response) in network_state.direct_message_connections. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn send_message( network_state: &mut NetworkState, diff --git a/crates/core/src/network/reducers/send_direct_message.rs b/crates/core/src/network/reducers/send_direct_message.rs index 7a1ddf8fa1..9222c28d65 100644 --- a/crates/core/src/network/reducers/send_direct_message.rs +++ b/crates/core/src/network/reducers/send_direct_message.rs @@ -9,7 +9,7 @@ use lib3h_protocol::{ data_types::DirectMessageData as Lib3hDirectMessageData, protocol_client::Lib3hClientProtocol, }; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn inner( network_state: &mut NetworkState, @@ -39,7 +39,7 @@ fn inner( send(network_state, protocol_object) } -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_send_direct_message( network_state: &mut NetworkState, diff --git a/crates/core/src/network/reducers/shutdown.rs b/crates/core/src/network/reducers/shutdown.rs index 963eeeae78..bd64b1e5d7 100644 --- a/crates/core/src/network/reducers/shutdown.rs +++ b/crates/core/src/network/reducers/shutdown.rs @@ -10,7 +10,7 @@ use lib3h_protocol::{data_types::SpaceData, protocol_client::Lib3hClientProtocol use log::error; use std::{thread::sleep, time::Duration}; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn reduce_shutdown( state: &mut NetworkState, diff --git a/crates/core/src/nucleus/actions/call_zome_function.rs b/crates/core/src/nucleus/actions/call_zome_function.rs index 0d0fd44f2c..918e306e84 100644 --- a/crates/core/src/nucleus/actions/call_zome_function.rs +++ b/crates/core/src/nucleus/actions/call_zome_function.rs @@ -62,7 +62,7 @@ impl ExecuteZomeFnResponse { /// the call result gets added there through the `RetunrZomeFunctionResult` action. /// /// Use Context::block_on to wait for the call result. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn call_zome_function( zome_call: ZomeFnCall, diff --git a/crates/core/src/nucleus/actions/initialize.rs b/crates/core/src/nucleus/actions/initialize.rs index 975b68f12b..0d75eee694 100644 --- a/crates/core/src/nucleus/actions/initialize.rs +++ b/crates/core/src/nucleus/actions/initialize.rs @@ -50,7 +50,7 @@ const INITIALIZATION_TIMEOUT: u64 = 60; /// the Dna error or errors from the init callback. /// /// Use futures::executor::block_on to wait for an initialized instance. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub async fn initialize_chain( dna: Dna, diff --git a/crates/core/src/nucleus/actions/run_validation_callback.rs b/crates/core/src/nucleus/actions/run_validation_callback.rs index e7a7aa6f1f..20492cf7e2 100644 --- a/crates/core/src/nucleus/actions/run_validation_callback.rs +++ b/crates/core/src/nucleus/actions/run_validation_callback.rs @@ -17,7 +17,7 @@ use holochain_metrics::with_latency_publishing; /// `zome_call`. /// Dispatches an `Action::ReturnValidationResult` after completion of the WASM call. /// Returns a future that waits for the result to appear in the nucleus state. -#[no_autotrace] // TODO: get autotrace working for this future +//#[no_autotrace] // TODO: get autotrace working for this future pub async fn run_validation_callback( _address: Address, call: CallbackFnCall, diff --git a/crates/core/src/nucleus/state.rs b/crates/core/src/nucleus/state.rs index 69a811e6ba..3ad724b4f3 100644 --- a/crates/core/src/nucleus/state.rs +++ b/crates/core/src/nucleus/state.rs @@ -17,7 +17,7 @@ use serde::{ }; use std::{collections::VecDeque, convert::TryFrom, fmt}; -#[autotrace] +//#[autotrace] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize, DefaultJson)] pub enum NucleusStatus { New, diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index 437fe03735..825a39e1d1 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -54,7 +54,7 @@ impl ActionResponse { /// The Store of the Holochain instance Object, according to Redux pattern. /// It's composed of all sub-module's state slices. /// To plug in a new module, its state slice needs to be added here. -#[autotrace] +//#[autotrace] #[derive(Clone, PartialEq, Debug)] pub struct State { nucleus: Arc, @@ -149,7 +149,7 @@ impl State { } } - #[autotrace] + //#[autotrace] pub fn reduce(&self, action_wrapper: ActionWrapper) -> Self { let _span_guard = ht::push_span_with(|span| { span.child_("reduce-inner", |s| { @@ -273,7 +273,7 @@ pub struct StateWrapper { state: Option, } -#[autotrace] +//#[autotrace] impl StateWrapper { pub fn drop_inner_state(&mut self) { self.state = None; @@ -305,7 +305,7 @@ impl StateWrapper { } } - #[autotrace] + //#[autotrace] pub fn reduce(&self, action_wrapper: ActionWrapper) -> Self { StateWrapper { state: Some( diff --git a/crates/core/src/wasm_engine/api/call.rs b/crates/core/src/wasm_engine/api/call.rs index 8959586e9a..692d2270b6 100644 --- a/crates/core/src/wasm_engine/api/call.rs +++ b/crates/core/src/wasm_engine/api/call.rs @@ -95,7 +95,7 @@ pub fn invoke_call(runtime: &mut Runtime, args: &RuntimeArgs) -> ZomeApiResult { runtime.store_result(result) } -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] fn local_call(runtime: &mut Runtime, input: ZomeFnCallArgs) -> Result { let context = runtime.context().map_err(|_| { @@ -116,7 +116,7 @@ fn local_call(runtime: &mut Runtime, input: ZomeFnCallArgs) -> Result Result { let context = runtime.context().map_err(|_| { diff --git a/crates/core/src/wasm_engine/callback/genesis.rs b/crates/core/src/wasm_engine/callback/genesis.rs index 241bcd321d..47b078a9ce 100644 --- a/crates/core/src/wasm_engine/callback/genesis.rs +++ b/crates/core/src/wasm_engine/callback/genesis.rs @@ -5,7 +5,7 @@ use crate::{ }; use std::sync::Arc; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn init( context: Arc, diff --git a/crates/core/src/wasm_engine/callback/init.rs b/crates/core/src/wasm_engine/callback/init.rs index 76237b75be..0b3f5f4c7e 100644 --- a/crates/core/src/wasm_engine/callback/init.rs +++ b/crates/core/src/wasm_engine/callback/init.rs @@ -5,7 +5,7 @@ use crate::{ }; use std::sync::Arc; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn init( context: Arc, diff --git a/crates/core/src/wasm_engine/callback/links_utils.rs b/crates/core/src/wasm_engine/callback/links_utils.rs index 3c64bd58ed..a19dc6c8ce 100644 --- a/crates/core/src/wasm_engine/callback/links_utils.rs +++ b/crates/core/src/wasm_engine/callback/links_utils.rs @@ -8,7 +8,7 @@ use holochain_wasm_utils::api_serialization::{get_entry::*, validation::LinkDire use std::sync::Arc; /// Retrieves the base and target entries of the link and returns both. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn get_link_entries( link: &Link, diff --git a/crates/core/src/wasm_engine/callback/mod.rs b/crates/core/src/wasm_engine/callback/mod.rs index ec1ff14767..8164792745 100644 --- a/crates/core/src/wasm_engine/callback/mod.rs +++ b/crates/core/src/wasm_engine/callback/mod.rs @@ -187,7 +187,7 @@ pub(crate) fn run_callback(context: Arc, call: CallbackFnCall) -> Callb } } -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn call( context: Arc, diff --git a/crates/core/src/wasm_engine/callback/receive.rs b/crates/core/src/wasm_engine/callback/receive.rs index 174b75f2ac..e1fff0ca88 100644 --- a/crates/core/src/wasm_engine/callback/receive.rs +++ b/crates/core/src/wasm_engine/callback/receive.rs @@ -15,7 +15,7 @@ use std::sync::Arc; #[derive(Serialize, Deserialize, Debug, DefaultJson)] struct ReceiveReturnValue(Result); -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn receive( context: Arc, diff --git a/crates/core/src/wasm_engine/callback/validation_package.rs b/crates/core/src/wasm_engine/callback/validation_package.rs index a74deca122..c8f7523f87 100644 --- a/crates/core/src/wasm_engine/callback/validation_package.rs +++ b/crates/core/src/wasm_engine/callback/validation_package.rs @@ -18,7 +18,7 @@ use holochain_json_api::json::JsonString; use holochain_wasm_utils::api_serialization::validation::LinkValidationPackageArgs; use std::{convert::TryFrom, sync::Arc}; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn get_validation_package_definition( entry: &Entry, diff --git a/crates/core/src/wasm_engine/mod.rs b/crates/core/src/wasm_engine/mod.rs index 00b9d50d77..513740d523 100644 --- a/crates/core/src/wasm_engine/mod.rs +++ b/crates/core/src/wasm_engine/mod.rs @@ -4,7 +4,7 @@ pub mod api; pub mod callback; pub mod factories; pub mod memory; -#[autotrace] +//#[autotrace] mod run_dna; pub mod runtime; pub use self::{run_dna::*, runtime::*}; diff --git a/crates/core/src/wasm_engine/run_dna.rs b/crates/core/src/wasm_engine/run_dna.rs index 1ede7e2af8..0e4a244709 100644 --- a/crates/core/src/wasm_engine/run_dna.rs +++ b/crates/core/src/wasm_engine/run_dna.rs @@ -56,7 +56,7 @@ fn get_module(data: WasmCallData) -> Result { /// Executes an exposed zome function in a wasm binary. /// Multithreaded function /// panics if wasm binary isn't valid. -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn run_dna(parameters: Option>, data: WasmCallData) -> ZomeFnResult { let wasm_module = get_module(data.clone())?; diff --git a/crates/core/src/workflows/mod.rs b/crates/core/src/workflows/mod.rs index 85f5a7df25..5dac7f67ec 100644 --- a/crates/core/src/workflows/mod.rs +++ b/crates/core/src/workflows/mod.rs @@ -1,26 +1,26 @@ -#[autotrace] +//#[autotrace] pub mod application; -#[autotrace] +//#[autotrace] pub mod author_entry; -#[autotrace] +//#[autotrace] pub mod get_entry_result; -#[autotrace] +//#[autotrace] pub mod get_link_result; -#[autotrace] +//#[autotrace] pub mod get_links_count; -#[autotrace] +//#[autotrace] pub mod handle_custom_direct_message; -#[autotrace] +//#[autotrace] pub mod hold_entry; -#[autotrace] +//#[autotrace] pub mod hold_entry_remove; -#[autotrace] +//#[autotrace] pub mod hold_entry_update; -#[autotrace] +//#[autotrace] pub mod hold_link; -#[autotrace] +//#[autotrace] pub mod remove_link; -#[autotrace] +//#[autotrace] pub mod respond_validation_package_request; use crate::{ @@ -54,7 +54,7 @@ use std::sync::Arc; /// or build it locally if we are the source (one of the sources). /// Checks the DNA's validation package definition for the given entry type. /// Fails if this entry type needs more than just the header for validation. -#[autotrace] +//#[autotrace] pub(crate) async fn try_make_local_validation_package( entry_with_header: &EntryWithHeader, validation_package_definition: &ValidationPackageDefinition, @@ -92,7 +92,7 @@ pub(crate) async fn try_make_local_validation_package( } /// Gets hold of the validation package for the given entry by trying several different methods. -#[autotrace] +//#[autotrace] async fn validation_package( entry_with_header: &EntryWithHeader, context: Arc, diff --git a/crates/core/src/workflows/respond_validation_package_request.rs b/crates/core/src/workflows/respond_validation_package_request.rs index 95361162c7..2accd3a18b 100644 --- a/crates/core/src/workflows/respond_validation_package_request.rs +++ b/crates/core/src/workflows/respond_validation_package_request.rs @@ -12,7 +12,7 @@ use holochain_core_types::signature::Provenance; use holochain_persistence_api::cas::content::Address; use std::{sync::Arc, vec::Vec}; -#[autotrace] +//#[autotrace] //#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CORE)] pub fn respond_validation_package_request( to_agent_id: Address, diff --git a/crates/dpki/Cargo.toml b/crates/dpki/Cargo.toml index 1a7234f3a8..fdf93dc7d5 100644 --- a/crates/dpki/Cargo.toml +++ b/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.44-alpha3", path = "../core_types" } -holochain_tracing_macros = "=0.0.22" +#holochain_tracing_macros = "=0.0.22" lib3h_sodium = "=0.0.39" holochain_persistence_api = "=0.0.17" serde = "=1.0.104" diff --git a/crates/holochain/Cargo.toml b/crates/holochain/Cargo.toml index 6fac723957..6abb019ca7 100644 --- a/crates/holochain/Cargo.toml +++ b/crates/holochain/Cargo.toml @@ -15,7 +15,7 @@ lib3h_sodium = "=0.0.39" holochain_common = { version = "=0.0.44-alpha3", path = "../common" } holochain_locksmith = { version = "=0.0.44-alpha3", path = "../locksmith" } holochain_tracing = "=0.0.22" -holochain_tracing_macros = "=0.0.22" +#holochain_tracing_macros = "=0.0.22" structopt = "=0.2.15" tiny_http = "=0.6.2" lazy_static = "=1.4.0" diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml index 9d430e09e8..4b3a50ac4b 100644 --- a/crates/metrics/Cargo.toml +++ b/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.44-alpha3", path = "../locksmith" } -holochain_tracing_macros = "=0.0.22" +#holochain_tracing_macros = "=0.0.22" holochain_common = { version = "=0.0.44-alpha3", path = "../common" } lazy_static = "=1.4.0" num-traits = "=0.2.6" diff --git a/crates/net/Cargo.toml b/crates/net/Cargo.toml index 764eb55883..e81666ef40 100644 --- a/crates/net/Cargo.toml +++ b/crates/net/Cargo.toml @@ -30,7 +30,7 @@ holochain_core_types = { version = "=0.0.44-alpha3", path = "../core_types" } holochain_locksmith = { version = "=0.0.44-alpha3", path = "../locksmith" } holochain_json_derive = "=0.0.23" holochain_json_api = "=0.0.23" -holochain_tracing_macros = "=0.0.22" +#holochain_tracing_macros = "=0.0.22" holochain_persistence_api = "=0.0.17" holochain_common = { version = "=0.0.44-alpha3", path = "../common" } in_stream = { version = "=0.0.44-alpha3", path = "../in_stream" } diff --git a/crates/net/src/lib.rs b/crates/net/src/lib.rs index 1dafc75acf..2f9ef22269 100755 --- a/crates/net/src/lib.rs +++ b/crates/net/src/lib.rs @@ -22,8 +22,8 @@ extern crate serde_json; #[macro_use] extern crate serde_derive; -#[macro_use] -extern crate holochain_tracing_macros; +//#[macro_use] +//extern crate holochain_tracing_macros; pub mod connection; pub mod error; pub mod in_memory; diff --git a/crates/net/src/sim2h_worker.rs b/crates/net/src/sim2h_worker.rs index e6b39a412c..376f6ad38f 100644 --- a/crates/net/src/sim2h_worker.rs +++ b/crates/net/src/sim2h_worker.rs @@ -466,7 +466,7 @@ impl Sim2hWorker { } } - #[autotrace] + ////#[autotrace] fn self_store_authored_aspects(&mut self) { if !self.has_self_stored_authored_aspects && self.initial_gossiping_list.is_some() diff --git a/crates/sim2h/Cargo.toml b/crates/sim2h/Cargo.toml index a86db76114..637d97d6f6 100644 --- a/crates/sim2h/Cargo.toml +++ b/crates/sim2h/Cargo.toml @@ -27,7 +27,7 @@ holochain_core_types = { version = "=0.0.44-alpha3", path = "../core_types" } holochain_locksmith = { version = "=0.0.44-alpha3", path = "../locksmith" } holochain_metrics = { version = "=0.0.44-alpha3", path = "../metrics" } holochain_common = { version = "=0.0.44-alpha3", path = "../common" } -holochain_tracing_macros = "=0.0.22" +#holochain_tracing_macros = "=0.0.22" im = { version = "=14.0.0", features = ["serde"] } in_stream = { version = "=0.0.44-alpha3", path = "../in_stream" } uuid = { version = "0.4", features = ["v4"] } diff --git a/crates/sim2h/src/lib.rs b/crates/sim2h/src/lib.rs index 3d69ed4894..99a560e55b 100755 --- a/crates/sim2h/src/lib.rs +++ b/crates/sim2h/src/lib.rs @@ -1157,7 +1157,7 @@ pub struct Sim2h { metric_gen: MetricsTimerGenerator, } -//#[autotrace] +////#[autotrace] //#[newrelic_autotrace(SIM2H)] impl Sim2h { /// create a new Sim2h server instance diff --git a/crates/sim2h/src/websocket/mem_stream.rs b/crates/sim2h/src/websocket/mem_stream.rs index 6f5fb41eec..cbcfb47db9 100644 --- a/crates/sim2h/src/websocket/mem_stream.rs +++ b/crates/sim2h/src/websocket/mem_stream.rs @@ -1,4 +1,4 @@ -use holochain_tracing_macros::newrelic_autotrace; +//use holochain_tracing_macros::newrelic_autotrace; use lazy_static::lazy_static; use lib3h_zombie_actor::GhostMutex; use std::{ @@ -17,7 +17,7 @@ pub struct MemListener { accept_queue: Vec, } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl MemListener { /// private constructor, you probably want `bind` fn priv_new(url: Url2, recv: crossbeam_channel::Receiver) -> Self { @@ -84,7 +84,7 @@ pub struct MemStream { recv_buf: Vec, } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl MemStream { /// private constructor, you probably want `connect` fn priv_new( @@ -112,7 +112,7 @@ impl MemStream { } } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl Read for MemStream { fn read(&mut self, buf: &mut [u8]) -> std::io::Result { let mut disconnected = false; @@ -151,7 +151,7 @@ impl Read for MemStream { } } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl Write for MemStream { fn write(&mut self, buf: &[u8]) -> std::io::Result { // if we're still connected, send data to our pair @@ -194,7 +194,7 @@ struct MemManager { listeners: HashMap>, } -#[newrelic_autotrace(SIM2H)] +//#[newrelic_autotrace(SIM2H)] impl MemManager { /// create a new singleton fn new() -> Self { diff --git a/crates/sim2h_server/Cargo.toml b/crates/sim2h_server/Cargo.toml index 2e49075c7e..d6fdba1108 100644 --- a/crates/sim2h_server/Cargo.toml +++ b/crates/sim2h_server/Cargo.toml @@ -16,7 +16,7 @@ crossbeam-channel = "=0.3.8" sim2h = { version = "=0.0.44-alpha3", path = "../sim2h" } holochain_common = { version = "=0.0.44-alpha3", path = "../common" } holochain_tracing = "=0.0.22" -holochain_tracing_macros = "=0.0.22" +#holochain_tracing_macros = "=0.0.22" #newrelic="0.2" detach = "=0.0.19" futures = "=0.3.2"