Vendor dependencies for 0.3.0 release

vendor/tracing-core/tests/common/mod.rs

@@ -0,0 +1,30 @@
+use tracing_core::{metadata::Metadata, span, subscriber::Subscriber, Event};
+
+pub struct TestSubscriberA;
+impl Subscriber for TestSubscriberA {
+    fn enabled(&self, _: &Metadata<'_>) -> bool {
+        true
+    }
+    fn new_span(&self, _: &span::Attributes<'_>) -> span::Id {
+        span::Id::from_u64(1)
+    }
+    fn record(&self, _: &span::Id, _: &span::Record<'_>) {}
+    fn record_follows_from(&self, _: &span::Id, _: &span::Id) {}
+    fn event(&self, _: &Event<'_>) {}
+    fn enter(&self, _: &span::Id) {}
+    fn exit(&self, _: &span::Id) {}
+}
+pub struct TestSubscriberB;
+impl Subscriber for TestSubscriberB {
+    fn enabled(&self, _: &Metadata<'_>) -> bool {
+        true
+    }
+    fn new_span(&self, _: &span::Attributes<'_>) -> span::Id {
+        span::Id::from_u64(1)
+    }
+    fn record(&self, _: &span::Id, _: &span::Record<'_>) {}
+    fn record_follows_from(&self, _: &span::Id, _: &span::Id) {}
+    fn event(&self, _: &Event<'_>) {}
+    fn enter(&self, _: &span::Id) {}
+    fn exit(&self, _: &span::Id) {}
+}

vendor/tracing-core/tests/dispatch.rs

@@ -0,0 +1,56 @@
+#![cfg(feature = "std")]
+mod common;
+
+use common::*;
+use tracing_core::dispatcher::*;
+
+#[test]
+fn set_default_dispatch() {
+    set_global_default(Dispatch::new(TestSubscriberA)).expect("global dispatch set failed");
+    get_default(|current| {
+        assert!(
+            current.is::<TestSubscriberA>(),
+            "global dispatch get failed"
+        )
+    });
+
+    let guard = set_default(&Dispatch::new(TestSubscriberB));
+    get_default(|current| assert!(current.is::<TestSubscriberB>(), "set_default get failed"));
+
+    // Drop the guard, setting the dispatch back to the global dispatch
+    drop(guard);
+
+    get_default(|current| {
+        assert!(
+            current.is::<TestSubscriberA>(),
+            "global dispatch get failed"
+        )
+    });
+}
+
+#[test]
+fn nested_set_default() {
+    let _guard = set_default(&Dispatch::new(TestSubscriberA));
+    get_default(|current| {
+        assert!(
+            current.is::<TestSubscriberA>(),
+            "set_default for outer subscriber failed"
+        )
+    });
+
+    let inner_guard = set_default(&Dispatch::new(TestSubscriberB));
+    get_default(|current| {
+        assert!(
+            current.is::<TestSubscriberB>(),
+            "set_default inner subscriber failed"
+        )
+    });
+
+    drop(inner_guard);
+    get_default(|current| {
+        assert!(
+            current.is::<TestSubscriberA>(),
+            "set_default outer subscriber failed"
+        )
+    });
+}

vendor/tracing-core/tests/global_dispatch.rs

@@ -0,0 +1,34 @@
+mod common;
+
+use common::*;
+use tracing_core::dispatcher::*;
+#[test]
+fn global_dispatch() {
+    set_global_default(Dispatch::new(TestSubscriberA)).expect("global dispatch set failed");
+    get_default(|current| {
+        assert!(
+            current.is::<TestSubscriberA>(),
+            "global dispatch get failed"
+        )
+    });
+
+    #[cfg(feature = "std")]
+    with_default(&Dispatch::new(TestSubscriberB), || {
+        get_default(|current| {
+            assert!(
+                current.is::<TestSubscriberB>(),
+                "thread-local override of global dispatch failed"
+            )
+        });
+    });
+
+    get_default(|current| {
+        assert!(
+            current.is::<TestSubscriberA>(),
+            "reset to global override failed"
+        )
+    });
+
+    set_global_default(Dispatch::new(TestSubscriberA))
+        .expect_err("double global dispatch set succeeded");
+}

vendor/tracing-core/tests/local_dispatch_before_init.rs

@@ -0,0 +1,43 @@
+mod common;
+
+use common::*;
+use tracing_core::{
+    dispatcher::{self, Dispatch},
+    subscriber::NoSubscriber,
+};
+
+/// This test reproduces the following issues:
+/// - https://github.com/tokio-rs/tracing/issues/2587
+/// - https://github.com/tokio-rs/tracing/issues/2411
+/// - https://github.com/tokio-rs/tracing/issues/2436
+#[test]
+fn local_dispatch_before_init() {
+    dispatcher::get_default(|current| assert!(dbg!(current).is::<NoSubscriber>()));
+
+    // Temporarily override the default dispatcher with a scoped dispatcher.
+    // Using a scoped dispatcher makes the thread local state attempt to cache
+    // the scoped default.
+    #[cfg(feature = "std")]
+    {
+        dispatcher::with_default(&Dispatch::new(TestSubscriberB), || {
+            dispatcher::get_default(|current| {
+                assert!(
+                    dbg!(current).is::<TestSubscriberB>(),
+                    "overriden subscriber not set",
+                );
+            })
+        })
+    }
+
+    dispatcher::get_default(|current| assert!(current.is::<NoSubscriber>()));
+
+    dispatcher::set_global_default(Dispatch::new(TestSubscriberA))
+        .expect("set global dispatch failed");
+
+    dispatcher::get_default(|current| {
+        assert!(
+            dbg!(current).is::<TestSubscriberA>(),
+            "default subscriber not set"
+        );
+    });
+}

vendor/tracing-core/tests/macros.rs

@@ -0,0 +1,48 @@
+use tracing_core::{
+    callsite::Callsite,
+    metadata,
+    metadata::{Kind, Level, Metadata},
+    subscriber::Interest,
+};
+
+#[test]
+fn metadata_macro_api() {
+    // This test should catch any inadvertent breaking changes
+    // caused by changes to the macro.
+    struct TestCallsite;
+
+    impl Callsite for TestCallsite {
+        fn set_interest(&self, _: Interest) {
+            unimplemented!("test")
+        }
+        fn metadata(&self) -> &Metadata<'_> {
+            unimplemented!("test")
+        }
+    }
+
+    static CALLSITE: TestCallsite = TestCallsite;
+    let _metadata = metadata! {
+        name: "test_metadata",
+        target: "test_target",
+        level: Level::DEBUG,
+        fields: &["foo", "bar", "baz"],
+        callsite: &CALLSITE,
+        kind: Kind::SPAN,
+    };
+    let _metadata = metadata! {
+        name: "test_metadata",
+        target: "test_target",
+        level: Level::TRACE,
+        fields: &[],
+        callsite: &CALLSITE,
+        kind: Kind::EVENT,
+    };
+    let _metadata = metadata! {
+        name: "test_metadata",
+        target: "test_target",
+        level: Level::INFO,
+        fields: &[],
+        callsite: &CALLSITE,
+        kind: Kind::EVENT
+    };
+}

vendor/tracing-core/tests/missed_register_callsite.rs

@@ -0,0 +1,125 @@
+use std::{
+    ptr,
+    sync::atomic::{AtomicPtr, Ordering},
+    thread::{self, JoinHandle},
+    time::Duration,
+};
+
+use tracing_core::{
+    callsite::{Callsite as _, DefaultCallsite},
+    dispatcher::set_default,
+    field::{FieldSet, Value},
+    span, Dispatch, Event, Kind, Level, Metadata, Subscriber,
+};
+
+struct TestSubscriber {
+    sleep: Duration,
+    callsite: AtomicPtr<Metadata<'static>>,
+}
+
+impl TestSubscriber {
+    fn new(sleep_micros: u64) -> Self {
+        Self {
+            sleep: Duration::from_micros(sleep_micros),
+            callsite: AtomicPtr::new(ptr::null_mut()),
+        }
+    }
+}
+
+impl Subscriber for TestSubscriber {
+    fn register_callsite(&self, metadata: &'static Metadata<'static>) -> tracing_core::Interest {
+        if !self.sleep.is_zero() {
+            thread::sleep(self.sleep);
+        }
+
+        self.callsite
+            .store(metadata as *const _ as *mut _, Ordering::SeqCst);
+
+        tracing_core::Interest::always()
+    }
+
+    fn event(&self, event: &tracing_core::Event<'_>) {
+        let stored_callsite = self.callsite.load(Ordering::SeqCst);
+        let event_callsite: *mut Metadata<'static> = event.metadata() as *const _ as *mut _;
+
+        // This assert is the actual test.
+        assert_eq!(
+            stored_callsite, event_callsite,
+            "stored callsite: {stored_callsite:#?} does not match event \
+            callsite: {event_callsite:#?}. Was `event` called before \
+            `register_callsite`?"
+        );
+    }
+
+    fn enabled(&self, _metadata: &Metadata<'_>) -> bool {
+        true
+    }
+    fn new_span(&self, _span: &span::Attributes<'_>) -> span::Id {
+        span::Id::from_u64(0)
+    }
+    fn record(&self, _span: &span::Id, _values: &span::Record<'_>) {}
+    fn record_follows_from(&self, _span: &span::Id, _follows: &span::Id) {}
+    fn enter(&self, _span: &tracing_core::span::Id) {}
+    fn exit(&self, _span: &tracing_core::span::Id) {}
+}
+
+fn subscriber_thread(idx: usize, register_sleep_micros: u64) -> JoinHandle<()> {
+    thread::Builder::new()
+        .name(format!("subscriber-{idx}"))
+        .spawn(move || {
+            // We use a sleep to ensure the starting order of the 2 threads.
+            let subscriber = TestSubscriber::new(register_sleep_micros);
+            let _dispatch_guard = set_default(&Dispatch::new(subscriber));
+
+            static CALLSITE: DefaultCallsite = {
+                // The values of the metadata are unimportant
+                static META: Metadata<'static> = Metadata::new(
+                    "event ",
+                    "module::path",
+                    Level::INFO,
+                    None,
+                    None,
+                    None,
+                    FieldSet::new(&["message"], tracing_core::callsite::Identifier(&CALLSITE)),
+                    Kind::EVENT,
+                );
+                DefaultCallsite::new(&META)
+            };
+            let _interest = CALLSITE.interest();
+
+            let meta = CALLSITE.metadata();
+            let field = meta.fields().field("message").unwrap();
+            let message = format!("event-from-{idx}", idx = idx);
+            let values = [(&field, Some(&message as &dyn Value))];
+            let value_set = CALLSITE.metadata().fields().value_set(&values);
+
+            Event::dispatch(meta, &value_set);
+
+            // Wait a bit for everything to end (we don't want to remove the subscriber
+            // immediately because that will influence the test).
+            thread::sleep(Duration::from_millis(10));
+        })
+        .expect("failed to spawn thread")
+}
+
+/// Regression test for missing register_callsite call (#2743)
+///
+/// This test provokes the race condition which causes the second subscriber to not receive a
+/// call to `register_callsite` before it receives a call to `event`.
+///
+/// Because the test depends on the interaction of multiple dispatchers in different threads,
+/// it needs to be in a test file by itself.
+#[test]
+fn event_before_register() {
+    let subscriber_1_register_sleep_micros = 100;
+    let subscriber_2_register_sleep_micros = 0;
+
+    let jh1 = subscriber_thread(1, subscriber_1_register_sleep_micros);
+
+    // This delay ensures that the event callsite has interest() called first.
+    thread::sleep(Duration::from_micros(50));
+    let jh2 = subscriber_thread(2, subscriber_2_register_sleep_micros);
+
+    jh1.join().expect("failed to join thread");
+    jh2.join().expect("failed to join thread");
+}