mirror of
https://github.com/bevyengine/bevy
synced 2024-11-22 12:43:34 +00:00
ded5d523bd
# Objective - Fixes https://github.com/bevyengine/bevy/issues/12597 The current tracing customization option (the `update_subscriber` field) was basically unusable because it provides a `dyn Subscriber` and most layers require a `Subscriber` that also implements `for<'a> LookupSpan<'a, Data=Data<'a>>`, so it was impossible to add a layer on top of the `dyn Subscriber`. This PR provides an alternative way of adding additional tracing layers to the LogPlugin by instead creating an `Option<Layer>`. This is enough for most situations because `Option<Layer>` and `Vec<Layer>` both implement `Layer`. ## Solution - Replace the `update_subscriber` field of `LogPlugin` with a `custom_layer` field which is function pointer returning an `Option<BoxedLayer>` - Update the examples to showcase that this works: - with multiple additional layers - with Layers that were previously problematic, such as `bevy::log::tracing_subscriber::fmt::layer().with_file(true)` (mentioned in the issue) Note that in the example this results in duplicate logs, since we have our own layer on top of the default `fmt_layer` added in the LogPlugin; maybe in the future we might want to provide a single one? Or to let the user customize the default `fmt_layer` ? I still think this change is an improvement upon the previous solution, which was basically broken. --- ## Changelog > This section is optional. If this was a trivial fix, or has no externally-visible impact, you can delete this section. - The `LogPlugin`'s `update_subscriber` field has been replaced with `custom_layer` to allow the user to flexibly add a `tracing::Layer` to the layer stack ## Migration Guide - The `LogPlugin`'s `update_subscriber` field has been replaced with `custom_layer` --------- Co-authored-by: BD103 <59022059+BD103@users.noreply.github.com>
151 lines
5.3 KiB
Rust
151 lines
5.3 KiB
Rust
//! This example illustrates how to transfer log events from the [`Layer`] to Bevy's ECS.
|
|
//!
|
|
//! The way we will do this is via a [`mpsc`] channel. [`mpsc`] channels allow 2 unrelated
|
|
//! parts of the program to communicate (in this case, [`Layer`]s and Bevy's ECS).
|
|
//!
|
|
//! Inside the `custom_layer` function we will create a [`mpsc::Sender`] and a [`mpsc::Receiver`] from a
|
|
//! [`mpsc::channel`]. The [`Sender`](mpsc::Sender) will go into the `AdvancedLayer` and the [`Receiver`](mpsc::Receiver) will
|
|
//! go into a non-send resource called `LogEvents` (It has to be non-send because [`Receiver`](mpsc::Receiver) is [`!Sync`](Sync)).
|
|
//! From there we will use `transfer_log_events` to transfer log events from `LogEvents` to an ECS event called `LogEvent`.
|
|
//!
|
|
//! Finally, after all that we can access the `LogEvent` event from our systems and use it.
|
|
//! In this example we build a simple log viewer.
|
|
|
|
use std::sync::mpsc;
|
|
|
|
use bevy::log::BoxedLayer;
|
|
use bevy::{
|
|
log::tracing_subscriber::{self, Layer},
|
|
prelude::*,
|
|
utils::tracing,
|
|
utils::tracing::Subscriber,
|
|
};
|
|
|
|
/// A basic message. This is what we will be sending from the [`CaptureLayer`] to [`CapturedLogEvents`] non-send resource.
|
|
#[derive(Debug, Event)]
|
|
struct LogEvent {
|
|
message: String,
|
|
}
|
|
|
|
/// This non-send resource temporarily stores [`LogEvent`]s before they are
|
|
/// written to [`Events<LogEvent>`] by [`transfer_log_events`].
|
|
#[derive(Deref, DerefMut)]
|
|
struct CapturedLogEvents(mpsc::Receiver<LogEvent>);
|
|
|
|
/// Transfers information from the `LogEvents` resource to [`Events<LogEvent>`](LogEvent).
|
|
fn transfer_log_events(
|
|
receiver: NonSend<CapturedLogEvents>,
|
|
mut log_events: EventWriter<LogEvent>,
|
|
) {
|
|
// Make sure to use `try_iter()` and not `iter()` to prevent blocking.
|
|
log_events.send_batch(receiver.try_iter());
|
|
}
|
|
|
|
/// This is the [`Layer`] that we will use to capture log events and then send them to Bevy's
|
|
/// ECS via it's [`mpsc::Sender`].
|
|
struct CaptureLayer {
|
|
sender: mpsc::Sender<LogEvent>,
|
|
}
|
|
impl<S: Subscriber> Layer<S> for CaptureLayer {
|
|
fn on_event(
|
|
&self,
|
|
event: &tracing::Event<'_>,
|
|
_ctx: tracing_subscriber::layer::Context<'_, S>,
|
|
) {
|
|
// In order to obtain the log message, we have to create a struct that implements
|
|
// Visit and holds a reference to our string. Then we use the `record` method and
|
|
// the struct to modify the reference to hold the message string.
|
|
let mut message = None;
|
|
event.record(&mut CaptureLayerVisitor(&mut message));
|
|
if let Some(message) = message {
|
|
// You can obtain metadata like this, but we wont use it for this example.
|
|
let _metadata = event.metadata();
|
|
self.sender
|
|
.send(LogEvent { message })
|
|
.expect("LogEvents resource no longer exists!");
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A [`Visit`](tracing::field::Visit)or that records log messages that are transferred to [`CaptureLayer`].
|
|
struct CaptureLayerVisitor<'a>(&'a mut Option<String>);
|
|
impl tracing::field::Visit for CaptureLayerVisitor<'_> {
|
|
fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
|
|
// This if statement filters out unneeded events sometimes show up
|
|
if field.name() == "message" {
|
|
*self.0 = Some(format!("{value:?}"));
|
|
}
|
|
}
|
|
}
|
|
fn custom_layer(app: &mut App) -> Option<BoxedLayer> {
|
|
let (sender, receiver) = mpsc::channel();
|
|
|
|
let layer = CaptureLayer { sender };
|
|
let resource = CapturedLogEvents(receiver);
|
|
|
|
app.insert_non_send_resource(resource);
|
|
app.add_event::<LogEvent>();
|
|
app.add_systems(Update, transfer_log_events);
|
|
|
|
Some(layer.boxed())
|
|
}
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins.set(bevy::log::LogPlugin {
|
|
custom_layer,
|
|
..default()
|
|
}))
|
|
.add_systems(Startup, (log_system, setup))
|
|
.add_systems(Update, print_logs)
|
|
.run();
|
|
}
|
|
|
|
fn log_system() {
|
|
// here is how you write new logs at each "log level" (in "most important" to
|
|
// "least important" order)
|
|
error!("something failed");
|
|
warn!("something bad happened that isn't a failure, but thats worth calling out");
|
|
info!("helpful information that is worth printing by default");
|
|
debug!("helpful for debugging");
|
|
trace!("very noisy");
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct LogViewerRoot;
|
|
|
|
fn setup(mut commands: Commands) {
|
|
commands.spawn(Camera2dBundle::default());
|
|
|
|
commands.spawn((
|
|
NodeBundle {
|
|
style: Style {
|
|
width: Val::Vw(100.0),
|
|
height: Val::Vh(100.0),
|
|
flex_direction: FlexDirection::Column,
|
|
..default()
|
|
},
|
|
..default()
|
|
},
|
|
LogViewerRoot,
|
|
));
|
|
}
|
|
|
|
// This is how we can read our LogEvents.
|
|
// In this example we are reading the LogEvents and inserting them as text into our log viewer.
|
|
fn print_logs(
|
|
mut events: EventReader<LogEvent>,
|
|
mut commands: Commands,
|
|
log_viewer_root: Query<Entity, With<LogViewerRoot>>,
|
|
) {
|
|
let root_entity = log_viewer_root.single();
|
|
|
|
commands.entity(root_entity).with_children(|child| {
|
|
for event in events.read() {
|
|
child.spawn(TextBundle::from_section(
|
|
&event.message,
|
|
TextStyle::default(),
|
|
));
|
|
}
|
|
});
|
|
}
|