From e53c2fbc5ab0232b4907db0d7cf21f45d362cd7c Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sun, 14 Jul 2024 11:30:10 +0000
Subject: [PATCH] fix tracing flame envfilter defaults; remove preprocessed
cfgs
Signed-off-by: Jason Volk <jason@zemos.net>
---
src/core/config/mod.rs | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs
index 16c7b1a8f..336144db5 100644
--- a/src/core/config/mod.rs
+++ b/src/core/config/mod.rs
@@ -166,19 +166,14 @@ pub struct Config {
#[serde(default)]
pub well_known: WellKnownConfig,
#[serde(default)]
- #[cfg(feature = "perf_measurements")]
pub allow_jaeger: bool,
#[serde(default = "default_jaeger_filter")]
- #[cfg(feature = "perf_measurements")]
pub jaeger_filter: String,
#[serde(default)]
- #[cfg(feature = "perf_measurements")]
pub tracing_flame: bool,
#[serde(default = "default_tracing_flame_filter")]
- #[cfg(feature = "perf_measurements")]
pub tracing_flame_filter: String,
#[serde(default = "default_tracing_flame_output_path")]
- #[cfg(feature = "perf_measurements")]
pub tracing_flame_output_path: String,
#[serde(default)]
pub proxy: ProxyConfig,
@@ -672,11 +667,8 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
}
&lst.into_iter().join(", ")
});
- #[cfg(feature = "zstd_compression")]
line("Zstd HTTP Compression", &self.zstd_compression.to_string());
- #[cfg(feature = "gzip_compression")]
line("Gzip HTTP Compression", &self.gzip_compression.to_string());
- #[cfg(feature = "brotli_compression")]
line("Brotli HTTP Compression", &self.brotli_compression.to_string());
line("RocksDB database LOG level", &self.rocksdb_log_level);
line("RocksDB database LOG to stderr", &self.rocksdb_log_stderr.to_string());
@@ -925,10 +917,13 @@ fn default_pusher_idle_timeout() -> u64 { 15 }
fn default_max_fetch_prev_events() -> u16 { 100_u16 }
-#[cfg(feature = "perf_measurements")]
-fn default_tracing_flame_filter() -> String { "trace,h2=off".to_owned() }
+fn default_tracing_flame_filter() -> String {
+ cfg!(debug_assertions)
+ .then_some("trace,h2=off")
+ .unwrap_or("info")
+ .to_owned()
+}
-#[cfg(feature = "perf_measurements")]
fn default_jaeger_filter() -> String {
cfg!(debug_assertions)
.then_some("trace,h2=off")
@@ -936,7 +931,6 @@ fn default_jaeger_filter() -> String {
.to_owned()
}
-#[cfg(feature = "perf_measurements")]
fn default_tracing_flame_output_path() -> String { "./tracing.folded".to_owned() }
fn default_trusted_servers() -> Vec<OwnedServerName> { vec![OwnedServerName::try_from("matrix.org").unwrap()] }
--
GitLab