From 7096ce63d1ae646b31e2286381cab3cc80835a97 Mon Sep 17 00:00:00 2001 From: /alex/ Date: Thu, 8 Dec 2022 13:41:15 +0100 Subject: [PATCH] chore(refactor): remove `opentelemetry` feature (#965) * Remove opentelemetry feature * Remove jeager service from docker-compose --- Cargo.lock | 146 ---------------------------------- Cargo.toml | 10 --- docker/docker-compose.yml | 13 --- src/bin/inx-chronicle/main.rs | 20 ----- 4 files changed, 189 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a76965d29..ad90e209e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -372,8 +372,6 @@ dependencies = [ "iota-types", "lazy_static", "mongodb", - "opentelemetry", - "opentelemetry-jaeger", "packable", "pin-project", "prefix-hex", @@ -395,7 +393,6 @@ dependencies = [ "tower-http", "tracing", "tracing-loki", - "tracing-opentelemetry", "tracing-subscriber", "uint", "url", @@ -501,25 +498,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" -dependencies = [ - "cfg-if", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -870,7 +848,6 @@ checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", - "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -939,7 +916,6 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ - "futures-channel", "futures-core", "futures-io", "futures-macro", @@ -1327,12 +1303,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "integer-encoding" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" - [[package]] name = "inx" version = "1.0.0-beta.8" @@ -1771,86 +1741,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", -] - -[[package]] -name = "opentelemetry-jaeger" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e785d273968748578931e4dc3b4f5ec86b26e09d9e0d66b55adda7fce742f7a" -dependencies = [ - "async-trait", - "futures", - "futures-executor", - "once_cell", - "opentelemetry", - "opentelemetry-semantic-conventions", - "thiserror", - "thrift", - "tokio", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" -dependencies = [ - "opentelemetry", -] - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api", - "percent-encoding", - "rand", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "ordered-float" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" -dependencies = [ - "num-traits", -] - [[package]] name = "os_info" version = "3.5.1" @@ -2862,28 +2752,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "thrift" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0" -dependencies = [ - "byteorder", - "integer-encoding", - "log", - "ordered-float", - "threadpool", -] - [[package]] name = "time" version = "0.1.44" @@ -3207,20 +3075,6 @@ dependencies = [ "url", ] -[[package]] -name = "tracing-opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" -dependencies = [ - "once_cell", - "opentelemetry", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - [[package]] name = "tracing-serde" version = "0.1.3" diff --git a/Cargo.toml b/Cargo.toml index b378cc43a..c43cb8e28 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,11 +75,6 @@ zeroize = { version = "1.5", default-features = false, features = [ "std" ], opt inx = { version = "1.0.0-beta", default-features = false, optional = true } tonic = { version = "0.8", default-features = false, optional = true } -# Opentelemetry -opentelemetry = { version = "0.18", default-features = false, features = [ "trace", "rt-tokio" ], optional = true } -opentelemetry-jaeger = { version = "0.17", default-features = false, features = [ "rt-tokio" ], optional = true } -tracing-opentelemetry = { version = "0.18", default-features = false, features = [ "tracing-log" ], optional = true } - # Loki tracing-loki = { version = "0.2", default-features = false, features = [ "compat-0-2-1", "native-tls" ], optional = true } @@ -134,11 +129,6 @@ metrics = [ "dep:influxdb", "dep:chrono", ] -opentelemetry = [ - "dep:opentelemetry", - "dep:opentelemetry-jaeger", - "dep:tracing-opentelemetry", -] rand = [ "iota-types?/rand", ] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ea473616d..621897d03 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -164,19 +164,6 @@ services: environment: - GF_INSTALL_PLUGINS=yesoreyeram-infinity-datasource - jaeger: - image: jaegertracing/all-in-one:latest - profiles: - - metrics - container_name: jaeger - restart: unless-stopped - user: "65532" - ports: - - 6831:6831/udp # accept jaeger.thrift over compact thrift protocol - - 6832:6832/udp # accept jaeger.thrift over binary thrift protocol - - 5778:5778 # serve configs - - 16686:16686 # serve frontend - loki: image: grafana/loki:latest profiles: diff --git a/src/bin/inx-chronicle/main.rs b/src/bin/inx-chronicle/main.rs index b42b7afdc..22f765142 100644 --- a/src/bin/inx-chronicle/main.rs +++ b/src/bin/inx-chronicle/main.rs @@ -132,26 +132,6 @@ async fn main() -> eyre::Result<()> { fn set_up_logging(#[allow(unused)] config: &ChronicleConfig) -> eyre::Result<()> { let registry = tracing_subscriber::registry(); - #[cfg(feature = "opentelemetry")] - let registry = { - let tracer = opentelemetry_jaeger::new_agent_pipeline() - .with_service_name("Chronicle") - .install_batch(opentelemetry::runtime::Tokio) - .unwrap(); - - registry - .with(tracing_opentelemetry::layer().with_tracer(tracer)) - // This filter should not exist, but if I remove it, - // it causes the buffer to overflow - .with(EnvFilter::from_default_env()) - .with( - tracing_subscriber::fmt::layer() - .with_span_events(FmtSpan::CLOSE) - // The filter should only be on the console logs - //.with_filter(EnvFilter::from_default_env()), - ) - }; - #[cfg(not(feature = "opentelemetry"))] let registry = { registry .with(EnvFilter::from_default_env())