[tracing-core] Remove `static requirement from Event

tracing-core/src/dispatch.rs

@@ -667,7 +667,7 @@ impl Dispatch {
     /// [`event`]: super::collect::Collect::event
     #[inline]
     pub fn event<'a>(&'a self, event: &'a Event<'a, '_>) {
-        self.subscriber().event(event)
+        self.collector().event(event)
     }
 
     /// Records that a span has been can_enter.

tracing-core/src/event.rs

@@ -28,7 +28,7 @@ pub struct Event<'a, 'b> {
 
 impl<'a, 'b: 'a> Event<'a, 'b> {
     /// Constructs a new `Event` with the specified metadata and set of values,
-    /// and observes it with the current subscriber.
+    /// and observes it with the current collector.
     pub fn dispatch(metadata: &'a Metadata<'_>, fields: &'a field::ValueSet<'_>) {
         let event = Event::new(metadata, fields);
         crate::dispatch::get_default(|current| {

tracing-journald/src/lib.rs

@@ -154,7 +154,7 @@ where
         });
     }
 
-    fn on_event(&self, event: &Event<'_, '_>, ctx: Context<S>) {
+    fn on_event(&self, event: &Event<'_, '_>, ctx: Context<C>) {
         let mut buf = Vec::with_capacity(256);
 
         // Record span fields

tracing-subscriber/src/reload.rs

@@ -94,8 +94,7 @@ where
     }
 
     #[inline]
-    // fn on_event<'a>(&'a self, event: &'a Event<'a>, ctx: layer::Context<'_, S>) {
-    fn on_event(&self, event: &Event<'_, '_>, ctx: layer::Context<'_, S>) {
+    fn on_event(&self, event: &Event<'_, '_>, ctx: subscribe::Context<'_, C>) {
         try_lock!(self.inner.read()).on_event(event, ctx)
     }
 

tracing-subscriber/src/subscribe.rs

@@ -326,9 +326,8 @@ where
     // seems like a good future-proofing measure as it may grow other methods later...
     fn on_follows_from(&self, _span: &span::Id, _follows: &span::Id, _ctx: Context<'_, C>) {}
 
-    /// Notifies this layer that an event has occurred.
-    // fn on_event<'a, 'b: 'a>(&'a self, _event: &'a Event<'a, 'b>, _ctx: Context<'_, S>) {}
-    fn on_event(&self, _event: &Event<'_, '_>, _ctx: Context<'_, S>) {}
+    /// Notifies this subscriber that an event has occurred.
+    fn on_event(&self, _event: &Event<'_, '_>, _ctx: Context<'_, C>) {}
 
     /// Notifies this subscriber that a span with the given ID was entered.
     fn on_enter(&self, _id: &span::Id, _ctx: Context<'_, C>) {}
@@ -771,7 +770,7 @@ where
     }
 
     #[inline]
-    fn on_event(&self, event: &Event<'_, '_>, ctx: Context<'_, S>) {
+    fn on_event(&self, event: &Event<'_, '_>, ctx: Context<'_, C>) {
         self.inner.on_event(event, ctx.clone());
         self.subscriber.on_event(event, ctx);
     }
@@ -862,7 +861,7 @@ where
     }
 
     #[inline]
-    fn on_event(&self, event: &Event<'_, '_>, ctx: Context<'_, S>) {
+    fn on_event(&self, event: &Event<'_, '_>, ctx: Context<'_, C>) {
         if let Some(ref inner) = self {
             inner.on_event(event, ctx);
         }

tracing/tests/filter_caching_is_lexically_scoped.rs

@@ -37,8 +37,8 @@ fn filter_caching_is_lexically_scoped() {
     let count = Arc::new(AtomicUsize::new(0));
     let count2 = count.clone();
 
-    let subscriber = subscriber::mock()
-        .with_filter(move |meta| match meta.name().as_ref() {
+    let subscriber = collector::mock()
+        .with_filter(move |meta| match meta.name() {
             "emily" | "frank" => {
                 count2.fetch_add(1, Ordering::Relaxed);
                 true

tracing/tests/filters_are_not_reevaluated_for_the_same_span.rs

@@ -33,8 +33,8 @@ fn filters_are_not_reevaluated_for_the_same_span() {
     let alice_count2 = alice_count.clone();
     let bob_count2 = bob_count.clone();
 
-    let (subscriber, handle) = subscriber::mock()
-        .with_filter(move |meta| match meta.name().as_ref() {
+    let (collector, handle) = collector::mock()
+        .with_filter(move |meta| match meta.name() {
             "alice" => {
                 alice_count2.fetch_add(1, Ordering::Relaxed);
                 false