Skip to content

Commit 807e371

Browse files
dvdplmdvdplm
committed
Merge remote-tracking branch 'upstream/master' into dp-fix-tracing-macros
* upstream/master: (30 commits) chore(deps): update pin-project requirement from 0.4 to 1.0 (tokio-rs#1038) chore: remove duplicated section from tracing/README.md (tokio-rs#1046) opentelemetry: prepare for 0.8.0 release (tokio-rs#1036) docs: add favicon for extra pretty docs (tokio-rs#1033) subscriber: fix `reload` ergonomics (tokio-rs#1035) chore(deps): update crossbeam-channel requirement from 0.4.2 to 0.5.0 (tokio-rs#1031) opentelemetry: Assign default ids if missing (tokio-rs#1027) chore: remove deprecated add-path from CI (tokio-rs#1026) attributes: fix `#[instrument(err)]` in case of early returns (tokio-rs#1006) core: remove mandatory liballoc dependency with no-std (tokio-rs#1017) chore(deps): update cfg-if requirement from 0.1.10 to 1.0.0 (tokio-rs#1023) subscriber: warn if trying to enable a statically disabled level (tokio-rs#990) subscriber: use macros for module declarations (tokio-rs#1009) chore: remove `stdlib.rs` (tokio-rs#1008) core: fix linked list tests reusing `Registration`s (tokio-rs#1016) subscriber: support dash in target names (tokio-rs#1012) docs: switch to intra-doc links in tracing-core (tokio-rs#1010) tracing-opentelemetry: implement additional record types (bool, i64, u64) (tokio-rs#1007) core: add intrusive linked list for callsite registry (tokio-rs#988) serde: allow tracing-serde to work on no_std. (tokio-rs#960) ...
2 parents 0ba8541 + cd911e0 commit 807e371

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1950
-1378
lines changed

‎.github/workflows/CI.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
rust: [stable, 1.40.0]
15+
rust: [stable, 1.42.0]
1616
steps:
1717
- uses: actions/checkout@main
1818
- uses: actions-rs/toolchain@v1
@@ -82,7 +82,7 @@ jobs:
8282
with:
8383
path: ${{ runner.tool_cache }}/cargo-hack/bin
8484
key: cargo-hack-bin-${{ hashFiles('.github/caching/cargo-hack.lock') }}
85-
- run: echo "::add-path::${{ runner.tool_cache }}/cargo-hack/bin"
85+
- run: echo "${{ runner.tool_cache }}/cargo-hack/bin" >> $GITHUB_PATH
8686
# if `cargo-hack` somehow doesn't exist after loading it from the cache,
8787
# make *sure* it's there.
8888
- run: cargo hack --help || { cargo install --force cargo-hack; }
@@ -145,7 +145,7 @@ jobs:
145145
runs-on: ubuntu-latest
146146
strategy:
147147
matrix:
148-
rust: [stable, beta, nightly, 1.40.0]
148+
rust: [stable, beta, nightly, 1.42.0]
149149
steps:
150150
- uses: actions/checkout@main
151151
- uses: actions-rs/toolchain@v1
@@ -303,5 +303,5 @@ jobs:
303303
with:
304304
command: install
305305
args: --root ${{ runner.tool_cache }}/cargo-audit --force cargo-audit
306-
- run: echo "::add-path::${{ runner.tool_cache }}/cargo-audit/bin"
306+
- run: echo "${{ runner.tool_cache }}/cargo-audit/bin" >> $GITHUB_PATH
307307
- run: cargo audit

‎.vscode/tasks.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "cargo",
6+
"command": "build",
7+
"problemMatcher": [
8+
"$rustc"
9+
],
10+
"group": "build",
11+
"label": "rust: cargo build"
12+
},
13+
{
14+
"type": "cargo",
15+
"command": "clippy",
16+
"args": [
17+
"--all"
18+
],
19+
"problemMatcher": [
20+
"$rustc"
21+
],
22+
"group": "build",
23+
"label": "rust: cargo clippy"
24+
}
25+
]
26+
}

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ attachment that `Future::instrument` does.
256256
## Supported Rust Versions
257257

258258
Tracing is built against the latest stable release. The minimum supported
259-
version is 1.40. The current Tracing version is not guaranteed to build on Rust
259+
version is 1.42. The current Tracing version is not guaranteed to build on Rust
260260
versions earlier than the minimum supported version.
261261

262262
Tracing follows the same compiler support policies as the rest of the Tokio

‎assets/favicon.ico

15 KB
Binary file not shown.

