Skip to content

Commit

Permalink
chore(refactor): remove opentelemetry feature (#965)
Browse files Browse the repository at this point in the history
* Remove opentelemetry feature

* Remove jeager service from docker-compose
  • Loading branch information
Alex6323 committed Dec 8, 2022
1 parent 0a8c841 commit 7096ce6
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 189 deletions.
146 changes: 0 additions & 146 deletions Cargo.lock

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

10 changes: 0 additions & 10 deletions Cargo.toml
Expand Up @@ -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 }

Expand Down Expand Up @@ -134,11 +129,6 @@ metrics = [
"dep:influxdb",
"dep:chrono",
]
opentelemetry = [
"dep:opentelemetry",
"dep:opentelemetry-jaeger",
"dep:tracing-opentelemetry",
]
rand = [
"iota-types?/rand",
]
Expand Down
13 changes: 0 additions & 13 deletions docker/docker-compose.yml
Expand Up @@ -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:
Expand Down
20 changes: 0 additions & 20 deletions src/bin/inx-chronicle/main.rs
Expand Up @@ -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())
Expand Down

0 comments on commit 7096ce6

Please sign in to comment.