From d50c6bd09b325a1a1732a1cc8274a7087cfece35 Mon Sep 17 00:00:00 2001 From: Brad Heller Date: Thu, 5 Jun 2025 18:26:49 -0700 Subject: [PATCH 1/2] chore: Fix bugs in info, debug, and error --- crates/tower-telemetry/src/context.rs | 4 ++-- crates/tower-telemetry/src/logging.rs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/tower-telemetry/src/context.rs b/crates/tower-telemetry/src/context.rs index 053ca98b..c1ac26ce 100644 --- a/crates/tower-telemetry/src/context.rs +++ b/crates/tower-telemetry/src/context.rs @@ -5,9 +5,9 @@ pub struct Context { } impl Context { - pub fn from_runid(runid: String) -> Self { + pub fn from_runid(runid: &str) -> Self { Self { - runid: Some(runid), + runid: Some(runid.to_string()), } } diff --git a/crates/tower-telemetry/src/logging.rs b/crates/tower-telemetry/src/logging.rs index 4b6247cb..b8ebc8cf 100644 --- a/crates/tower-telemetry/src/logging.rs +++ b/crates/tower-telemetry/src/logging.rs @@ -42,12 +42,12 @@ macro_rules! debug { macro_rules! info { // With context, format string and arguments (ctx: $ctx:expr, $fmt:expr, $($arg:tt)*) => { - $crate::event_with_level!($crate::tracing::Level::INFO, $ctx, $fmt, $($arg)*) + $crate::event_with_level!($crate::tracing::Level::INFO, ctx: $ctx, $fmt, $($arg)*) }; // With context, just message (ctx: $ctx:expr, $msg:expr) => { - $crate::event_with_level!($crate::tracing::Level::INFO, $ctx, "{}", $msg) + $crate::event_with_level!($crate::tracing::Level::INFO, ctx: $ctx, "{}", $msg) }; // Without context, format string and arguments @@ -65,12 +65,12 @@ macro_rules! info { macro_rules! warn { // With context, format string and arguments (ctx: $ctx:expr, $fmt:expr, $($arg:tt)*) => { - $crate::event_with_level!($crate::tracing::Level::WARN, $ctx, $fmt, $($arg)*) + $crate::event_with_level!($crate::tracing::Level::WARN, ctx: $ctx, $fmt, $($arg)*) }; // With context, just message (ctx: $ctx:expr, $msg:expr) => { - $crate::event_with_level!($crate::tracing::Level::WARN, $ctx, "{}", $msg) + $crate::event_with_level!($crate::tracing::Level::WARN, ctx: $ctx, "{}", $msg) }; // Without context, format string and arguments @@ -88,12 +88,12 @@ macro_rules! warn { macro_rules! error { // With context, format string and arguments (ctx: $ctx:expr, $fmt:expr, $($arg:tt)*) => { - $crate::event_with_level!($crate::tracing::Level::ERROR, $ctx, $fmt, $($arg)*) + $crate::event_with_level!($crate::tracing::Level::ERROR, ctx: $ctx, $fmt, $($arg)*) }; // With context, just message (ctx: $ctx:expr, $msg:expr) => { - $crate::event_with_level!($crate::tracing::Level::ERROR, $ctx, "{}", $msg) + $crate::event_with_level!($crate::tracing::Level::ERROR, ctx: $ctx, "{}", $msg) }; // Without context, format string and arguments From 4c5ec221e01d38435ca25f7e193654aaed0d6cb9 Mon Sep 17 00:00:00 2001 From: Brad Heller Date: Fri, 6 Jun 2025 16:54:37 +0100 Subject: [PATCH 2/2] chore: Bump version to v0.3.17 --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 3 ++- pyproject.toml | 3 ++- uv.lock | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c813fcd7..c1148b3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -371,7 +371,7 @@ dependencies = [ [[package]] name = "config" -version = "0.3.16" +version = "0.3.17" dependencies = [ "chrono", "clap", @@ -468,7 +468,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crypto" -version = "0.3.16" +version = "0.3.17" dependencies = [ "aes-gcm", "base64", @@ -2567,7 +2567,7 @@ dependencies = [ [[package]] name = "testutils" -version = "0.3.16" +version = "0.3.17" dependencies = [ "pem", "rsa", @@ -2779,7 +2779,7 @@ dependencies = [ [[package]] name = "tower" -version = "0.3.16" +version = "0.3.17" dependencies = [ "tokio", "tower-api", @@ -2803,7 +2803,7 @@ dependencies = [ [[package]] name = "tower-api" -version = "0.3.16" +version = "0.3.17" dependencies = [ "reqwest", "serde", @@ -2815,7 +2815,7 @@ dependencies = [ [[package]] name = "tower-cmd" -version = "0.3.16" +version = "0.3.17" dependencies = [ "anyhow", "bytes", @@ -2854,7 +2854,7 @@ checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-package" -version = "0.3.16" +version = "0.3.17" dependencies = [ "async-compression", "config", @@ -2872,7 +2872,7 @@ dependencies = [ [[package]] name = "tower-runtime" -version = "0.3.16" +version = "0.3.17" dependencies = [ "chrono", "snafu", @@ -2889,7 +2889,7 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tower-telemetry" -version = "0.3.16" +version = "0.3.17" dependencies = [ "tracing", "tracing-appender", @@ -2898,7 +2898,7 @@ dependencies = [ [[package]] name = "tower-version" -version = "0.3.16" +version = "0.3.17" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 768f4d8f..8c332e89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,8 @@ resolver = "2" [workspace.package] edition = "2021" -version = "0.3.16" +version = "0.3.17" + description = "Tower is the best way to host Python data apps in production" rust-version = "1.77" authors = ["Brad Heller "] diff --git a/pyproject.toml b/pyproject.toml index 4f3c0f9a..465a58af 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,8 @@ build-backend = "maturin" [project] name = "tower" -version = "0.3.16" +version = "0.3.17" + description = "Tower CLI and runtime environment for Tower." authors = [{ name = "Tower Computing Inc.", email = "brad@tower.dev" }] readme = "README.md" diff --git a/uv.lock b/uv.lock index b79e08fe..d2f7ec87 100644 --- a/uv.lock +++ b/uv.lock @@ -1201,7 +1201,7 @@ wheels = [ [[package]] name = "tower" -version = "0.3.16" +version = "0.3.17" source = { editable = "." } dependencies = [ { name = "attrs" },