Skip to content

Commit

Permalink
cargo fmt
Browse files Browse the repository at this point in the history
gsson committed May 6, 2023
1 parent ceaaed7 commit 0eb7ca2
Showing 6 changed files with 37 additions and 31 deletions.
11 changes: 4 additions & 7 deletions examples/examples/hyper.rs
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@ use hyper::{Body, Request, Response, Server};
use log::info as log_info;
use std::convert::Infallible;
use std::net::SocketAddr;
use tracing::{debug, error, info, span, warn};
use tracing::instrument;
use tracing_subscriber::EnvFilter;
use tracing::{debug, error, info, span, warn};
use tracing_subscriber::prelude::*;
use tracing_subscriber::EnvFilter;
use tracing_subscriber::Registry;

#[instrument]
@@ -30,12 +30,9 @@ async fn main() {
.or_else(|_| EnvFilter::try_new("info"))
.unwrap();

let collector = Registry::default()
.with(logger)
.with(env_filter);
let collector = Registry::default().with(logger).with(env_filter);

tracing::subscriber::set_global_default(collector)
.unwrap();
tracing::subscriber::set_global_default(collector).unwrap();

let addr = SocketAddr::from(([0, 0, 0, 0], 3000));

4 changes: 2 additions & 2 deletions tracing-logstash/src/event_recorder.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::fields::{FieldConfig, FieldRecorder, FieldVisitor, RecordedValue, TryForEachField};
use std::sync::Arc;
use tracing_core::Event;
use tracing_core::field::Field;
use crate::fields::{FieldConfig, FieldRecorder, FieldVisitor, RecordedValue, TryForEachField};
use tracing_core::Event;

pub trait EventRecorder {
fn record_event(&mut self, event: &Event<'_>);
2 changes: 1 addition & 1 deletion tracing-logstash/src/format.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use crate::fields::TryForEachField;
use crate::span_recorder::{DefaultSpanRecorder, SpanRecorder};
use crate::DisplayLevelFilter;
use serde::ser::{SerializeMap, SerializeSeq};
use serde::{Serialize, Serializer};
use std::collections::HashSet;
use tracing_core::{Event, Subscriber};
use tracing_subscriber::layer::Context;
use tracing_subscriber::registry::{LookupSpan, SpanRef};
use crate::span_recorder::{DefaultSpanRecorder, SpanRecorder};

pub trait FormatSpan {
fn format_span<S, Span>(&self, serializer: S, span: &SpanRef<Span>) -> Result<S::Ok, S::Error>
11 changes: 5 additions & 6 deletions tracing-logstash/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
mod fields;
mod event_recorder;
mod span_recorder;
mod fields;
pub mod format;
pub mod logstash;
mod span_recorder;

use span_recorder::SpanRecorder;
use crate::logstash::LogstashFormat;
use span_recorder::SpanRecorder;
use std::io::Write;
use std::marker::PhantomData;
use tracing_core::span::{Attributes, Record, Id};
use tracing_core::span::{Attributes, Id, Record};
use tracing_core::{Event, Level, Subscriber};
use tracing_subscriber::fmt::MakeWriter;
use tracing_subscriber::layer::Context;
@@ -112,11 +112,10 @@ where
}
}


#[derive(Copy, Clone)]
pub enum LoggerName {
Event,
Span
Span,
}

#[derive(Copy, Clone)]
36 changes: 23 additions & 13 deletions tracing-logstash/src/logstash.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
use crate::fields::{
FieldConfig, FieldSpec,
};
use crate::fields::{FieldConfig, FieldSpec};
use crate::format::{
DefaultSpanFormat, FormatEvent, FormatSpan, SerializableSpanList, write_extension_fields,
write_extension_fields, DefaultSpanFormat, FormatEvent, FormatSpan, SerializableSpanList,
};
use crate::span_recorder::DefaultSpanRecorder;
use crate::{DisplayLevelFilter, LoggerName};
use serde::ser::{Error, SerializeMap};
use serde::{Serialize, Serializer};
@@ -14,7 +13,6 @@ use tracing_core::field::{Field, Visit};
use tracing_core::{Event, Level, Metadata, Subscriber};
use tracing_subscriber::layer::Context;
use tracing_subscriber::registry::LookupSpan;
use crate::span_recorder::DefaultSpanRecorder;

pub struct LogstashFormat<SF = DefaultSpanFormat> {
display_version: bool,
@@ -82,7 +80,10 @@ impl<SF> LogstashFormat<SF> {
..self
}
}
pub fn with_stack_trace(self, display_stack_trace: Option<(DisplayLevelFilter, DisplayLevelFilter)>) -> Self {
pub fn with_stack_trace(
self,
display_stack_trace: Option<(DisplayLevelFilter, DisplayLevelFilter)>,
) -> Self {
Self {
display_stack_trace,
..self
@@ -148,7 +149,7 @@ where
}
let event_metadata = event.metadata();
if !event_filter.is_enabled(event, event_metadata.level()) {
return None
return None;
}

let mut stack_trace = String::new();
@@ -171,13 +172,18 @@ where

struct SerializeSpanName<'c, SS>(&'c Event<'c>, &'c Context<'c, SS>);

impl<'c, SS> Serialize for SerializeSpanName<'c, SS> where SS: Subscriber + for<'a> LookupSpan<'a> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
impl<'c, SS> Serialize for SerializeSpanName<'c, SS>
where
SS: Subscriber + for<'a> LookupSpan<'a>,
{
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
if let Some(span_metadata) = self.1.current_span().metadata() {
let name = format!("{}::{}", span_metadata.target(), span_metadata.name());
serializer.serialize_str(&name)
}
else {
} else {
serializer.serialize_str(self.0.metadata().target())
}
}
@@ -229,8 +235,12 @@ where

if let Some(l) = self.display_logger_name {
match l {
LoggerName::Event => field_visitor.serialize_field("logger_name", event_metadata.target()),
LoggerName::Span => field_visitor.serialize_field("logger_name", &SerializeSpanName(event, &ctx)),
LoggerName::Event => {
field_visitor.serialize_field("logger_name", event_metadata.target())
}
LoggerName::Span => {
field_visitor.serialize_field("logger_name", &SerializeSpanName(event, &ctx))
}
};
}

4 changes: 2 additions & 2 deletions tracing-logstash/src/span_recorder.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::fields::{FieldConfig, FieldRecorder, FieldVisitor, RecordedValue, TryForEachField};
use std::sync::Arc;
use tracing_core::field::Field;
use tracing_core::span::{Attributes, Record};
use std::sync::Arc;
use crate::fields::{FieldConfig, FieldRecorder, FieldVisitor, RecordedValue, TryForEachField};

pub trait SpanRecorder {
fn record_span(&mut self, attrs: &Attributes<'_>);

0 comments on commit 0eb7ca2

Please sign in to comment.