Wrap ExecutionMetrics against future needs

This will allow us to extend ExecutionMetrics in the future.

Bug: b/365537477
Test: manual, TH
Change-Id: Icfc3d95ee61b19921e23252276a93984baf1f2e1

1 files changed, 9 insertions, 3 deletions

diff --git a/ui/execution_metrics/execution_metrics.go b/ui/execution_metrics/execution_metrics.go
index 4ea251fa4..db784495d 100644
--- a/ui/execution_metrics/execution_metrics.go
+++ b/ui/execution_metrics/execution_metrics.go
@@ -204,8 +204,7 @@ func (c *ExecutionMetrics) Dump(path string, args []string) error {
 	if c.MetricsAggregationDir == "" {
 		return nil
 	}
-	msg := c.GetMetrics()
-	msg.CommandArgs = args
+	msg := c.GetMetrics(args)
 
 	if _, err := os.Stat(filepath.Dir(path)); err != nil {
 		if err = os.MkdirAll(filepath.Dir(path), 0775); err != nil {
@@ -219,7 +218,14 @@ func (c *ExecutionMetrics) Dump(path string, args []string) error {
 	return os.WriteFile(path, data, 0644)
 }
 
-func (c *ExecutionMetrics) GetMetrics() *soong_metrics_proto.AggregatedFileList {
+func (c *ExecutionMetrics) GetMetrics(args []string) *soong_metrics_proto.ExecutionMetrics {
+	return &soong_metrics_proto.ExecutionMetrics{
+		CommandArgs:  args,
+		ChangedFiles: c.getChangedFiles(),
+	}
+}
+
+func (c *ExecutionMetrics) getChangedFiles() *soong_metrics_proto.AggregatedFileList {
 	fl := c.fileList
 	if fl == nil {
 		return nil