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

remove newrelic from holochain #2143

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +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"
newrelic="0.2"
#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" }
Expand Down
6 changes: 3 additions & 3 deletions crates/cli/src/cli/chain_log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<PathBuf>, 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.")
Expand Down Expand Up @@ -70,7 +70,7 @@ pub fn chain_log(storage_path: Option<PathBuf>, 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<PathBuf>) {
let path = path.unwrap_or_else(|| PathBuf::from(DEFAULT_CHAIN_PATH));
println!("Please specify an instance ID to view its chain.");
Expand All @@ -81,7 +81,7 @@ pub fn chain_list(path: Option<PathBuf>) {
}
}

#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)]
//#[holochain_tracing_macros::newrelic_autotrace(HOLOCHAIN_CLI)]
fn display_header(header: &ChainHeader, entry: &Entry) {
println!(
"{} {}",
Expand Down
4 changes: 2 additions & 2 deletions crates/cli/src/cli/generate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/cli/hash_dna.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Vec<String>>,
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/cli/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/cli/keygen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<PathBuf>, passphrase: Option<String>, quiet: bool) -> DefaultResult<()> {
let passphrase = passphrase.unwrap_or_else(|| {
if !quiet {
Expand Down
6 changes: 3 additions & 3 deletions crates/cli/src/cli/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const CARGO_FILE_NAME: &str = "Cargo.toml";

pub type Object = Map<String, Value>;

#[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<bool> {
let toml: Value = toml::from_str(cargo_toml)?;
let dependancies = toml
Expand All @@ -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 {}
Expand Down Expand Up @@ -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)
}
Expand Down
Loading