feat(generator): include request in async streaming RPC logs (#14565)

googleapis · Jul 25, 2024 · ad1d045 · ad1d045
1 parent e559c9a
commit ad1d045
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc
@@ -244,7 +244,9 @@ GoldenKitchenSinkLogging::AsyncStreamingRead(
      ::google::cloud::internal::AsyncStreamingReadRpcLogging<google::test::admin::database::v1::Response>;
 
   auto request_id = google::cloud::internal::RequestIdForLogging();
-  GCP_LOG(DEBUG) << __func__ << "(" << request_id << ")";
+  google::cloud::internal::LogRequest(
+      __func__, request_id,
+      google::cloud::internal::DebugString(request, tracing_options_));
   auto stream = child_->AsyncStreamingRead(
       cq, std::move(context), std::move(options), request);
   if (stream_logging_) {

diff --git a/generator/integration_tests/tests/golden_kitchen_sink_logging_decorator_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_logging_decorator_test.cc
@@ -297,7 +297,10 @@ TEST_F(LoggingDecoratorTest, AsyncStreamingRead) {
   EXPECT_THAT(finish, StatusIs(StatusCode::kAborted));
 
   auto const log_lines = log_.ExtractLines();
-  EXPECT_THAT(log_lines, Contains(StartsWith("AsyncStreamingRead(")));
+  EXPECT_THAT(
+      log_lines,
+      Contains(AllOf(StartsWith("AsyncStreamingRead("),
+                     HasSubstr("google.test.admin.database.v1.Request"))));
   EXPECT_THAT(log_lines, Contains(StartsWith("Start(")));
   EXPECT_THAT(log_lines, Contains(StartsWith("Finish(")));
 }

diff --git a/generator/internal/logging_decorator_generator.cc b/generator/internal/logging_decorator_generator.cc
@@ -306,7 +306,9 @@ std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
      ::google::cloud::internal::AsyncStreamingReadRpcLogging<$response_type$>;
 
   auto request_id = google::cloud::internal::RequestIdForLogging();
-  GCP_LOG(DEBUG) << __func__ << "(" << request_id << ")";
+  google::cloud::internal::LogRequest(
+      __func__, request_id,
+      google::cloud::internal::DebugString(request, tracing_options_));
   auto stream = child_->Async$method_name$(
       cq, std::move(context), std::move(options), request);
   if (stream_logging_) {

diff --git a/google/cloud/bigtable/internal/bigtable_logging_decorator.cc b/google/cloud/bigtable/internal/bigtable_logging_decorator.cc
@@ -194,7 +194,9 @@ BigtableLogging::AsyncReadRows(
       google::bigtable::v2::ReadRowsResponse>;
 
   auto request_id = google::cloud::internal::RequestIdForLogging();
-  GCP_LOG(DEBUG) << __func__ << "(" << request_id << ")";
+  google::cloud::internal::LogRequest(
+      __func__, request_id,
+      google::cloud::internal::DebugString(request, tracing_options_));
   auto stream = child_->AsyncReadRows(cq, std::move(context),
                                       std::move(options), request);
   if (stream_logging_) {
@@ -215,7 +217,9 @@ BigtableLogging::AsyncSampleRowKeys(
       google::bigtable::v2::SampleRowKeysResponse>;
 
   auto request_id = google::cloud::internal::RequestIdForLogging();
-  GCP_LOG(DEBUG) << __func__ << "(" << request_id << ")";
+  google::cloud::internal::LogRequest(
+      __func__, request_id,
+      google::cloud::internal::DebugString(request, tracing_options_));
   auto stream = child_->AsyncSampleRowKeys(cq, std::move(context),
                                            std::move(options), request);
   if (stream_logging_) {
@@ -254,7 +258,9 @@ BigtableLogging::AsyncMutateRows(
       google::bigtable::v2::MutateRowsResponse>;
 
   auto request_id = google::cloud::internal::RequestIdForLogging();
-  GCP_LOG(DEBUG) << __func__ << "(" << request_id << ")";
+  google::cloud::internal::LogRequest(
+      __func__, request_id,
+      google::cloud::internal::DebugString(request, tracing_options_));
   auto stream = child_->AsyncMutateRows(cq, std::move(context),
                                         std::move(options), request);
   if (stream_logging_) {

diff --git a/google/cloud/storage/internal/storage_logging_decorator.cc b/google/cloud/storage/internal/storage_logging_decorator.cc
@@ -485,7 +485,9 @@ StorageLogging::AsyncReadObject(
       google::storage::v2::ReadObjectResponse>;
 
   auto request_id = google::cloud::internal::RequestIdForLogging();
-  GCP_LOG(DEBUG) << __func__ << "(" << request_id << ")";
+  google::cloud::internal::LogRequest(
+      __func__, request_id,
+      google::cloud::internal::DebugString(request, tracing_options_));
   auto stream = child_->AsyncReadObject(cq, std::move(context),
                                         std::move(options), request);
   if (stream_logging_) {