‎examples/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ default = []
1010
[dev-dependencies]
1111

1212
# tracing crates
13-
tracing = { path = "../tracing", version = "0.1"}
14-
tracing-core = { path = "../tracing-core", version = "0.1"}
13+
tracing = { path = "../tracing", version = "0.2"}
14+
tracing-core = { path = "../tracing-core", version = "0.2"}
1515
tracing-error = { path = "../tracing-error" }
1616
tracing-flame = { path = "../tracing-flame" }
1717
tracing-tower = { version = "0.1.0", path = "../tracing-tower" }
18-
tracing-subscriber = { path = "../tracing-subscriber", version = "0.2.12", features = ["json", "chrono"] }
19-
tracing-futures = { version = "0.2.1", path = "../tracing-futures", features = ["futures-01"] }
20-
tracing-attributes = { path = "../tracing-attributes", version = "0.1.2"}
21-
tracing-log = { path = "../tracing-log", version = "0.1.1", features = ["env_logger"] }
18+
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", features = ["json", "chrono"] }
19+
tracing-futures = { version = "0.3", path = "../tracing-futures", features = ["futures-01"] }
20+
tracing-attributes = { path = "../tracing-attributes", version = "0.2"}
21+
tracing-log = { path = "../tracing-log", version = "0.2", features = ["env_logger"] }
2222
tracing-serde = { path = "../tracing-serde" }
2323
tracing-opentelemetry = { path = "../tracing-opentelemetry" }
2424
tracing-journald = { path = "../tracing-journald" }

‎examples/examples/all-levels.rs

+7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
use tracing::Level;
22

