Skip to content

feat(sidekick/rust): remove google_cloud_unstable_tracing guards #5103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
haphungw wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −13
Draft

feat(sidekick/rust): remove google_cloud_unstable_tracing guards #5103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions internal/sidekick/rust/templates/crate/src/tracing.rs.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ pub struct {{Codec.Name}}<T>
where T: super::stub::{{Codec.Name}} + std::fmt::Debug + Send + Sync {
inner: T,
{{#Codec.DetailedTracingAttributes}}
#[cfg(google_cloud_unstable_tracing)]
{{! Use a fully qualified name to avoid conflicts with any client called `DurationMetric` }}
duration: gaxi::observability::DurationMetric,
{{/Codec.DetailedTracingAttributes}}
Expand All @@ -49,7 +48,6 @@ where T: super::stub::{{Codec.Name}} + std::fmt::Debug + Send + Sync {
Self {
inner,
{{#Codec.DetailedTracingAttributes}}
#[cfg(google_cloud_unstable_tracing)]
duration: gaxi::observability::DurationMetric::new(
&info::INSTRUMENTATION_CLIENT_INFO,
),
Expand Down Expand Up @@ -77,7 +75,6 @@ where T: super::stub::{{Codec.Name}} + std::fmt::Debug + Send + Sync {
options: crate::RequestOptions,
) -> Result<crate::Response<{{Codec.ReturnType}}>> {
{{#Codec.DetailedTracingAttributes}}
#[cfg(google_cloud_unstable_tracing)]
{
let (_span, pending) = gaxi::client_request_signals!(
metric: self.duration.clone(),
Expand All @@ -86,9 +83,10 @@ where T: super::stub::{{Codec.Name}} + std::fmt::Debug + Send + Sync {
self.inner.{{Codec.Name}}(req, options));
pending.await
}
#[cfg(not(google_cloud_unstable_tracing))]
{{/Codec.DetailedTracingAttributes }}
{{/Codec.DetailedTracingAttributes}}
{{^Codec.DetailedTracingAttributes}}
self.inner.{{Codec.Name}}(req, options).await
{{/Codec.DetailedTracingAttributes}}
}
{{/Codec.Methods}}
{{#Codec.HasLROs}}
Expand All @@ -112,7 +110,6 @@ where T: super::stub::{{Codec.Name}} + std::fmt::Debug + Send + Sync {
{{/Codec.Services}}
{{#Codec.HasServices}}
{{#Codec.DetailedTracingAttributes}}
#[cfg(google_cloud_unstable_tracing)]
pub(crate) mod info {
const NAME: &str = env!("CARGO_PKG_NAME");
const VERSION: &str = env!("CARGO_PKG_VERSION");
Expand Down
3 changes: 0 additions & 3 deletions internal/sidekick/rust/templates/crate/src/transport.rs.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@ impl std::fmt::Debug for {{Codec.Name}} {
impl {{Codec.Name}} {
pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
{{#Codec.DetailedTracingAttributes}}
#[cfg(google_cloud_unstable_tracing)]
let tracing_is_enabled = gaxi::options::tracing_enabled(&config);
let inner = gaxi::http::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
#[cfg(google_cloud_unstable_tracing)]
let inner = if tracing_is_enabled {
inner.with_instrumentation(&super::tracing::info::INSTRUMENTATION_CLIENT_INFO)
} else {
Expand Down Expand Up @@ -201,7 +199,6 @@ impl super::stub::{{Codec.Name}} for {{Codec.Name}} {
google_cloud_gax::error::Error::binding(BindingError { paths })
})??;
{{#Codec.DetailedTracingAttributes}}
#[cfg(google_cloud_unstable_tracing)]
if let Some(recorder) = gaxi::observability::RequestRecorder::current() {
recorder.on_client_request(
gaxi::observability::ClientRequestAttributes::default()
Expand Down
4 changes: 0 additions & 4 deletions internal/sidekick/rust/templates/grpc-client/transport.rs.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,11 @@ impl std::fmt::Debug for {{Codec.Name}} {
impl {{Codec.Name}} {
pub async fn new(config: gaxi::options::ClientConfig) -> crate::ClientBuilderResult<Self> {
{{#Codec.DetailedTracingAttributes}}
#[cfg(google_cloud_unstable_tracing)]
let inner = if gaxi::options::tracing_enabled(&config) {
gaxi::grpc::Client::new_with_instrumentation(config, DEFAULT_HOST, &super::tracing::info::INSTRUMENTATION_CLIENT_INFO).await?
} else {
gaxi::grpc::Client::new(config, DEFAULT_HOST).await?
};
#[cfg(not(google_cloud_unstable_tracing))]
let inner = gaxi::grpc::Client::new(config, DEFAULT_HOST).await?;
{{/Codec.DetailedTracingAttributes}}
{{^Codec.DetailedTracingAttributes}}
let inner = gaxi::grpc::Client::new(config, DEFAULT_HOST).await?;
Expand Down Expand Up @@ -164,7 +161,6 @@ impl super::stub::{{Codec.Name}} for {{Codec.Name}} {
type TR = crate::{{OutputType.Codec.PackageModuleName}}::{{OutputType.Codec.Name}};
{{/ReturnsEmpty}}
{{#Codec.DetailedTracingAttributes}}
#[cfg(google_cloud_unstable_tracing)]
if let Some(recorder) = gaxi::observability::RequestRecorder::current() {
let attributes = gaxi::observability::ClientRequestAttributes::default()
.set_rpc_method("{{SourceService.Package}}.{{SourceService.Name}}/{{Name}}");
Expand Down
Loading