Revert "debug cruft, likely will revert but this proved useful, esp log_if_slow"

This reverts commit 0fd67b27e5.

Bunch of conflicts.
This commit is contained in:
Christian Schwarz
2025-01-07 12:26:04 +01:00
parent 987829e5c2
commit f6f947e4ec
14 changed files with 27 additions and 181 deletions

View File

@@ -1,12 +1,10 @@
use std::{num::NonZeroUsize, str::FromStr};
use std::str::FromStr;
use anyhow::Context;
use metrics::{IntCounter, IntCounterVec};
use once_cell::sync::Lazy;
use strum_macros::{EnumString, VariantNames};
use crate::env;
#[derive(EnumString, strum_macros::Display, VariantNames, Eq, PartialEq, Debug, Clone, Copy)]
#[strum(serialize_all = "snake_case")]
pub enum LogFormat {
@@ -136,20 +134,6 @@ pub fn init(
let r = r.with(
TracingEventCountLayer(&TRACING_EVENT_COUNT_METRIC).with_filter(rust_log_env_filter()),
);
let r = r.with(
if let Some(n) = env::var("NEON_ENABLE_TOKIO_CONSOLE_SUBSCRIBER") {
let n: NonZeroUsize = n;
use console_subscriber::ConsoleLayer;
Some(
console_subscriber::Builder::default()
.event_buffer_capacity(n.get() * ConsoleLayer::DEFAULT_EVENT_BUFFER_CAPACITY)
.client_buffer_capacity(n.get() * ConsoleLayer::DEFAULT_CLIENT_BUFFER_CAPACITY)
.spawn(),
)
} else {
None
},
);
match tracing_error_layer_enablement {
TracingErrorLayerEnablement::EnableWithRustLogFilter => r
.with(tracing_error::ErrorLayer::default().with_filter(rust_log_env_filter()))