From 1cbbf45b2564808878ab40d6aafd5aefc0e5eefb Mon Sep 17 00:00:00 2001 From: George Gensure Date: Sat, 22 Apr 2023 11:14:58 -0400 Subject: [PATCH] Rename `--experimental_remote_grpc_log` to `--remote_grpc_log` 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` --- .../com/google/devtools/build/lib/remote/RemoteModule.java | 4 ++-- .../devtools/build/lib/remote/options/RemoteOptions.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 index a1c63ee91bd2d1..6adf70bd56dec4 100644 --- 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 index 8845caa9b473a6..6ae8549fd3aead 100644 --- 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",