diff --git a/Cargo.lock b/Cargo.lock index 3d73d18..4a6e94b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1172,6 +1172,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "thiserror", "thrift", + "tokio", ] [[package]] @@ -1217,6 +1218,8 @@ dependencies = [ "percent-encoding", "rand", "thiserror", + "tokio", + "tokio-stream", ] [[package]] @@ -1813,6 +1816,17 @@ dependencies = [ "webpki", ] +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.8" diff --git a/Cargo.toml b/Cargo.toml index 269b9fa..2555a6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,8 @@ tracing-subscriber = { version = "0.3.17", features = [ tracing-opentelemetry = { version = "0.18.0" } opentelemetry = { version = "0.18.0", default-features = false, features = [ "trace", + "rt-tokio", ] } -opentelemetry-jaeger = "0.17.0" +opentelemetry-jaeger = { version = "0.17.0", features = ["rt-tokio"] } thiserror = "1.0.40" diff --git a/crates/dagger-sdk/src/client.rs b/crates/dagger-sdk/src/client.rs index 27a272a..75657d4 100644 --- a/crates/dagger-sdk/src/client.rs +++ b/crates/dagger-sdk/src/client.rs @@ -7,14 +7,20 @@ use dagger_core::engine::Engine as DaggerEngine; use crate::errors::ConnectError; use crate::gen::Query; -use crate::logging::StdLogger; +use crate::logging::{StdLogger, TracingLogger}; use crate::querybuilder::query; pub type DaggerConn = Arc; pub async fn connect() -> Result { let cfg = if cfg!(feature = "otel") { - let cfg = Config::new(None, None, None, None, Some(Arc::new(StdLogger::default()))); + let cfg = Config::new( + None, + None, + None, + None, + Some(Arc::new(TracingLogger::default())), + ); #[cfg(feature = "otel")] crate::logging::otel_logging().map_err(ConnectError::FailedToInstallOtelTracer)?; diff --git a/crates/dagger-sdk/src/logging.rs b/crates/dagger-sdk/src/logging.rs index 3ad94e5..44ced67 100644 --- a/crates/dagger-sdk/src/logging.rs +++ b/crates/dagger-sdk/src/logging.rs @@ -61,13 +61,13 @@ impl Default for TracingLogger { impl Logger for TracingLogger { fn stdout(&self, output: &str) -> eyre::Result<()> { - tracing::info!(output = output, "dagger-sdk"); + tracing::info!(output = output, "dagger_sdk"); Ok(()) } fn stderr(&self, output: &str) -> eyre::Result<()> { - tracing::warn!(output = output, "dagger-sdk"); + tracing::warn!(output = output, "dagger_sdk"); Ok(()) }