tamipes/mc-ingress
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages 1 Wiki Activity Actions

feat: polish the OpaqueError get_span_trace function looks

Browse source
This commit is contained in:
Tamipes 2026-05-29 11:07:59 +02:00
parent 1bce912a1a
commit 0e2afd0772
3 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kube_cache.rs
View file

@ -189,7 +189,7 @@ impl MinecraftAPI<Server> for McApi {
drop(guard); drop(guard);
if let Err(err) = server.stop().await { if let Err(err) = server.stop().await {
tracing::error!( tracing::error!(
trace = err.get_span_trace(), trace = %err.print_span_trace(),
err = err.context, err = err.context,
msg = "failed to stop server" msg = "failed to stop server"
); );

8
src/main.rs
View file

@ -61,26 +61,26 @@ async fn main() {
match e.level { match e.level {
tracing::Level::ERROR => tracing::error!( tracing::Level::ERROR => tracing::error!(
// addr = format!("{}:{}", addr.ip().to_string(), addr.port().to_string()), // addr = format!("{}:{}", addr.ip().to_string(), addr.port().to_string()),
trace = format!("{}", e.get_span_trace()), trace = %e.print_span_trace(),
err = format!("{}", e.context), err = format!("{}", e.context),
"Client disconnected" "Client disconnected"
), ),
tracing::Level::WARN => tracing::warn!( tracing::Level::WARN => tracing::warn!(
// addr = format!("{}:{}", addr.ip().to_string(), addr.port().to_string()), // addr = format!("{}:{}", addr.ip().to_string(), addr.port().to_string()),
trace = format!("{}", e.get_span_trace()), trace = %e.print_span_trace(),
err = format!("{}", e.context), err = format!("{}", e.context),
"Client disconnected" "Client disconnected"
), ),
tracing::Level::INFO => tracing::info!( tracing::Level::INFO => tracing::info!(
// addr = format!("{}:{}", addr.ip().to_string(), addr.port().to_string()), // addr = format!("{}:{}", addr.ip().to_string(), addr.port().to_string()),
trace = format!("{}", e.get_span_trace()), trace = %e.print_span_trace(),
err = format!("{}", e.context), err = format!("{}", e.context),
"Client disconnected" "Client disconnected"
), ),
_ => { _ => {
tracing::error!( tracing::error!(
// addr = format!("{}:{}", addr.ip().to_string(), addr.port().to_string()), // addr = format!("{}:{}", addr.ip().to_string(), addr.port().to_string()),
trace = format!("{}", e.get_span_trace()), trace = %e.print_span_trace(),
err = format!("{}", e.context), err = format!("{}", e.context),
actual_level = ?e.level, actual_level = ?e.level,
"Client disconnected (bad level)" "Client disconnected (bad level)"

23
src/opaque_error.rs
View file

@ -1,4 +1,7 @@
use std::{error::Error, fmt}; use std::{
error::Error,
fmt::{self, Debug},
};
use tracing::Level; use tracing::Level;
use tracing_error::SpanTrace; use tracing_error::SpanTrace;
@ -50,7 +53,7 @@ impl OpaqueError {
kind: Some(kind.to_string()), kind: Some(kind.to_string()),
} }
} }
pub fn get_span_trace(&self) -> String { pub fn print_span_trace(&self) -> FancyTrace {
let mut vec: Vec<(&str, String)> = Vec::new(); let mut vec: Vec<(&str, String)> = Vec::new();
self.span_trace.with_spans(|metadata, _fields| { self.span_trace.with_spans(|metadata, _fields| {
@ -64,16 +67,14 @@ impl OpaqueError {
} }
acc.push_str(x.0); acc.push_str(x.0);
if !x.1.is_empty() {
acc.push_str("{"); acc.push_str("{");
acc.push_str(&x.1); acc.push_str(&x.1);
acc.push_str("}"); acc.push_str("}");
}
acc acc
}); });
match String::from_utf8(strip_ansi_escapes::strip(str.clone())) { FancyTrace { str }
Ok(x) => x,
Err(_) => str,
}
} }
pub fn set_level(mut self, lvl: Level) -> Self { pub fn set_level(mut self, lvl: Level) -> Self {
self.level = lvl; self.level = lvl;
@ -86,6 +87,14 @@ impl OpaqueError {
} }
} }
} }
pub struct FancyTrace {
str: String,
}
impl fmt::Display for FancyTrace {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.str)
}
}
impl From<String> for OpaqueError { impl From<String> for OpaqueError {
fn from(value: String) -> Self { fn from(value: String) -> Self {