Skip to content

Commit 5af0788

Browse files
authored
Merge branch 'v0.1.x' into eliza/backport-#1716
2 parents fbfa546 + 6ede79c commit 5af0788

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

tracing-appender/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ This crate can be used in a few ways to record spans/events:
5353
- Using *any* type implementing [`std::io::Write`][write] in a
5454
non-blocking fashion.
5555
- Using [`NonBlocking`][non_blocking] and [`RollingFileAppender`][file_appender]
56-
together to write to write to log files in a non-blocking fashion.
56+
together to write to log files in a non-blocking fashion.
5757

5858
## Rolling File Appender
5959

@@ -137,7 +137,7 @@ fn main() {
137137
[tracing]: https://docs.rs/tracing/latest/tracing/
138138
[make_writer]: https://docs.rs/tracing-subscriber/latest/tracing_subscriber/fmt/trait.MakeWriter.html
139139
[write]: https://doc.rust-lang.org/std/io/trait.Write.html
140-
[non_blocking]: https://docs.rs/tracing-appender/latest/tracing_appender/non_blocking/indexx.html
140+
[non_blocking]: https://docs.rs/tracing-appender/latest/tracing_appender/non_blocking/index.html
141141
[rolling]: https://docs.rs/tracing-appender/latest/tracing_appender/rolling/index.html
142142
[guard]: https://docs.rs/tracing-appender/latest/tracing_appender/non_blocking/struct.WorkerGuard.html
143143
[file_appender]: https://docs.rs/tracing-appender/latest/tracing_appender/rolling/struct.RollingFileAppender.html

tracing-core/src/subscriber.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -567,15 +567,9 @@ impl Interest {
567567
///
568568
/// [`NoSubscriber`] implements the [`Subscriber`] trait by never being enabled,
569569
/// never being interested in any callsite, and dropping all spans and events.
570-
#[derive(Debug, Copy, Clone)]
570+
#[derive(Copy, Clone, Debug, Default)]
571571
pub struct NoSubscriber(());
572572

573-
impl Default for NoSubscriber {
574-
fn default() -> Self {
575-
NoSubscriber(())
576-
}
577-
}
578-
579573
impl Subscriber for NoSubscriber {
580574
#[inline]
581575
fn register_callsite(&self, _: &'static Metadata<'static>) -> Interest {

tracing-flame/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tracing-flame"
3-
version = "0.1.0"
3+
version = "0.2.0"
44
authors = [
55
"Jane Lusby <jlusby@yaah.dev>",
66
"Tokio Contributors <team@tokio.rs>"

tracing-opentelemetry/src/span_ext.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub trait OpenTelemetrySpanExt {
2222
/// use std::collections::HashMap;
2323
/// use tracing::Span;
2424
///
25-
/// // Example carrier, could be a framework header map that impls otel's `Extract`.
25+
/// // Example carrier, could be a framework header map that impls otel's `Extractor`.
2626
/// let mut carrier = HashMap::new();
2727
///
2828
/// // Propagator can be swapped with b3 propagator, jaeger propagator, etc.
@@ -56,7 +56,7 @@ pub trait OpenTelemetrySpanExt {
5656
/// use std::collections::HashMap;
5757
/// use tracing::Span;
5858
///
59-
/// // Example carrier, could be a framework header map that impls otel's `Extract`.
59+
/// // Example carrier, could be a framework header map that impls otel's `Extractor`.
6060
/// let mut carrier = HashMap::new();
6161
///
6262
/// // Propagator can be swapped with b3 propagator, jaeger propagator, etc.

0 commit comments

Comments
 (0)