Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix log (#4740)

Browse Source 
* chore: fix log

* chore: fix log

* chore: bump client api
This commit is contained in:
Nathan.fooo
2024-02-26 15:27:12 +08:00
committed by GitHub
parent daedf95c95
commit 8d50ad2936
22 changed files with 271 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/rust-lib/lib-log/src/layer.rs
View File

@ -5,6 +5,7 @@ use serde_json::Value;
use tracing::{Event, Id, Subscriber};
use tracing_bunyan_formatter::JsonStorage;
use tracing_core::metadata::Level;
use tracing_core::span::Attributes;
use tracing_subscriber::{fmt::MakeWriter, layer::Context, registry::SpanRef, Layer};
const LEVEL: &str = "level";
@ -31,7 +32,7 @@ where
pub fn new(make_writer: W) -> Self {
Self {
make_writer,
with_target: false,
with_target: true,
phantom: std::marker::PhantomData,
}
}
@ -63,8 +64,8 @@ where
map_serializer.serialize_entry("target", &span.metadata().target())?;
}
map_serializer.serialize_entry("line", &span.metadata().line())?;
map_serializer.serialize_entry("file", &span.metadata().file())?;
// map_serializer.serialize_entry("line", &span.metadata().line())?;
// map_serializer.serialize_entry("file", &span.metadata().file())?;
let extensions = span.extensions();
if let Some(visitor) = extensions.get::<JsonStorage>() {
@ -102,9 +103,9 @@ pub enum Type {
impl fmt::Display for Type {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let repr = match self {
Type::EnterSpan => "Start",
Type::ExitSpan => "End",
Type::Event => "Event",
Type::EnterSpan => "START",
Type::ExitSpan => "END",
Type::Event => "EVENT",
};
write!(f, "{}", repr)
}
@ -113,19 +114,12 @@ impl fmt::Display for Type {
fn format_span_context<'b, S: Subscriber + for<'a> tracing_subscriber::registry::LookupSpan<'a>>(
span: &SpanRef<'b, S>,
ty: Type,
context: &Context<'_, S>,
_: &Context<'_, S>,
) -> String {
match context.lookup_current() {
None => {
if matches!(ty, Type::EnterSpan) {
format!("[🟢 {} - {}]", span.metadata().name().to_uppercase(), ty)
} else {
format!("[🔵 {} - {}]", span.metadata().name().to_uppercase(), ty)
}
},
Some(_) => {
format!("[{} - {}]", span.metadata().name().to_uppercase(), ty)
},
if matches!(ty, Type::EnterSpan) {
format!("[🟢 {} - {}]", span.metadata().name().to_uppercase(), ty)
} else {
format!("[{} - {}]", span.metadata().name().to_uppercase(), ty)
}
}
@ -227,6 +221,13 @@ where
}
}
fn on_new_span(&self, _attrs: &Attributes, id: &Id, ctx: Context<'_, S>) {
let span = ctx.span(id).expect("Span not found, this is a bug");
if let Ok(serialized) = self.serialize_span(&span, Type::EnterSpan, &ctx) {
let _ = self.emit(serialized);
}
}
fn on_close(&self, id: Id, ctx: Context<'_, S>) {
let span = ctx.span(&id).expect("Span not found, this is a bug");
if let Ok(serialized) = self.serialize_span(&span, Type::ExitSpan, &ctx) {

1
frontend/rust-lib/lib-log/src/lib.rs
View File

@ -55,7 +55,6 @@ impl Builder {
let subscriber = tracing_subscriber::fmt()
.with_timer(CustomTime)
.with_ansi(true)
.with_target(false)
.with_max_level(tracing::Level::TRACE)
.with_thread_ids(false)
.pretty()