2 files changed, 27 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
index 6abef0e4ac..3f3b46b413 100644
--- a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
@@ -31,9 +31,11 @@ import com.google.devtools.build.lib.server.CommandProtos.PingRequest;
 import com.google.devtools.build.lib.server.CommandProtos.PingResponse;
 import com.google.devtools.build.lib.server.CommandProtos.RunRequest;
 import com.google.devtools.build.lib.server.CommandProtos.RunResponse;
+import com.google.devtools.build.lib.server.CommandProtos.StartupOption;
 import com.google.devtools.build.lib.util.BlazeClock;
 import com.google.devtools.build.lib.util.Clock;
 import com.google.devtools.build.lib.util.ExitCode;
+import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.lib.util.ThreadUtils;
 import com.google.devtools.build.lib.util.io.OutErr;
@@ -59,6 +61,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.Exchanger;
 import java.util.concurrent.ExecutionException;
@@ -809,6 +812,16 @@ public class GrpcServerImpl implements RPCServer {
     String commandId;
     int exitCode;
 
+    // TODO(b/63925394): This information needs to be passed to the GotOptionsEvent, which does not
+    // currently have the explicit startup options. See Improved Command Line Reporting design doc
+    // for details.
+    // Convert the startup options record to Java strings, source first.
+    ImmutableList.Builder<Pair<String, String>> startupOptions = ImmutableList.builder();
+    for (StartupOption option : request.getStartupOptionsList()) {
+      startupOptions.add(
+          new Pair<>(option.getSource().toString(CHARSET), option.getOption().toString(CHARSET)));
+    }
+
     try (RunningCommand command = new RunningCommand()) {
       commandId = command.id;
 
@@ -837,7 +850,8 @@ public class GrpcServerImpl implements RPCServer {
                 rpcOutErr,
                 request.getBlockForLock() ? LockingMode.WAIT : LockingMode.ERROR_OUT,
                 request.getClientDescription(),
-                clock.currentTimeMillis());
+                clock.currentTimeMillis(),
+                Optional.of(startupOptions.build()));
       } catch (OptionsParsingException e) {
         rpcOutErr.printErrLn(e.getMessage());
         exitCode = ExitCode.COMMAND_LINE_ERROR.getNumericExitCode();
diff --git a/src/main/java/com/google/devtools/build/lib/server/ServerCommand.java b/src/main/java/com/google/devtools/build/lib/server/ServerCommand.java
index ef5f727bdb..f0574cdbaa 100644
--- a/src/main/java/com/google/devtools/build/lib/server/ServerCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/server/ServerCommand.java
@@ -15,8 +15,10 @@ package com.google.devtools.build.lib.server;
 
 import com.google.devtools.build.lib.runtime.BlazeCommandDispatcher;
 import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
+import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.util.io.OutErr;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * The {@link RPCServer} calls an arbitrary command implementing this
@@ -25,8 +27,13 @@ import java.util.List;
 public interface ServerCommand {
 
   /**
-   * Executes the request, writing any output or error messages into err.
-   * Returns 0 on success; any other value or exception indicates an error.
+   * Executes the request, writing any output or error messages into err. Returns 0 on success; any
+   * other value or exception indicates an error.
+   *
+   * @param startupOptionsTaggedWithBazelRc List of startup options in Pair(bazelRc, option) form.
+   *     The empty string bazelRc is interpreted as the command line, and option should be in
+   *     --[no]flag or --flag=value form. If we don't have access to this information (--batch),
+   *     leave this parameter as Optional.empty().
    */
   int exec(
       InvocationPolicy policy,
@@ -34,7 +41,9 @@ public interface ServerCommand {
       OutErr outErr,
       BlazeCommandDispatcher.LockingMode lockingMode,
       String clientDescription,
-      long firstContactTime) throws InterruptedException;
+      long firstContactTime,
+      Optional<List<Pair<String, String>>> startupOptionsTaggedWithBazelRc)
+      throws InterruptedException;
 
   /**
    * Whether the server needs to be shut down.