Add rubicon 3.x support

tracing-core/Cargo.toml

@@ -35,6 +35,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 once_cell = { version = "1.13.0", optional = true }
+rubicon = "3.3.3"
 
 [target.'cfg(tracing_unstable)'.dependencies]
 valuable = { version = "0.1.0", optional = true, default-features = false }

tracing-core/src/callsite.rs

@@ -254,14 +254,16 @@ pub fn register(callsite: &'static dyn Callsite) {
     CALLSITES.push_dyn(callsite);
 }
 
-static CALLSITES: Callsites = Callsites {
-    list_head: AtomicPtr::new(ptr::null_mut()),
-    has_locked_callsites: AtomicBool::new(false),
-};
+rubicon::process_local! {
+    static CALLSITES: Callsites = Callsites {
+        list_head: AtomicPtr::new(ptr::null_mut()),
+        has_locked_callsites: AtomicBool::new(false),
+    };
 
-static DISPATCHERS: Dispatchers = Dispatchers::new();
+    static DISPATCHERS: Dispatchers = Dispatchers::new();
 
-static LOCKED_CALLSITES: Lazy<Mutex<Vec<&'static dyn Callsite>>> = Lazy::new(Default::default);
+    static LOCKED_CALLSITES: Lazy<Mutex<Vec<&'static dyn Callsite>>> = Lazy::new(Default::default);
+}
 
 struct Callsites {
     list_head: AtomicPtr<DefaultCallsite>,
@@ -526,8 +528,10 @@ mod dispatchers {
         has_just_one: AtomicBool,
     }
 
-    static LOCKED_DISPATCHERS: Lazy<RwLock<Vec<dispatcher::Registrar>>> =
-        Lazy::new(Default::default);
+    rubicon::process_local! {
+        static LOCKED_DISPATCHERS: Lazy<RwLock<Vec<dispatcher::Registrar>>> =
+            Lazy::new(Default::default);
+    }
 
     pub(super) enum Rebuilder<'a> {
         JustOne,

tracing-core/src/dispatcher.rs

@@ -144,10 +144,10 @@
     error,
 };
 
 #[cfg(feature = "alloc")]
 use alloc::sync::{Arc, Weak};
 
 #[cfg(feature = "alloc")]
 use core::ops::Deref;
 
 /// `Dispatch` trace data to a [`Subscriber`].
@@ -186,30 +186,34 @@
 }
 
 #[cfg(feature = "std")]
-thread_local! {
+rubicon::thread_local! {
     static CURRENT_STATE: State = State {
         default: RefCell::new(None),
         can_enter: Cell::new(true),
     };
 }
 
-static EXISTS: AtomicBool = AtomicBool::new(false);
-static GLOBAL_INIT: AtomicUsize = AtomicUsize::new(UNINITIALIZED);
+rubicon::process_local! {
+    static EXISTS: AtomicBool = AtomicBool::new(false);
+    static GLOBAL_INIT: AtomicUsize = AtomicUsize::new(UNINITIALIZED);
 
-#[cfg(feature = "std")]
-static SCOPED_COUNT: AtomicUsize = AtomicUsize::new(0);
+    #[cfg(feature = "std")]
+    static SCOPED_COUNT: AtomicUsize = AtomicUsize::new(0);
+}
 
 const UNINITIALIZED: usize = 0;
 const INITIALIZING: usize = 1;
 const INITIALIZED: usize = 2;
 
-static mut GLOBAL_DISPATCH: Dispatch = Dispatch {
-    subscriber: Kind::Global(&NO_SUBSCRIBER),
-};
-static NONE: Dispatch = Dispatch {
-    subscriber: Kind::Global(&NO_SUBSCRIBER),
-};
-static NO_SUBSCRIBER: NoSubscriber = NoSubscriber::new();
+rubicon::process_local! {
+    static mut GLOBAL_DISPATCH: Dispatch = Dispatch {
+        subscriber: Kind::Global(&NO_SUBSCRIBER),
+    };
+    static NONE: Dispatch = Dispatch {
+        subscriber: Kind::Global(&NO_SUBSCRIBER),
+    };
+    static NO_SUBSCRIBER: NoSubscriber = NoSubscriber::new();
+}
 
 /// The dispatch state of a thread.
 #[cfg(feature = "std")]
@@ -455,7 +459,7 @@
     unsafe {
         // This is safe given the invariant that setting the global dispatcher
         // also sets `GLOBAL_INIT` to `INITIALIZED`.
         &GLOBAL_DISPATCH
     }
 }
 
