Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ RELAY_URL=ws://localhost:3000
# -----------------------------------------------------------------------------
# Logging / Tracing
# -----------------------------------------------------------------------------
RUST_LOG=buzz_relay=debug,buzz_db=debug,buzz_auth=debug,buzz_pubsub=debug,tower_http=debug
RUST_LOG=buzz_relay=debug,buzz_datastore=info,buzz_db=debug,buzz_auth=debug,buzz_pubsub=debug,tower_http=debug

# OTLP tracing endpoint (optional — leave unset to disable)
# OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317
Expand Down
62 changes: 59 additions & 3 deletions crates/buzz-relay/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ use std::sync::Arc;

use tracing::{error, info, warn};
use tracing_subscriber::{fmt, prelude::*, EnvFilter};

fn log_env_filter(rust_log: Option<&str>) -> EnvFilter {
EnvFilter::new(rust_log.unwrap_or("buzz_relay=info"))
}

fn otel_env_filter(rust_log: Option<&str>) -> EnvFilter {
EnvFilter::new(rust_log.unwrap_or("buzz_relay=info,buzz_datastore=info"))
}
use uuid::Uuid;

use buzz_audit::AuditService;
Expand Down Expand Up @@ -107,9 +115,15 @@ async fn main() -> anyhow::Result<()> {
};

tracing_subscriber::registry()
.with(fmt::layer().json().flatten_event(true))
.with(EnvFilter::from_default_env().add_directive("buzz_relay=info".parse()?))
.with(otel_layer)
.with(
fmt::layer()
.json()
.flatten_event(true)
.with_filter(log_env_filter(std::env::var("RUST_LOG").ok().as_deref())),
)
.with(otel_layer.map(|layer| {
layer.with_filter(otel_env_filter(std::env::var("RUST_LOG").ok().as_deref()))
}))
.init();

// Log any exporter-build failure now that the subscriber is installed.
Expand Down Expand Up @@ -1060,6 +1074,48 @@ async fn main() -> anyhow::Result<()> {
Ok(())
}

#[cfg(test)]
mod env_filter_tests {
use super::{log_env_filter, otel_env_filter};
use tracing_subscriber::prelude::*;

#[test]
fn unset_enables_datastore_only_for_otel_filter() {
let logs = tracing_subscriber::registry().with(log_env_filter(None));
tracing::subscriber::with_default(logs, || {
assert!(!tracing::enabled!(target: "buzz_datastore", tracing::Level::INFO));
assert!(tracing::enabled!(target: "buzz_relay", tracing::Level::INFO));
});

let otel = tracing_subscriber::registry().with(otel_env_filter(None));
tracing::subscriber::with_default(otel, || {
assert!(tracing::enabled!(target: "buzz_datastore", tracing::Level::INFO));
});
}

#[test]
fn explicit_datastore_off_is_preserved_alone() {
assert_eq!(
otel_env_filter(Some("buzz_datastore=off")).to_string(),
"buzz_datastore=off"
);
}

#[test]
fn explicit_datastore_debug_is_preserved_alone() {
assert_eq!(
otel_env_filter(Some("buzz_datastore=debug")).to_string(),
"buzz_datastore=debug"
);
}

#[test]
fn explicit_global_warn_is_preserved_alone() {
assert_eq!(log_env_filter(Some("warn")).to_string(), "warn");
assert_eq!(otel_env_filter(Some("warn")).to_string(), "warn");
}
}

async fn run_community_revalidator(
state: Arc<AppState>,
period: std::time::Duration,
Expand Down
Loading