From 8f2806e4b5fffe439b6d86243e562bb468059268 Mon Sep 17 00:00:00 2001 From: haphungw Date: Tue, 16 Jun 2026 22:48:10 +0000 Subject: [PATCH 1/2] feat(sidekick/rust): remove unstable tracing gate from templates --- .../templates/crate/src/builder.rs.mustache | 30 ------------------- .../rust/templates/crate/src/stub.rs.mustache | 1 - .../crate/src/stub/dynamic.rs.mustache | 2 -- .../templates/crate/src/tracing.rs.mustache | 5 ---- 4 files changed, 38 deletions(-) diff --git a/internal/sidekick/rust/templates/crate/src/builder.rs.mustache b/internal/sidekick/rust/templates/crate/src/builder.rs.mustache index c27afc2f0dc..45e4fcf126e 100644 --- a/internal/sidekick/rust/templates/crate/src/builder.rs.mustache +++ b/internal/sidekick/rust/templates/crate/src/builder.rs.mustache @@ -213,9 +213,7 @@ pub mod {{Codec.ModuleName}} { `poller_options` must be extracted here before `self` is moved into the `start` closure. }} - #[cfg(google_cloud_unstable_tracing)] let mut poller_options = self.0.stub.get_poller_options(&self.0.options); - #[cfg(google_cloud_unstable_tracing)] if let Some(ref mut details) = poller_options.tracing { details.method_name = "{{Model.Codec.PackageNamespace}}::client::{{Codec.ServiceNameToPascal}}::{{Codec.MethodName}}::until_done"; } @@ -250,7 +248,6 @@ pub mod {{Codec.ModuleName}} { }; {{#Model.Codec.LroStubOptions}} - #[cfg(google_cloud_unstable_tracing)] { use google_cloud_lro::internal::PollerExt; google_cloud_lro::internal::new_discovery_poller( @@ -261,14 +258,6 @@ pub mod {{Codec.ModuleName}} { ) .with_options(poller_options) } - - #[cfg(not(google_cloud_unstable_tracing))] - google_cloud_lro::internal::new_discovery_poller( - polling_error_policy, - polling_backoff_policy, - start, - query, - ) {{/Model.Codec.LroStubOptions}} {{^Model.Codec.LroStubOptions}} google_cloud_lro::internal::new_discovery_poller( @@ -307,9 +296,7 @@ pub mod {{Codec.ModuleName}} { `poller_options` must be extracted here before `self` is moved into the `start` closure. }} - #[cfg(google_cloud_unstable_tracing)] let mut poller_options = self.0.stub.get_poller_options(&self.0.options); - #[cfg(google_cloud_unstable_tracing)] if let Some(ref mut details) = poller_options.tracing { details.method_name = "{{Model.Codec.PackageNamespace}}::client::{{Method.Codec.ServiceNameToPascal}}::{{Method.Codec.Name}}::until_done"; } @@ -337,7 +324,6 @@ pub mod {{Codec.ModuleName}} { }; {{#Model.Codec.LroStubOptions}} - #[cfg(google_cloud_unstable_tracing)] { use google_cloud_lro::internal::PollerExt; { @@ -356,22 +342,6 @@ pub mod {{Codec.ModuleName}} { } .with_options(poller_options) } - - #[cfg(not(google_cloud_unstable_tracing))] - { - {{#Codec.NoneAreEmpty}} - google_cloud_lro::internal::new_poller(polling_error_policy, polling_backoff_policy, start, query) - {{/Codec.NoneAreEmpty}} - {{#Codec.OnlyResponseIsEmpty}} - google_cloud_lro::internal::new_unit_response_poller(polling_error_policy, polling_backoff_policy, start, query) - {{/Codec.OnlyResponseIsEmpty}} - {{#Codec.OnlyMetadataIsEmpty}} - google_cloud_lro::internal::new_unit_metadata_poller(polling_error_policy, polling_backoff_policy, start, query) - {{/Codec.OnlyMetadataIsEmpty}} - {{#Codec.BothAreEmpty}} - google_cloud_lro::internal::new_unit_poller(polling_error_policy, polling_backoff_policy, start, query) - {{/Codec.BothAreEmpty}} - } {{/Model.Codec.LroStubOptions}} {{^Model.Codec.LroStubOptions}} {{#Codec.NoneAreEmpty}} diff --git a/internal/sidekick/rust/templates/crate/src/stub.rs.mustache b/internal/sidekick/rust/templates/crate/src/stub.rs.mustache index 99d16c7d83d..1a396ff9d0e 100644 --- a/internal/sidekick/rust/templates/crate/src/stub.rs.mustache +++ b/internal/sidekick/rust/templates/crate/src/stub.rs.mustache @@ -86,7 +86,6 @@ pub trait {{Codec.Name}}: std::fmt::Debug + Send + Sync { } {{#Model.Codec.LroStubOptions}} - #[cfg(google_cloud_unstable_tracing)] #[doc(hidden)] /// Returns the poller options. /// diff --git a/internal/sidekick/rust/templates/crate/src/stub/dynamic.rs.mustache b/internal/sidekick/rust/templates/crate/src/stub/dynamic.rs.mustache index ed9e2172eaa..8292601cace 100644 --- a/internal/sidekick/rust/templates/crate/src/stub/dynamic.rs.mustache +++ b/internal/sidekick/rust/templates/crate/src/stub/dynamic.rs.mustache @@ -45,7 +45,6 @@ pub trait {{Codec.Name}}: std::fmt::Debug + Send + Sync { ) -> std::sync::Arc; {{#Model.Codec.LroStubOptions}} - #[cfg(google_cloud_unstable_tracing)] fn get_poller_options( &self, options: &crate::RequestOptions, @@ -87,7 +86,6 @@ impl {{Codec.Name}} for T { } {{#Model.Codec.LroStubOptions}} - #[cfg(google_cloud_unstable_tracing)] fn get_poller_options( &self, options: &crate::RequestOptions, diff --git a/internal/sidekick/rust/templates/crate/src/tracing.rs.mustache b/internal/sidekick/rust/templates/crate/src/tracing.rs.mustache index ffb4b04f508..26e1857090c 100644 --- a/internal/sidekick/rust/templates/crate/src/tracing.rs.mustache +++ b/internal/sidekick/rust/templates/crate/src/tracing.rs.mustache @@ -81,12 +81,8 @@ where T: super::stub::{{Codec.Name}} + std::fmt::Debug + Send + Sync { method: "client::{{Codec.ServiceNameToPascal}}::{{Codec.Name}}", self.inner.{{Codec.Name}}(req, options)); {{#Codec.IsLroPoller}} - #[cfg(google_cloud_unstable_tracing)] google_cloud_lro::record_polling_attributes!(&_span); - {{/Codec.IsLroPoller}} - {{#Codec.IsLroPoller}} let result = pending.await; - #[cfg(google_cloud_unstable_tracing)] { if google_cloud_lro::LroRecorder::current().is_some() { match &result { @@ -147,7 +143,6 @@ where T: super::stub::{{Codec.Name}} + std::fmt::Debug + Send + Sync { } {{#Model.Codec.LroStubOptions}} - #[cfg(google_cloud_unstable_tracing)] #[doc(hidden)] fn get_poller_options( &self, From a7b534b885a855b90a47149db71cf929a2e95f46 Mon Sep 17 00:00:00 2001 From: haphungw Date: Thu, 9 Jul 2026 20:07:40 +0000 Subject: [PATCH 2/2] remove outer braces in generated builder poller options --- .../templates/crate/src/builder.rs.mustache | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/internal/sidekick/rust/templates/crate/src/builder.rs.mustache b/internal/sidekick/rust/templates/crate/src/builder.rs.mustache index 45e4fcf126e..fe53f89ae73 100644 --- a/internal/sidekick/rust/templates/crate/src/builder.rs.mustache +++ b/internal/sidekick/rust/templates/crate/src/builder.rs.mustache @@ -248,16 +248,14 @@ pub mod {{Codec.ModuleName}} { }; {{#Model.Codec.LroStubOptions}} - { - use google_cloud_lro::internal::PollerExt; - google_cloud_lro::internal::new_discovery_poller( - polling_error_policy, - polling_backoff_policy, - start, - query, - ) - .with_options(poller_options) - } + use google_cloud_lro::internal::PollerExt; + google_cloud_lro::internal::new_discovery_poller( + polling_error_policy, + polling_backoff_policy, + start, + query, + ) + .with_options(poller_options) {{/Model.Codec.LroStubOptions}} {{^Model.Codec.LroStubOptions}} google_cloud_lro::internal::new_discovery_poller( @@ -324,24 +322,22 @@ pub mod {{Codec.ModuleName}} { }; {{#Model.Codec.LroStubOptions}} + use google_cloud_lro::internal::PollerExt; { - use google_cloud_lro::internal::PollerExt; - { - {{#Codec.NoneAreEmpty}} - google_cloud_lro::internal::new_poller(polling_error_policy, polling_backoff_policy, start, query) - {{/Codec.NoneAreEmpty}} - {{#Codec.OnlyResponseIsEmpty}} - google_cloud_lro::internal::new_unit_response_poller(polling_error_policy, polling_backoff_policy, start, query) - {{/Codec.OnlyResponseIsEmpty}} - {{#Codec.OnlyMetadataIsEmpty}} - google_cloud_lro::internal::new_unit_metadata_poller(polling_error_policy, polling_backoff_policy, start, query) - {{/Codec.OnlyMetadataIsEmpty}} - {{#Codec.BothAreEmpty}} - google_cloud_lro::internal::new_unit_poller(polling_error_policy, polling_backoff_policy, start, query) - {{/Codec.BothAreEmpty}} - } - .with_options(poller_options) + {{#Codec.NoneAreEmpty}} + google_cloud_lro::internal::new_poller(polling_error_policy, polling_backoff_policy, start, query) + {{/Codec.NoneAreEmpty}} + {{#Codec.OnlyResponseIsEmpty}} + google_cloud_lro::internal::new_unit_response_poller(polling_error_policy, polling_backoff_policy, start, query) + {{/Codec.OnlyResponseIsEmpty}} + {{#Codec.OnlyMetadataIsEmpty}} + google_cloud_lro::internal::new_unit_metadata_poller(polling_error_policy, polling_backoff_policy, start, query) + {{/Codec.OnlyMetadataIsEmpty}} + {{#Codec.BothAreEmpty}} + google_cloud_lro::internal::new_unit_poller(polling_error_policy, polling_backoff_policy, start, query) + {{/Codec.BothAreEmpty}} } + .with_options(poller_options) {{/Model.Codec.LroStubOptions}} {{^Model.Codec.LroStubOptions}} {{#Codec.NoneAreEmpty}}