Rename --experimental_remote_grpc_log to --remote_grpc_log

werkt · copybara-github · commit 271512031d1a · 2023-04-24T07:21:20.000-07:00
GRPC logging has been in use since the start of REAPI application to bazel, and is sufficiently stable and supported by tools_remote/remote_client RELNOTES: `--experimental_remote_grpc_log` has been renamed to `--remote_grpc_log` Closes #18180. PiperOrigin-RevId: 526633832 Change-Id: Ib3b06c303f39f1dd8e1eff3b5b4d4d146f148665
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
@@ -405,11 +405,11 @@ public void beforeCommand(CommandEnvironment env) throws AbruptExitException {
     }
 
     ClientInterceptor loggingInterceptor = null;
-    if (remoteOptions.experimentalRemoteGrpcLog != null) {
+    if (remoteOptions.remoteGrpcLog != null) {
       try {
         rpcLogFile =
             new AsynchronousFileOutputStream(
-                env.getWorkingDirectory().getRelative(remoteOptions.experimentalRemoteGrpcLog));
+                env.getWorkingDirectory().getRelative(remoteOptions.remoteGrpcLog));
       } catch (IOException e) {
         handleInitFailure(env, e, Code.RPC_LOG_FAILURE);
         return;
diff --git a/src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java b/src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java
@@ -378,7 +378,8 @@ public RemoteBuildEventUploadModeConverter() {
   public boolean experimentalGuardAgainstConcurrentChanges;
 
   @Option(
-      name = "experimental_remote_grpc_log",
+      name = "remote_grpc_log",
+      oldName = "experimental_remote_grpc_log",
       defaultValue = "null",
       category = "remote",
       documentationCategory = OptionDocumentationCategory.REMOTE,
@@ -391,7 +392,7 @@ public RemoteBuildEventUploadModeConverter() {
               + "protobufs with each message prefixed by a varint denoting the size of the"
               + " following serialized protobuf message, as performed by the method "
               + "LogEntry.writeDelimitedTo(OutputStream).")
-  public PathFragment experimentalRemoteGrpcLog;
+  public PathFragment remoteGrpcLog;
 
   @Option(
       name = "incompatible_remote_symlinks",
