commit 074c9c494b6d4d1252a1f8d31094da3f36b30fdf
author Tobias Werth <twerth@google.com> Thu Mar 21 06:48:29 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 21 06:49:42 2019 -0700
tree 664295fa8ff8f86640d4edbd20e5c0d2e9685fd4
parent 109810a8a7d6b23a8a2f3001306af1f6e2bf6c3e

Fix #7715.

The flag bep_publish_used_heap_size_post_build is not meant to be
exposed to other commands than build since it has no effect there.

RELNOTES: None

Closes #7790.

PiperOrigin-RevId: 239586196

src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java

diff --git a/src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java b/src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java
index 6f098fb..0604397 100644
--- a/src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java
+++ b/src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java
@@ -42,8 +42,9 @@
 
   MetricsCollector(CommandEnvironment env) {
     this.env = env;
+    Options options = env.getOptions().getOptions(Options.class);
     this.bepPublishUsedHeapSizePostBuild =
-        env.getOptions().getOptions(Options.class).bepPublishUsedHeapSizePostBuild;
+        options != null && options.bepPublishUsedHeapSizePostBuild;
     env.getEventBus().register(this);
   }
 

src/main/java/com/google/devtools/build/lib/metrics/MetricsModule.java

diff --git a/src/main/java/com/google/devtools/build/lib/metrics/MetricsModule.java b/src/main/java/com/google/devtools/build/lib/metrics/MetricsModule.java
index ae4e86e..46a161d 100644
--- a/src/main/java/com/google/devtools/build/lib/metrics/MetricsModule.java
+++ b/src/main/java/com/google/devtools/build/lib/metrics/MetricsModule.java
@@ -43,7 +43,7 @@
 
   @Override
   public Iterable<Class<? extends OptionsBase>> getCommandOptions(Command command) {
-    return ImmutableList.of(Options.class);
+    return "build".equals(command.name()) ? ImmutableList.of(Options.class) : ImmutableList.of();
   }
 
   @Override