Skip to content

Commit 7428b5b

Browse files
committed
Throttle BatchSpanProcessor.Flush.ExportError otel events
1 parent 9fee879 commit 7428b5b

File tree

4 files changed

+4
-29
lines changed

4 files changed

+4
-29
lines changed

Cargo.lock

-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

casper-server/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ opentelemetry-prometheus = "0.27"
3838
opentelemetry-semantic-conventions = "0.27"
3939
opentelemetry-zipkin = { version = "0.27", default-features = false }
4040
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio-current-thread"] }
41-
opentelemetry-appender-tracing = "0.27.0"
4241
ouroboros = "0.18"
4342
parking_lot = "0.12"
4443
percent-encoding = "2.2"

casper-server/src/main.rs

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ async fn main_inner(args: Args) -> anyhow::Result<()> {
4242
env::set_var("OTEL_SERVICE_NAME", service_name);
4343
}
4444

45+
// Init logging subsystem
46+
crate::logs::init(&config);
47+
4548
// Init tracing subsystem
4649
crate::trace::init(&config);
4750

@@ -145,6 +148,7 @@ mod config;
145148
mod context;
146149
mod handler;
147150
mod http;
151+
mod logs;
148152
mod lua;
149153
mod middleware;
150154
mod storage;

casper-server/src/trace.rs

-15
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,10 @@ use ntex::time::Millis;
77
use opentelemetry_http::{HttpClient, HttpError, Request, Response};
88
use opentelemetry_sdk::trace::{self, RandomIdGenerator, Sampler};
99
use tokio::sync::{mpsc, oneshot};
10-
use tracing_subscriber::layer::SubscriberExt;
11-
use tracing_subscriber::util::SubscriberInitExt as _;
12-
use tracing_subscriber::EnvFilter;
1310

1411
use crate::config::Config;
1512

1613
pub fn init(config: &Config) {
17-
init_opentelemetry(config);
18-
19-
let env_filter = EnvFilter::try_from_default_env().unwrap_or(EnvFilter::new("info"));
20-
let fmt_layer = tracing_subscriber::fmt::layer();
21-
22-
tracing_subscriber::registry()
23-
.with(env_filter)
24-
.with(fmt_layer)
25-
.init();
26-
}
27-
28-
fn init_opentelemetry(config: &Config) {
2914
let tracing_conf = match config.tracing {
3015
Some(ref tracing_conf) if tracing_conf.enabled => tracing_conf,
3116
_ => return,

0 commit comments

Comments
 (0)