itsscb/tracing
1
0
Fork 0
mirror of https://github.com/tokio-rs/tracing.git synced 2025-10-02 23:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples: update Tokio to 1.0 (#1213)

Browse Source 
Not sure that there's a issue tracking this, but anyways. Here's an
update to Tokio 1.0!

This closes the various Dependabot dependency update PRs that we can't
just merge due to breaking changes.

Closes #1149
Closes #1164
Closes #1177

Co-authored-by: Eliza Weisman <eliza@buoyant.io>
This commit is contained in:
David Barsky 2021-01-30 16:43:07 -05:00 committed by Eliza Weisman
parent 28754222f5
commit a766b70473
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/Cargo.toml
View File

@ -28,19 +28,17 @@ tracing-appender = { path = "../tracing-appender", version = "0.1.2" }
serde_json = "1.0" serde_json = "1.0"
futures = "0.3" futures = "0.3"
tokio = { version = "0.2.13", features = ["full"] } tokio = { version = "1.1", features = ["full"] }
# env-logger example # env-logger example
env_logger = "0.7" env_logger = "0.7"
# tower examples # tower examples
tower = "0.3" tower = { version = "0.4.4", features = ["full"] }
tower-util = "0.3.1"
tower-make = "0.3"
http = "0.2" http = "0.2"
hyper = "0.13.2" hyper = { version = "0.14", features = ["full"] }
rand = "0.7" rand = "0.7"
bytes = "0.5" bytes = "1"
clap = "2.33" clap = "2.33"
# sloggish example # sloggish example

2
examples/examples/echo.rs
View File

@ -52,7 +52,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
// Next up we create a TCP listener which will listen for incoming // Next up we create a TCP listener which will listen for incoming
// connections. This TCP listener is bound to the address we determined // connections. This TCP listener is bound to the address we determined
// above and must be associated with an event loop. // above and must be associated with an event loop.
let mut listener = TcpListener::bind(&addr).await?; let listener = TcpListener::bind(&addr).await?;
// Use `fmt::Debug` impl for `addr` using the `%` symbol // Use `fmt::Debug` impl for `addr` using the `%` symbol
info!(message = "Listening on", %addr); info!(message = "Listening on", %addr);

2
examples/examples/futures-proxy-server.rs
View File

@ -116,7 +116,7 @@ async fn main() -> Result<(), Error> {
let server_addr = matches.value_of("server_addr").unwrap_or("127.0.0.1:3000"); let server_addr = matches.value_of("server_addr").unwrap_or("127.0.0.1:3000");
let server_addr = server_addr.parse::<SocketAddr>()?; let server_addr = server_addr.parse::<SocketAddr>()?;
let mut listener = TcpListener::bind(&listen_addr).await?; let listener = TcpListener::bind(&listen_addr).await?;
info!("Listening on: {}", listen_addr); info!("Listening on: {}", listen_addr);
info!("Proxying to: {}", server_addr); info!("Proxying to: {}", server_addr);

11
examples/examples/tower-load.rs
View File

@ -26,7 +26,6 @@
use bytes::Bytes; use bytes::Bytes;
use futures::{ use futures::{
future::{self, Ready}, future::{self, Ready},
stream::StreamExt,
Future, Future,
}; };
use http::{header, Method, Request, Response, StatusCode}; use http::{header, Method, Request, Response, StatusCode};
@ -317,14 +316,16 @@ async fn load_gen(addr: SocketAddr) -> Result<(), Err> {
.layer(request_span::layer(req_span)) .layer(request_span::layer(req_span))
.timeout(Duration::from_millis(200)) .timeout(Duration::from_millis(200))
.service(Client::new()); .service(Client::new());
let mut interval = time::interval(Duration::from_millis(50)); let mut interval = tokio::time::interval(Duration::from_millis(50));
while interval.next().await.is_some() {
loop {
interval.tick().await;
let authority = format!("{}", addr); let authority = format!("{}", addr);
let mut svc = svc.clone().ready_oneshot().await?; let mut svc = svc.clone().ready_oneshot().await?;
let f = async move { let f = async move {
let sleep = rand::thread_rng().gen_range(0, 25); let sleep = rand::thread_rng().gen_range(0, 25);
time::delay_for(Duration::from_millis(sleep)).await; time::sleep(Duration::from_millis(sleep)).await;
let (len, uri) = gen_uri(&authority); let (len, uri) = gen_uri(&authority);
let req = Request::get(&uri[..]) let req = Request::get(&uri[..])
@ -370,8 +371,6 @@ async fn load_gen(addr: SocketAddr) -> Result<(), Err> {
.instrument(span!(target: "gen", Level::INFO, "generated_request", remote.addr=%addr)); .instrument(span!(target: "gen", Level::INFO, "generated_request", remote.addr=%addr));
tokio::spawn(f); tokio::spawn(f);
} }
Ok(())
} }
fn req_span<A>(req: &Request<A>) -> Span { fn req_span<A>(req: &Request<A>) -> Span {