log host sharing requirements to buck2 logging

Summary:
I would like to make this information available to buck2_test_actions in
order to record somewhere which tests request specific host resources, so I
need to add it here.

I did this for tests only because I didn't want to make regular actions
more expensive and didn't need it yet.

Reviewed By: IanChilds

Differential Revision: D73581677

fbshipit-source-id: ca533fa299346adeecbe405c35e3a42a1d6facbe

Author: krallin

app/buck2_cli_proto/build.rs

@@ -20,6 +20,7 @@ fn main() -> io::Result<()> {
             ".".to_owned(),
             "../buck2_data".to_owned(),
             "../buck2_subscription_proto".to_owned(),
+            "../buck2_host_sharing_proto".to_owned(),
         ]
     };
 

app/buck2_data/Cargo.toml

@@ -7,6 +7,7 @@ version = "0.1.0"
 
 [dependencies]
 allocative = { workspace = true }
+buck2_host_sharing_proto = { workspace = true }
 derive_more = { workspace = true }
 hex = { workspace = true }
 prost = { workspace = true }

app/buck2_data/build.rs

@@ -16,7 +16,7 @@ fn main() -> io::Result<()> {
     let includes = if let Ok(path) = env::var("BUCK_PROTO_SRCS") {
         vec![path]
     } else {
-        vec![".".to_owned()]
+        vec![".".to_owned(), "../buck2_host_sharing_proto".to_owned()]
     };
 
     buck2_protoc_dev::configure()
@@ -266,5 +266,6 @@ fn main() -> io::Result<()> {
         .boxed("SpanEndEvent.data.action_execution")
         .boxed("SpanEndEvent.data.cache_upload")
         .boxed("InstantEvent.data.snapshot")
+        .extern_path(".buck.host_sharing", "::buck2_host_sharing_proto")
         .compile(proto_files, &includes)
 }

app/buck2_data/data.proto

@@ -13,6 +13,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
 import "error.proto";
+import "host_sharing.proto";
 
 package buck.data;
 
@@ -1800,6 +1801,8 @@ message TestDiscoveryEnd {
   string suite_name = 1;
   CommandExecution command_report = 2;
   bool re_cache_enabled = 3;
+  optional buck.host_sharing.HostSharingRequirements
+      command_host_sharing_requirements = 4;
 }
 
 message TestRunStart {
@@ -1809,6 +1812,8 @@ message TestRunStart {
 message TestRunEnd {
   TestSuite suite = 1;
   CommandExecution command_report = 2;
+  optional buck.host_sharing.HostSharingRequirements
+      command_host_sharing_requirements = 3;
 }
 
 message FileWatcherStart {

app/buck2_execute_impl/src/executors/local.rs

@@ -413,6 +413,7 @@ impl LocalExecutor {
                         value: v.into_string_lossy(),
                     })
                     .collect();
+
                 let stage = match worker {
                     None => buck2_data::LocalExecute {
                         command: Some(buck2_data::LocalCommand {

app/buck2_forkserver_proto/build.rs

@@ -16,7 +16,11 @@ fn main() -> io::Result<()> {
     let includes = if let Ok(path) = env::var("BUCK_PROTO_SRCS") {
         vec![path]
     } else {
-        vec![".".to_owned(), "../buck2_data".to_owned()]
+        vec![
+            ".".to_owned(),
+            "../buck2_data".to_owned(),
+            "../buck2_host_sharing_proto".to_owned(),
+        ]
     };
 
     buck2_protoc_dev::configure()

app/buck2_health_check_proto/build.rs

@@ -16,7 +16,11 @@ fn main() -> io::Result<()> {
     let includes = if let Ok(path) = env::var("BUCK_PROTO_SRCS") {
         vec![path]
     } else {
-        vec![".".to_owned(), "../buck2_data".to_owned()]
+        vec![
+            ".".to_owned(),
+            "../buck2_data".to_owned(),
+            "../buck2_host_sharing_proto".to_owned(),
+        ]
     };
 
     buck2_protoc_dev::configure()

app/buck2_host_sharing_proto/BUCK

@@ -9,7 +9,9 @@ rust_protobuf_library(
     proto_srcs = ":host_sharing.proto",
     deps = [
         "fbsource//third-party/rust:prost-types",
+        "fbsource//third-party/rust:serde",
         "fbsource//third-party/rust:tonic",
+        "//buck2/allocative/allocative:allocative",
     ],
 )
 

app/buck2_host_sharing_proto/Cargo.toml

@@ -7,8 +7,10 @@ repository = { workspace = true }
 version = "0.1.0"
 
 [dependencies]
+allocative = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
+serde = { workspace = true }
 tonic = { workspace = true }
 
 [build-dependencies]

app/buck2_host_sharing_proto/build.rs

@@ -21,6 +21,8 @@ fn main() -> io::Result<()> {
 
     buck2_protoc_dev::configure()
         .setup_protoc()
+        .type_attribute(".", "#[derive(::allocative::Allocative)]")
+        .type_attribute(".", "#[derive(::serde::Serialize, ::serde::Deserialize)]")
         .extern_path(".buck.data", "::buck2_data")
         .compile(proto_files, &includes)
 }

app/buck2_test/src/orchestrator.rs

@@ -148,6 +148,7 @@ use futures::channel::mpsc::UnboundedSender;
 use futures::stream::FuturesUnordered;
 use futures::stream::StreamExt;
 use host_sharing::HostSharingRequirements;
+use host_sharing::convert::host_sharing_requirements_to_grpc;
 use indexmap::IndexMap;
 use indexmap::IndexSet;
 use indexmap::indexset;
@@ -1016,6 +1017,10 @@ impl BuckTestOrchestrator<'_> {
                                     .to_command_execution_proto(true, true, false)
                                     .await,
                             ),
+                            command_host_sharing_requirements: host_sharing_requirements_to_grpc(
+                                prepared_command.request.host_sharing_requirements().clone(),
+                            )
+                            .ok(),
                             re_cache_enabled: *cacheable && re_cache_enabled,
                         };
                         ((result, cached), end)
@@ -1068,6 +1073,10 @@ impl BuckTestOrchestrator<'_> {
                                     .to_command_execution_proto(true, true, false)
                                     .await,
                             ),
+                            command_host_sharing_requirements: host_sharing_requirements_to_grpc(
+                                prepared_command.request.host_sharing_requirements().clone(),
+                            )
+                            .ok(),
                         };
                         (result, end)
                     })