This CL adds log entry protos and logging handlers for Watch, FindMissingBlobs, GetActionResult so that they are logged. unknown commit must be submitted before this for Watch calls to be logged properly.

PiperOrigin-RevId: 192794535

2 files changed, 39 insertions, 0 deletions

diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
index 5db4c8504f..02cc158a95 100644
--- a/src/main/protobuf/BUILD
+++ b/src/main/protobuf/BUILD
@@ -150,6 +150,7 @@ proto_library(
         "@googleapis//:google_devtools_remoteexecution_v1test_remote_execution_proto",
         "@googleapis//:google_longrunning_operations_proto",
         "@googleapis//:google_rpc_status_proto",
+        "@googleapis//:google_watch_v1_proto",
     ],
 )
 
diff --git a/src/main/protobuf/remote_execution_log.proto b/src/main/protobuf/remote_execution_log.proto
index 81c8de9f94..7bf9814c47 100644
--- a/src/main/protobuf/remote_execution_log.proto
+++ b/src/main/protobuf/remote_execution_log.proto
@@ -19,6 +19,7 @@ package remote_logging;
 import "google/devtools/remoteexecution/v1test/remote_execution.proto";
 import "google/longrunning/operations.proto";
 import "google/rpc/status.proto";
+import "google/watcher/v1/watch.proto";
 
 option java_package = "com.google.devtools.build.lib.remote.logging";
 
@@ -45,13 +46,50 @@ message ExecuteDetails {
   // The google.devtools.remoteexecution.v1test.ExecuteRequest sent by the
   // call.
   google.devtools.remoteexecution.v1test.ExecuteRequest request = 1;
+
   // The google.longrunning.Operation received by the Execute call.
   google.longrunning.Operation response = 2;
 }
 
+// Details for a call to
+// google.devtools.remoteexecution.v1test.ActionCache.GetActionResult.
+message GetActionResultDetails {
+  // The google.devtools.remoteexecution.v1test.GetActionResultRequest sent by
+  // the call.
+  google.devtools.remoteexecution.v1test.GetActionResultRequest request = 1;
+
+  // The received google.devtools.remoteexecution.v1test.ActionResult.
+  google.devtools.remoteexecution.v1test.ActionResult response = 2;
+}
+
+// Details for a call to google.watcher.v1.Watch.
+message WatchDetails {
+  // The google.watcher.v1.Request sent by the Watch call.
+  google.watcher.v1.Request request = 1;
+
+  // Each google.watcher.v1.ChangeBatch response received from the
+  // Watch call in order.
+  repeated google.watcher.v1.ChangeBatch responses = 2;
+}
+
+// Details for a call to
+// google.devtools.remoteexecution.v1test.ContentAddressableStorage.FindMissingBlobs.
+message FindMissingBlobsDetails {
+  // The google.devtools.remoteexecution.v1test.FindMissingBlobsRequest request
+  // sent.
+  google.devtools.remoteexecution.v1test.FindMissingBlobsRequest request = 1;
+
+  // The google.devtools.remoteexecution.v1test.FindMissingBlobsResponse
+  // received.
+  google.devtools.remoteexecution.v1test.FindMissingBlobsResponse response = 2;
+}
+
 // Contains details for specific types of calls.
 message RpcCallDetails {
   oneof details {
     ExecuteDetails execute = 1;
+    GetActionResultDetails get_action_result = 2;
+    WatchDetails watch = 3;
+    FindMissingBlobsDetails find_missing_blobs = 4;
   }
 }