3+
#[no_mangle]
4+
#[inline(never)]
5+
pub fn event() {
6+
tracing::info!("general informational messages relevant to users");
7+
}
8+
39
fn main() {
410
tracing_subscriber::fmt()
511
// all spans/events with a level higher than TRACE (e.g, info, warn, etc.)
612
// will be written to stdout.
713
.with_max_level(Level::TRACE)
814
// sets this to be the default, global subscriber for this application.
915
.init();
16+
event();
1017

1118
tracing::error!("SOMETHING IS SERIOUSLY WRONG!!!");
1219
tracing::warn!("important informational messages; might indicate an error");

‎examples/examples/hyper-echo.rs

+61-65
Original file line numberDiff line numberDiff line change
@@ -16,78 +16,75 @@ async fn echo(req: Request<Body>) -> Result<Response<Body>, hyper::Error> {
1616
uri = ?req.uri(),
1717
headers = ?req.headers()
1818
);
19-
let _enter = span.enter();
20-
info!("received request");
21-
let mut response = Response::new(Body::empty());
19+
async move {
20+
info!("received request");
21+
let mut response = Response::new(Body::empty());
2222

23-
let (rsp_span, resp) = match (req.method(), req.uri().path()) {
24-
// Serve some instructions at /
25-
(&Method::GET, "/") => {
26-
const BODY: &str = "Try POSTing data to /echo";
27-
*response.body_mut() = Body::from(BODY);
28-
(span!(Level::INFO, "response", body = %(&BODY)), response)
29-
}
23+
match (req.method(), req.uri().path()) {
24+
// Serve some instructions at /
25+
(&Method::GET, "/") => {
26+
const BODY: &str = "Try POSTing data to /echo";
27+
*response.body_mut() = Body::from(BODY);
28+
info!(body = %(&BODY), "response",);
29+
Ok(response)
30+
}
3031

31-
// Simply echo the body back to the client.
32-
(&Method::POST, "/echo") => {
33-
let span = span!(Level::INFO, "response", response_kind = %"echo");
34-
*response.body_mut() = req.into_body();
35-
(span, response)
36-
}
32+
// Simply echo the body back to the client.
33+
(&Method::POST, "/echo") => {
34+
info!(response_kind = %"echo", "response");
35+
*response.body_mut() = req.into_body();
36+
Ok(response)
37+
}
3738

38-
// Convert to uppercase before sending back to client.
39-
(&Method::POST, "/echo/uppercase") => {
40-
let body = hyper::body::to_bytes(req).await?;
41-
let upper = body
42-
.iter()
43-
.map(|byte| byte.to_ascii_uppercase())
44-
.collect::<Vec<u8>>();
45-
debug!(
46-
body = ?str::from_utf8(&body[..]),
47-
uppercased = ?str::from_utf8(&upper[..]),
48-
"uppercased request body"
49-
);
39+
// Convert to uppercase before sending back to client.
40+
(&Method::POST, "/echo/uppercase") => {
41+
let body = hyper::body::to_bytes(req).await?;
42+
let upper = body
43+
.iter()
44+
.map(|byte| byte.to_ascii_uppercase())
45+
.collect::<Vec<u8>>();
46+
debug!(
47+
body = ?str::from_utf8(&body[..]),
48+
uppercased = ?str::from_utf8(&upper[..]),
49+
"uppercased request body"
50+
);
5051

51-
*response.body_mut() = Body::from(upper);
52-
(
53-
span!(Level::INFO, "response", response_kind = %"uppercase"),
54-
response,
55-
)
56-
}
52+
info!(response_kind = %"uppercase", "response");
53+
*response.body_mut() = Body::from(upper);
54+
Ok(response)
55+
}
5756

58-
// Reverse the entire body before sending back to the client.
59-
(&Method::POST, "/echo/reversed") => {
60-
let span = span!(Level::TRACE, "response", response_kind = %"reversed");
61-
let _enter = span.enter();
62-
let body = hyper::body::to_bytes(req).await?;
63-
let reversed = body.iter().rev().cloned().collect::<Vec<u8>>();
64-
debug!(
65-
body = ?str::from_utf8(&body[..]),
66-
"reversed request body"
67-
);
68-
*response.body_mut() = Body::from(reversed);
69-
(
70-
span!(Level::INFO, "reversed", body = ?(&response.body())),
71-
response,
72-
)
73-
}
57+
// Reverse the entire body before sending back to the client.
58+
(&Method::POST, "/echo/reversed") => {
59+
async move {
60+
let body = hyper::body::to_bytes(req).await?;
61+
let reversed = body.iter().rev().cloned().collect::<Vec<u8>>();
62+
debug!(
63+
body = ?str::from_utf8(&body[..]),
64+
"reversed request body"
65+
);
66+
*response.body_mut() = Body::from(reversed);
67+
info!(body = ?(&response.body()), "response");
68+
Ok(response)
69+
}
70+
.instrument(span!(Level::TRACE, "response", response_kind = %"reversed"))
71+
.await
72+
}
7473

75-
// The 404 Not Found route...
76-
_ => {
77-
*response.status_mut() = StatusCode::NOT_FOUND;
78-
(
79-
span!(
80-
Level::TRACE,
81-
"response",
74+
// The 404 Not Found route...
75+
_ => {
76+
*response.status_mut() = StatusCode::NOT_FOUND;
77+
info!(
8278
body = ?(),
8379
status = ?StatusCode::NOT_FOUND,
84-
),
85-
response,
86-
)
80+
"response",
81+
);
82+
Ok(response)
83+
}
8784
}
88-
};
89-
let f = async { resp }.instrument(rsp_span);
90-
Ok(f.await)
85+
}
86+
.instrument(span)
87+
.await
9188
}
9289

9390
#[tokio::main]
@@ -107,14 +104,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
107104

108105
let local_addr: std::net::SocketAddr = ([127, 0, 0, 1], 3000).into();
109106
let server_span = span!(Level::TRACE, "server", %local_addr);
110-
let _enter = server_span.enter();
111107

112108
let service = make_service_fn(|_| async { Ok::<_, hyper::Error>(service_fn(echo)) });
113109
let server = Server::bind(&local_addr)
114110
.serve(service)
115111
.instrument(server_span.clone());
116112

117-
info!("listening...");
113+
info!(parent: &server_span, "listening...");
118114
server.await?;
119115

120116
Ok(())

‎examples/examples/tower-load.rs

+7-16
Original file line numberDiff line numberDiff line change
@@ -185,23 +185,20 @@ impl<T> Service<T> for MakeSvc {
185185
}
186186
}
187187