@@ -929,15 +933,17 @@
     }
 
     struct TestCallsite;
-    static TEST_CALLSITE: TestCallsite = TestCallsite;
-    static TEST_META: Metadata<'static> = metadata! {
-        name: "test",
-        target: module_path!(),
-        level: Level::DEBUG,
-        fields: &[],
-        callsite: &TEST_CALLSITE,
-        kind: Kind::EVENT
-    };
+    rubicon::process_local! {
+        static TEST_CALLSITE: TestCallsite = TestCallsite;
+        static TEST_META: Metadata<'static> = metadata! {
+            name: "test",
+            target: module_path!(),
+            level: Level::DEBUG,
+            fields: &[],
+            callsite: &TEST_CALLSITE,
+            kind: Kind::EVENT
+        };
+    }
 
     impl Callsite for TestCallsite {
         fn set_interest(&self, _: Interest) {}
@@ -966,7 +972,9 @@
             fn record_follows_from(&self, _: &span::Id, _: &span::Id) {}
 
             fn event(&self, _: &Event<'_>) {
-                static EVENTS: AtomicUsize = AtomicUsize::new(0);
+                rubicon::process_local! {
+                    static EVENTS: AtomicUsize = AtomicUsize::new(0);
+                }
                 assert_eq!(
                     EVENTS.fetch_add(1, Ordering::Relaxed),
                     0,
@@ -1007,7 +1015,9 @@
             }
 
             fn new_span(&self, _: &span::Attributes<'_>) -> span::Id {
-                static NEW_SPANS: AtomicUsize = AtomicUsize::new(0);
+                rubicon::process_local! {
+                    static NEW_SPANS: AtomicUsize = AtomicUsize::new(0);
+                }
                 assert_eq!(
                     NEW_SPANS.fetch_add(1, Ordering::Relaxed),
                     0,

tracing-core/src/field.rs

@@ -267,7 +267,7 @@
     /// Visits an arbitrary type implementing the [`valuable`] crate's `Valuable` trait.
     ///
     /// [`valuable`]: https://docs.rs/valuable
     #[cfg(all(tracing_unstable, feature = "valuable"))]
     #[cfg_attr(docsrs, doc(cfg(all(tracing_unstable, feature = "valuable"))))]
     fn record_value(&mut self, field: &Field, value: valuable::Value<'_>) {
         self.record_debug(field, &value)
@@ -371,7 +371,7 @@
 /// can be recorded using its `Valuable` implementation.
 ///
 /// [`Valuable`]: https://docs.rs/valuable/latest/valuable/trait.Valuable.html
 #[cfg(all(tracing_unstable, feature = "valuable"))]
 #[cfg_attr(docsrs, doc(cfg(all(tracing_unstable, feature = "valuable"))))]
 pub fn valuable<T>(t: &T) -> valuable::Value<'_>
 where
@@ -651,10 +651,12 @@
             }
         }
 
-        static FIELD: Field = Field {
-            i: 0,
-            fields: FieldSet::new(&[], crate::identify_callsite!(&NULL_CALLSITE)),
-        };
+        rubicon::process_local! {
+            static FIELD: Field = Field {
+                i: 0,
+                fields: FieldSet::new(&[], crate::identify_callsite!(&NULL_CALLSITE)),
+            };
+        }
 
         let mut res = Ok(());
         self.record(&FIELD, &mut |_: &Field, val: &dyn fmt::Debug| {
@@ -716,10 +718,10 @@
 
 // ===== impl ValuableValue =====
 
 #[cfg(all(tracing_unstable, feature = "valuable"))]
 impl crate::sealed::Sealed for valuable::Value<'_> {}
 
 #[cfg(all(tracing_unstable, feature = "valuable"))]
 #[cfg_attr(docsrs, doc(cfg(all(tracing_unstable, feature = "valuable"))))]
 impl Value for valuable::Value<'_> {
     fn record(&self, key: &Field, visitor: &mut dyn Visit) {
@@ -727,10 +729,10 @@
     }
 }
 
 #[cfg(all(tracing_unstable, feature = "valuable"))]
 impl crate::sealed::Sealed for &'_ dyn valuable::Valuable {}
 
 #[cfg(all(tracing_unstable, feature = "valuable"))]
 #[cfg_attr(docsrs, doc(cfg(all(tracing_unstable, feature = "valuable"))))]
 impl Value for &'_ dyn valuable::Valuable {
     fn record(&self, key: &Field, visitor: &mut dyn Visit) {
@@ -836,7 +838,7 @@
     /// Returns the [`Field`] named `name`, or `None` if no such field exists.
     ///
     /// [`Field`]: super::Field
     pub fn field<Q: ?Sized>(&self, name: &Q) -> Option<Field>
     where
         Q: Borrow<str>,
     {
@@ -1091,15 +1093,18 @@
 
     // Make sure TEST_CALLSITE_* have non-zero size, so they can't be located at the same address.
     struct TestCallsite1(u8);
-    static TEST_CALLSITE_1: TestCallsite1 = TestCallsite1(0);
-    static TEST_META_1: Metadata<'static> = metadata! {
-        name: "field_test1",
-        target: module_path!(),
-        level: Level::INFO,
-        fields: &["foo", "bar", "baz"],
-        callsite: &TEST_CALLSITE_1,
-        kind: Kind::SPAN,
-    };
+
+    rubicon::process_local! {
+        static TEST_CALLSITE_1: TestCallsite1 = TestCallsite1(0);
+        static TEST_META_1: Metadata<'static> = metadata! {
+            name: "field_test1",
+            target: module_path!(),
+            level: Level::INFO,
+            fields: &["foo", "bar", "baz"],
+            callsite: &TEST_CALLSITE_1,
+            kind: Kind::SPAN,
+        };
+    }
 
     impl crate::callsite::Callsite for TestCallsite1 {
         fn set_interest(&self, _: crate::subscriber::Interest) {
@@ -1112,15 +1117,17 @@
     }
 
     struct TestCallsite2(u8);
-    static TEST_CALLSITE_2: TestCallsite2 = TestCallsite2(0);
-    static TEST_META_2: Metadata<'static> = metadata! {
-        name: "field_test2",
-        target: module_path!(),
-        level: Level::INFO,
-        fields: &["foo", "bar", "baz"],
-        callsite: &TEST_CALLSITE_2,
-        kind: Kind::SPAN,
-    };
+    rubicon::process_local! {
+        static TEST_CALLSITE_2: TestCallsite2 = TestCallsite2(0);
+        static TEST_META_2: Metadata<'static> = metadata! {
+            name: "field_test2",
+            target: module_path!(),
+            level: Level::INFO,
+            fields: &["foo", "bar", "baz"],
+            callsite: &TEST_CALLSITE_2,
+            kind: Kind::SPAN,
+        };
+    }
 
     impl crate::callsite::Callsite for TestCallsite2 {
         fn set_interest(&self, _: crate::subscriber::Interest) {

tracing-core/src/lib.rs

@@ -292,3 +292,10 @@ pub use self::{metadata::Kind, subscriber::Interest};
 mod sealed {
     pub trait Sealed {}
 }
+
+rubicon::compatibility_check! {
+    ("version", env!("CARGO_PKG_VERSION")),
+
+    #[cfg(feature = "std")]
+    ("std", "enabled"),
+}

tracing-core/src/metadata.rs

@@ -242,7 +242,9 @@ pub struct LevelFilter(Option<Level>);
 #[derive(Clone, Debug)]
 pub struct ParseLevelFilterError(());
 
-static MAX_LEVEL: AtomicUsize = AtomicUsize::new(LevelFilter::OFF_USIZE);
+rubicon::process_local! {
+    static MAX_LEVEL: AtomicUsize = AtomicUsize::new(LevelFilter::OFF_USIZE);
+}
 
 // ===== impl Metadata =====
 

tracing-core/src/subscriber.rs

@@ -699,6 +699,36 @@ impl Subscriber for NoSubscriber {
     fn exit(&self, _span: &span::Id) {}
 }
 
+impl Subscriber for rubicon::TrustedExtern<NoSubscriber> {
+    fn enabled(&self, metadata: &Metadata<'_>) -> bool {
+        self.0.enabled(metadata)
+    }
+
+    fn new_span(&self, span: &span::Attributes<'_>) -> span::Id {
+        self.0.new_span(span)
+    }
+
+    fn record(&self, span: &span::Id, values: &span::Record<'_>) {
+        self.0.record(span, values)
+    }
+
+    fn record_follows_from(&self, span: &span::Id, follows: &span::Id) {
+        self.0.record_follows_from(span, follows)
+    }
+
+    fn event(&self, event: &Event<'_>) {
+        self.0.event(event)
+    }
+
+    fn enter(&self, span: &span::Id) {
+        self.0.enter(span)
+    }
+
+    fn exit(&self, span: &span::Id) {
+        self.0.exit(span)
+    }
+}
+
 impl NoSubscriber {
     /// Returns a new `NoSubscriber`.
     #[must_use]

tracing-flame/Cargo.toml

@@ -1,10 +1,7 @@
 [package]
 name = "tracing-flame"
 version = "0.2.0"
-authors = [
-    "Jane Lusby <[email protected]>",
-    "Tokio Contributors <[email protected]>"
-]
+authors = ["Jane Lusby <[email protected]>", "Tokio Contributors <[email protected]>"]
 edition = "2018"
 license = "MIT"
 readme = "README.md"
@@ -26,9 +23,15 @@ default = ["smallvec"]
 smallvec = ["tracing-subscriber/smallvec"]
 
 [dependencies]
-tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", default-features = false, features = ["registry", "fmt"] }
-tracing = { path = "../tracing", version = "0.1.35", default-features = false, features = ["std"] }
+tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", default-features = false, features = [
+    "registry",
+    "fmt",
+] }
+tracing = { path = "../tracing", version = "0.1.35", default-features = false, features = [
+    "std",
+] }
 once_cell = "1.13.0"
+rubicon = "3.3.3"
 
 
 [dev-dependencies]

tracing-flame/src/lib.rs

@@ -159,7 +159,7 @@ mod error;
 
 static START: Lazy<Instant> = Lazy::new(Instant::now);
 
-thread_local! {
+rubicon::thread_local! {
     static LAST_EVENT: Cell<Instant> = Cell::new(*START);
 
     static THREAD_NAME: String = {
@@ -505,3 +505,7 @@ where
 
     Ok(())
 }
+
+rubicon::compatibility_check! {
+    ("version", env!("CARGO_PKG_VERSION")),
+}

tracing/Cargo.toml

@@ -9,7 +9,10 @@ name = "tracing"
 # - Update CHANGELOG.md.
 # - Create "v0.1.x" git tag
 version = "0.1.40"
-authors = ["Eliza Weisman <[email protected]>", "Tokio Contributors <[email protected]>"]
+authors = [
+    "Eliza Weisman <[email protected]>",
+    "Tokio Contributors <[email protected]>",
+]
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/tokio-rs/tracing"
@@ -32,6 +35,7 @@ tracing-core = { path = "../tracing-core", version = "0.1.32", default-features
 log = { version = "0.4.17", optional = true }
 tracing-attributes = { path = "../tracing-attributes", version = "0.1.27", optional = true }
 pin-project-lite = "0.2.9"
+rubicon = "3.3.3"
 
 [dev-dependencies]
 criterion = { version = "0.3.6", default_features = false }
@@ -45,17 +49,17 @@ wasm-bindgen-test = "0.3.38"
 [features]
 default = ["std", "attributes"]
 
-max_level_off   = []
+max_level_off = []
 max_level_error = []
-max_level_warn  = []
-max_level_info  = []
+max_level_warn = []
+max_level_info = []
 max_level_debug = []
 max_level_trace = []
 
-release_max_level_off   = []
+release_max_level_off = []
 release_max_level_error = []
-release_max_level_warn  = []
-release_max_level_info  = []
+release_max_level_warn = []
+release_max_level_info = []
 release_max_level_debug = []
 release_max_level_trace = []