Writing build events to a file is no longer experimental

Reflect this by renaming the options appropriately. While
there, also add categories to those options.

RELNOTES: writing build events to a file is no longer experimental
PiperOrigin-RevId: 160400332

1 files changed, 23 insertions, 24 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BuildEventStreamOptions.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BuildEventStreamOptions.java
index 6024755421..461e37b277 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BuildEventStreamOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BuildEventStreamOptions.java
@@ -17,28 +17,27 @@ package com.google.devtools.build.lib.buildeventstream.transports;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionsBase;
-import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions;
 import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag;
 
 /** Options used to configure BuildEventStreamer and its BuildEventTransports. */
 public class BuildEventStreamOptions extends OptionsBase {
 
   @Option(
-    name = "experimental_build_event_text_file",
+    name = "build_event_text_file",
+    oldName = "experimental_build_event_text_file",
     defaultValue = "",
-    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
-    documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-    effectTags = {OptionEffectTag.UNKNOWN},
+    documentationCategory = OptionDocumentationCategory.LOGGING,
+    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
     help = "If non-empty, write a textual representation of the build event protocol to that file"
   )
   public String buildEventTextFile;
 
   @Option(
-    name = "experimental_build_event_binary_file",
+    name = "build_event_binary_file",
+    oldName = "experimental_build_event_binary_file",
     defaultValue = "",
-    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
-    documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-    effectTags = {OptionEffectTag.UNKNOWN},
+    documentationCategory = OptionDocumentationCategory.LOGGING,
+    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
     help =
         "If non-empty, write a varint delimited binary representation of representation of the"
             + " build event protocol to that file."
@@ -46,21 +45,21 @@ public class BuildEventStreamOptions extends OptionsBase {
   public String buildEventBinaryFile;
 
   @Option(
-    name = "experimental_build_event_json_file",
+    name = "build_event_json_file",
+    oldName = "experimental_build_event_json_file",
     defaultValue = "",
-    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
-    documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-    effectTags = {OptionEffectTag.UNKNOWN},
+    documentationCategory = OptionDocumentationCategory.LOGGING,
+    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
     help = "If non-empty, write a JSON serialisation of the build event protocol to that file."
   )
   public String buildEventJsonFile;
 
   @Option(
-    name = "experimental_build_event_text_file_path_conversion",
+    name = "build_event_text_file_path_conversion",
+    oldName = "experimental_build_event_text_file_path_conversion",
     defaultValue = "true",
-    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
-    documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-    effectTags = {OptionEffectTag.UNKNOWN},
+    documentationCategory = OptionDocumentationCategory.LOGGING,
+    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
     help =
         "Convert paths in the text file representation of the build event protocol to more "
             + "globally valid URIs whenever possible; if disabled, the file:// uri scheme will "
@@ -69,11 +68,11 @@ public class BuildEventStreamOptions extends OptionsBase {
   public boolean buildEventTextFilePathConversion;
 
   @Option(
-    name = "experimental_build_event_binary_file_path_conversion",
+    name = "build_event_binary_file_path_conversion",
+    oldName = "experimental_build_event_binary_file_path_conversion",
     defaultValue = "true",
-    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
-    documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-    effectTags = {OptionEffectTag.UNKNOWN},
+    documentationCategory = OptionDocumentationCategory.LOGGING,
+    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
     help =
         "Convert paths in the binary file representation of the build event protocol to more "
             + "globally valid URIs whenever possible; if disabled, the file:// uri scheme will "
@@ -83,10 +82,10 @@ public class BuildEventStreamOptions extends OptionsBase {
 
   @Option(
     name = "experimental_build_event_json_file_path_conversion",
+    oldName = "build_event_json_file_path_conversion",
     defaultValue = "true",
-    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
-    documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-    effectTags = {OptionEffectTag.UNKNOWN},
+    documentationCategory = OptionDocumentationCategory.LOGGING,
+    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
     help =
         "Convert paths in the json file representation of the build event protocol to more "
             + "globally valid URIs whenever possible; if disabled, the file:// uri scheme will "