commit 13642d4735c1ea549ffa372bc7eb09400ca8bd7e
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 21 07:05:41 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 21 07:05:41 2022 +0000
tree f02abd7d22c955b3ec211579ab3e3facf5424942
parent ca8e93e79dde9f498fab3a3ee1258bd5a8b78bf5
parent a1d8fa99616a079b586a751d545b6881085714fe

Merge "Do not dump metrics if reproxy was never started"

cmd/soong_ui/main.go

diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go
index a0cfbea..a03a86a 100644
--- a/cmd/soong_ui/main.go
+++ b/cmd/soong_ui/main.go
@@ -221,7 +221,6 @@
 		}
 		defer build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, files...)
 		defer met.Dump(soongMetricsFile)
-		defer build.DumpRBEMetrics(buildCtx, config, rbeMetricsFile)
 	}
 
 	// Read the time at the starting point.

ui/build/build.go

diff --git a/ui/build/build.go b/ui/build/build.go
index 2e44aaa..d261f89 100644
--- a/ui/build/build.go
+++ b/ui/build/build.go
@@ -264,6 +264,7 @@
 
 	if config.StartRBE() {
 		startRBE(ctx, config)
+		defer DumpRBEMetrics(ctx, config, filepath.Join(config.LogsDir(), "rbe_metrics.pb"))
 	}
 
 	if what&RunProductConfig != 0 {