From 07d07d7ba36178e63011b30ba82556206418da78 Mon Sep 17 00:00:00 2001 From: Tim Kuehn Date: Thu, 1 Apr 2021 19:37:02 -0700 Subject: [PATCH] Remove tracing_appender as it does not support build target mipsel-unknown-linux-gnu --- example-service/Cargo.toml | 1 - example-service/src/client.rs | 2 +- example-service/src/lib.rs | 13 +++---------- example-service/src/server.rs | 2 +- tarpc/Cargo.toml | 1 - tarpc/examples/pubsub.rs | 10 ++++------ tarpc/examples/tracing.rs | 10 ++++------ 7 files changed, 13 insertions(+), 26 deletions(-) diff --git a/example-service/Cargo.toml b/example-service/Cargo.toml index 0848574..7db8a38 100644 --- a/example-service/Cargo.toml +++ b/example-service/Cargo.toml @@ -25,7 +25,6 @@ tarpc = { path = "../tarpc", features = ["full"] } tokio = { version = "1", features = ["macros", "net", "rt-multi-thread"] } tokio-serde = { version = "0.8", features = ["json"] } tracing = { version = "0.1" } -tracing-appender = "0.1" tracing-opentelemetry = "0.12" tracing-subscriber = "0.2" diff --git a/example-service/src/client.rs b/example-service/src/client.rs index fb10d33..0bffe41 100644 --- a/example-service/src/client.rs +++ b/example-service/src/client.rs @@ -24,7 +24,7 @@ struct Flags { #[tokio::main] async fn main() -> anyhow::Result<()> { let flags = Flags::parse(); - let _uninstall = init_tracing("Tarpc Example Client")?; + init_tracing("Tarpc Example Client")?; let transport = tarpc::serde_transport::tcp::connect(flags.server_addr, Json::default); diff --git a/example-service/src/lib.rs b/example-service/src/lib.rs index e6f4639..bc38fe9 100644 --- a/example-service/src/lib.rs +++ b/example-service/src/lib.rs @@ -16,26 +16,19 @@ pub trait World { } /// Initializes an OpenTelemetry tracing subscriber with a Jaeger backend. -pub fn init_tracing( - service_name: &str, -) -> anyhow::Result { +pub fn init_tracing(service_name: &str) -> anyhow::Result<()> { env::set_var("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "12"); let tracer = opentelemetry_jaeger::new_pipeline() .with_service_name(service_name) .with_max_packet_size(2usize.pow(13)) .install_batch(opentelemetry::runtime::Tokio)?; - let (non_blocking, guard) = tracing_appender::non_blocking(std::io::stdout()); tracing_subscriber::registry() .with(tracing_subscriber::EnvFilter::from_default_env()) - .with( - tracing_subscriber::fmt::layer() - .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE) - .with_writer(non_blocking), - ) + .with(tracing_subscriber::fmt::layer().with_span_events(FmtSpan::NEW | FmtSpan::CLOSE)) .with(tracing_opentelemetry::layer().with_tracer(tracer)) .try_init()?; - Ok(guard) + Ok(()) } diff --git a/example-service/src/server.rs b/example-service/src/server.rs index 9e60b43..13e10f2 100644 --- a/example-service/src/server.rs +++ b/example-service/src/server.rs @@ -47,7 +47,7 @@ impl World for HelloServer { #[tokio::main] async fn main() -> anyhow::Result<()> { let flags = Flags::parse(); - let _uninstall = init_tracing("Tarpc Example Server")?; + init_tracing("Tarpc Example Server")?; let server_addr = (IpAddr::V6(Ipv6Addr::LOCALHOST), flags.port); diff --git a/tarpc/Cargo.toml b/tarpc/Cargo.toml index c9a0ab5..1e16b4e 100644 --- a/tarpc/Cargo.toml +++ b/tarpc/Cargo.toml @@ -54,7 +54,6 @@ opentelemetry = { version = "0.13", default-features = false, features = ["rt-to opentelemetry-jaeger = { version = "0.12", features = ["tokio"] } pin-utils = "0.1.0-alpha" serde_bytes = "0.11" -tracing-appender = "0.1" tracing-subscriber = "0.2" tokio = { version = "1", features = ["full", "test-util"] } tokio-serde = { version = "0.8", features = ["json", "bincode"] } diff --git a/tarpc/examples/pubsub.rs b/tarpc/examples/pubsub.rs index ef5d19e..bac5d99 100644 --- a/tarpc/examples/pubsub.rs +++ b/tarpc/examples/pubsub.rs @@ -282,27 +282,25 @@ impl publisher::Publisher for Publisher { } /// Initializes an OpenTelemetry tracing subscriber with a Jaeger backend. -fn init_tracing(service_name: &str) -> anyhow::Result { +fn init_tracing(service_name: &str) -> anyhow::Result<()> { env::set_var("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "12"); let tracer = opentelemetry_jaeger::new_pipeline() .with_service_name(service_name) .with_max_packet_size(2usize.pow(13)) .install_batch(opentelemetry::runtime::Tokio)?; - let (non_blocking, guard) = tracing_appender::non_blocking(std::io::stdout()); - tracing_subscriber::registry() .with(tracing_subscriber::EnvFilter::from_default_env()) - .with(tracing_subscriber::fmt::layer().with_writer(non_blocking)) + .with(tracing_subscriber::fmt::layer()) .with(tracing_opentelemetry::layer().with_tracer(tracer)) .try_init()?; - Ok(guard) + Ok(()) } #[tokio::main] async fn main() -> anyhow::Result<()> { - let _uninstall = init_tracing("Pub/Sub")?; + init_tracing("Pub/Sub")?; let addrs = Publisher { clients: Arc::new(Mutex::new(HashMap::new())), diff --git a/tarpc/examples/tracing.rs b/tarpc/examples/tracing.rs index 2ed3a12..84e2246 100644 --- a/tarpc/examples/tracing.rs +++ b/tarpc/examples/tracing.rs @@ -55,27 +55,25 @@ impl DoubleService for DoubleServer { } } -fn init_tracing(service_name: &str) -> anyhow::Result { +fn init_tracing(service_name: &str) -> anyhow::Result<()> { env::set_var("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "12"); let tracer = opentelemetry_jaeger::new_pipeline() .with_service_name(service_name) .with_max_packet_size(2usize.pow(13)) .install_batch(opentelemetry::runtime::Tokio)?; - let (non_blocking, guard) = tracing_appender::non_blocking(std::io::stdout()); - tracing_subscriber::registry() .with(tracing_subscriber::EnvFilter::from_default_env()) - .with(tracing_subscriber::fmt::layer().with_writer(non_blocking)) + .with(tracing_subscriber::fmt::layer()) .with(tracing_opentelemetry::layer().with_tracer(tracer)) .try_init()?; - Ok(guard) + Ok(()) } #[tokio::main] async fn main() -> anyhow::Result<()> { - let _uninstall = init_tracing("tarpc_tracing_example")?; + init_tracing("tarpc_tracing_example")?; let add_listener = tarpc::serde_transport::tcp::listen("localhost:0", Json::default) .await?