188-
struct AdminSvc<S> {
189-
handle: Handle<EnvFilter, S>,
188+
struct AdminSvc {
189+
handle: Handle<EnvFilter>,
190190
}
191191

192-
impl<S> Clone for AdminSvc<S> {
192+
impl Clone for AdminSvc {
193193
fn clone(&self) -> Self {
194194
Self {
195195
handle: self.handle.clone(),
196196
}
197197
}
198198
}
199199

200-
impl<'a, S> Service<&'a AddrStream> for AdminSvc<S>
201-
where
202-
S: tracing::Subscriber,
203-
{
204-
type Response = AdminSvc<S>;
200+
impl<'a> Service<&'a AddrStream> for AdminSvc {
201+
type Response = AdminSvc;
205202
type Error = hyper::Error;
206203
type Future = Ready<Result<Self::Response, Self::Error>>;
207204

@@ -214,10 +211,7 @@ where
214211
}
215212
}
216213

217-
impl<S> Service<Request<Body>> for AdminSvc<S>
218-
where
219-
S: tracing::Subscriber + 'static,
220-
{
214+
impl Service<Request<Body>> for AdminSvc {
221215
type Response = Response<Body>;
222216
type Error = Err;
223217
type Future = Pin<Box<dyn Future<Output = Result<Response<Body>, Err>> + std::marker::Send>>;
@@ -252,10 +246,7 @@ where
252246
}
253247
}
254248

255-
impl<S> AdminSvc<S>
256-
where
257-
S: tracing::Subscriber + 'static,
258-
{
249+
impl AdminSvc {
259250
fn set_from(&self, bytes: Bytes) -> Result<(), String> {
260251
use std::str;
261252
let body = str::from_utf8(&bytes.as_ref()).map_err(|e| format!("{}", e))?;

‎tracing-appender/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tracing-appender"
3-
version = "0.1.1"
3+
version = "0.2.0"
44
authors = [
55
"Zeki Sherif <[email protected]>",
66
"Tokio Contributors <[email protected]>"
@@ -20,15 +20,15 @@ keywords = ["logging", "tracing", "file-appender", "non-blocking-writer"]
2020
edition = "2018"
2121

2222
[dependencies]
23-
crossbeam-channel = "0.4.2"
23+
crossbeam-channel = "0.5.0"
2424
chrono = "0.4.11"
2525

2626
[dependencies.tracing-subscriber]
2727
path = "../tracing-subscriber"
28-
version = "0.2.7"
28+
version = "0.3"
2929
default-features = false
3030
features = ["fmt"]
3131

3232
[dev-dependencies]
33-
tracing = { path = "../tracing", version = "0.1" }
33+
tracing = { path = "../tracing", version = "0.2" }
3434
tempdir = "0.3"

‎tracing-appender/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ allows events and spans to be recorded in a non-blocking manner through a
3636
dedicated logging thread. It also provides a [`RollingFileAppender`][file_appender]
3737
that can be used with _or_ without the non-blocking writer.
3838

39-
*Compiler support: [requires `rustc` 1.40+][msrv]*
39+
*Compiler support: [requires `rustc` 1.42+][msrv]*
4040

4141
[msrv]: #supported-rust-versions
4242

@@ -146,7 +146,7 @@ fn main() {
146146
## Supported Rust Versions
147147

148148
Tracing is built against the latest stable release. The minimum supported
149-
version is 1.40. The current Tracing version is not guaranteed to build on Rust
149+
version is 1.42. The current Tracing version is not guaranteed to build on Rust
150150
versions earlier than the minimum supported version.
151151

152152
Tracing follows the same compiler support policies as the rest of the Tokio

‎tracing-appender/src/lib.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//! a dedicated logging thread. It also provides a [`RollingFileAppender`][file_appender] that can
88
//! be used with _or_ without the non-blocking writer.
99
//!
10-
//! *Compiler support: [requires `rustc` 1.40+][msrv]*
10+
//! *Compiler support: [requires `rustc` 1.42+][msrv]*
1111
//!
1212
//! [msrv]: #supported-rust-versions
1313
//! [file_appender]: ./rolling/struct.RollingFileAppender.html
@@ -111,7 +111,7 @@
111111
//! ## Supported Rust Versions
112112
//!
113113
//! Tracing is built against the latest stable release. The minimum supported
114-
//! version is 1.40. The current Tracing version is not guaranteed to build on
114+
//! version is 1.42. The current Tracing version is not guaranteed to build on
115115
//! Rust versions earlier than the minimum supported version.
116116
//!
117117
//! Tracing follows the same compiler support policies as the rest of the Tokio
@@ -125,6 +125,7 @@
125125
#![doc(html_root_url = "https://docs.rs/tracing-appender/0.1.1")]
126126
#![doc(
127127
html_logo_url = "https://raw.githubusercontent.com/tokio-rs/tracing/master/assets/logo-type.png",
128+
html_favicon_url = "https://raw.githubusercontent.com/tokio-rs/tracing/master/assets/favicon.ico",
128129
issue_tracker_base_url = "https://github.com/tokio-rs/tracing/issues/"
129130
)]
130131
#![cfg_attr(docsrs, deny(broken_intra_doc_links))]

0 commit comments

Comments
 (0)