diff --git a/ui/metrics/metrics.go b/ui/metrics/metrics.go
index f5552a3..a13a106 100644
--- a/ui/metrics/metrics.go
+++ b/ui/metrics/metrics.go
@@ -139,7 +139,12 @@
 }
 
 // exports the output to the file at outputPath
-func (m *Metrics) Dump(outputPath string) (err error) {
+func (m *Metrics) Dump(outputPath string) error {
+	// ignore the error if the hostname could not be retrieved as it
+	// is not a critical metric to extract.
+	if hostname, err := os.Hostname(); err == nil {
+		m.metrics.Hostname = proto.String(hostname)
+	}
 	m.metrics.HostOs = proto.String(runtime.GOOS)
 	return writeMessageToFile(&m.metrics, outputPath)
 }
diff --git a/ui/metrics/metrics_proto/metrics.pb.go b/ui/metrics/metrics_proto/metrics.pb.go
index 05efe13..95ef4da 100644
--- a/ui/metrics/metrics_proto/metrics.pb.go
+++ b/ui/metrics/metrics_proto/metrics.pb.go
@@ -197,12 +197,14 @@
 	// The metrics for calling Ninja.
 	NinjaRuns []*PerfInfo `protobuf:"bytes,20,rep,name=ninja_runs,json=ninjaRuns" json:"ninja_runs,omitempty"`
 	// The metrics for the whole build
-	Total                *PerfInfo          `protobuf:"bytes,21,opt,name=total" json:"total,omitempty"`
-	SoongBuildMetrics    *SoongBuildMetrics `protobuf:"bytes,22,opt,name=soong_build_metrics,json=soongBuildMetrics" json:"soong_build_metrics,omitempty"`
-	BuildConfig          *BuildConfig       `protobuf:"bytes,23,opt,name=build_config,json=buildConfig" json:"build_config,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
-	XXX_unrecognized     []byte             `json:"-"`
-	XXX_sizecache        int32              `json:"-"`
+	Total             *PerfInfo          `protobuf:"bytes,21,opt,name=total" json:"total,omitempty"`
+	SoongBuildMetrics *SoongBuildMetrics `protobuf:"bytes,22,opt,name=soong_build_metrics,json=soongBuildMetrics" json:"soong_build_metrics,omitempty"`
+	BuildConfig       *BuildConfig       `protobuf:"bytes,23,opt,name=build_config,json=buildConfig" json:"build_config,omitempty"`
+	// The hostname of the machine
+	Hostname             *string  `protobuf:"bytes,24,opt,name=hostname" json:"hostname,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *MetricsBase) Reset()         { *m = MetricsBase{} }
@@ -396,6 +398,13 @@
 	return nil
 }
 
+func (m *MetricsBase) GetHostname() string {
+	if m != nil && m.Hostname != nil {
+		return *m.Hostname
+	}
+	return ""
+}
+
 type BuildConfig struct {
 	UseGoma              *bool    `protobuf:"varint,1,opt,name=use_goma,json=useGoma" json:"use_goma,omitempty"`
 	UseRbe               *bool    `protobuf:"varint,2,opt,name=use_rbe,json=useRbe" json:"use_rbe,omitempty"`
@@ -772,70 +781,71 @@
 }
 
 var fileDescriptor_6039342a2ba47b72 = []byte{
-	// 1036 bytes of a gzipped FileDescriptorProto
+	// 1047 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xef, 0x4e, 0x1b, 0x47,
 	0x10, 0xcf, 0x61, 0x83, 0x7d, 0x73, 0xd8, 0x1c, 0x0b, 0x29, 0x97, 0x44, 0xa8, 0x96, 0xd5, 0x44,
 	0xa8, 0x6a, 0x48, 0x44, 0x23, 0x14, 0xa1, 0xa8, 0x12, 0x18, 0x44, 0x53, 0x04, 0x8e, 0x16, 0x4c,
 	0xa3, 0xf6, 0xc3, 0x69, 0x7d, 0xb7, 0x86, 0x4b, 0x7d, 0xb7, 0xd6, 0xee, 0x5e, 0x04, 0x79, 0x87,
-	0x3e, 0x55, 0x9f, 0xa5, 0xaf, 0x51, 0x55, 0x3b, 0x7b, 0x67, 0x1f, 0xad, 0xdb, 0xa0, 0x7c, 0xf3,
-	0xce, 0xef, 0xcf, 0xce, 0xec, 0xce, 0xce, 0x19, 0x5a, 0x29, 0xd7, 0x32, 0x89, 0xd4, 0xf6, 0x44,
-	0x0a, 0x2d, 0xc8, 0x9a, 0x12, 0x22, 0xbb, 0x0a, 0x87, 0x79, 0x32, 0x8e, 0xc3, 0x02, 0xea, 0xfe,
-	0x05, 0xe0, 0x9d, 0xda, 0xdf, 0x07, 0x4c, 0x71, 0xf2, 0x12, 0xd6, 0x2d, 0x21, 0x66, 0x9a, 0x87,
-	0x3a, 0x49, 0xb9, 0xd2, 0x2c, 0x9d, 0x04, 0x4e, 0xc7, 0xd9, 0xaa, 0x51, 0x82, 0xd8, 0x21, 0xd3,
-	0xfc, 0xa2, 0x44, 0xc8, 0x23, 0x68, 0x5a, 0x45, 0x12, 0x07, 0x0b, 0x1d, 0x67, 0xcb, 0xa5, 0x0d,
-	0x5c, 0xbf, 0x8d, 0xc9, 0x1e, 0x3c, 0x9a, 0x8c, 0x99, 0x1e, 0x09, 0x99, 0x86, 0x1f, 0xb9, 0x54,
-	0x89, 0xc8, 0xc2, 0x48, 0xc4, 0x3c, 0x63, 0x29, 0x0f, 0x6a, 0xc8, 0xdd, 0x28, 0x09, 0x97, 0x16,
-	0xef, 0x15, 0x30, 0x79, 0x0a, 0x6d, 0xcd, 0xe4, 0x15, 0xd7, 0xe1, 0x44, 0x8a, 0x38, 0x8f, 0x74,
-	0x50, 0x47, 0x41, 0xcb, 0x46, 0xdf, 0xd9, 0x20, 0x89, 0x61, 0xbd, 0xa0, 0xd9, 0x24, 0x3e, 0x32,
-	0x99, 0xb0, 0x4c, 0x07, 0x8b, 0x1d, 0x67, 0xab, 0xbd, 0xf3, 0x7c, 0x7b, 0x4e, 0xcd, 0xdb, 0x95,
-	0x7a, 0xb7, 0x0f, 0x0c, 0x72, 0x69, 0x45, 0x7b, 0xb5, 0xa3, 0xb3, 0x63, 0x4a, 0xac, 0x5f, 0x15,
-	0x20, 0x7d, 0xf0, 0x8a, 0x5d, 0x98, 0x8c, 0xae, 0x83, 0x25, 0x34, 0x7f, 0xfa, 0x59, 0xf3, 0x7d,
-	0x19, 0x5d, 0xef, 0x35, 0x06, 0x67, 0x27, 0x67, 0xfd, 0x9f, 0xcf, 0x28, 0x58, 0x0b, 0x13, 0x24,
-	0xdb, 0xb0, 0x56, 0x31, 0x9c, 0x66, 0xdd, 0xc0, 0x12, 0x57, 0x67, 0xc4, 0x32, 0x81, 0xef, 0xa0,
-	0x48, 0x2b, 0x8c, 0x26, 0xf9, 0x94, 0xde, 0x44, 0xba, 0x6f, 0x91, 0xde, 0x24, 0x2f, 0xd9, 0x27,
-	0xe0, 0x5e, 0x0b, 0x55, 0x24, 0xeb, 0x7e, 0x51, 0xb2, 0x4d, 0x63, 0x80, 0xa9, 0x52, 0x68, 0xa1,
-	0xd9, 0x4e, 0x16, 0x5b, 0x43, 0xf8, 0x22, 0x43, 0xcf, 0x98, 0xec, 0x64, 0x31, 0x7a, 0x6e, 0x40,
-	0x03, 0x3d, 0x85, 0x0a, 0x3c, 0xac, 0x61, 0xc9, 0x2c, 0xfb, 0x8a, 0x74, 0x8b, 0xcd, 0x84, 0x0a,
-	0xf9, 0x8d, 0x96, 0x2c, 0x58, 0x46, 0xd8, 0xb3, 0xf0, 0x91, 0x09, 0x4d, 0x39, 0x91, 0x14, 0x4a,
-	0x19, 0x8b, 0xd6, 0x8c, 0xd3, 0x33, 0xb1, 0xbe, 0x22, 0xcf, 0x60, 0xa5, 0xc2, 0xc1, 0xb4, 0xdb,
-	0xb6, 0x7d, 0xa6, 0x2c, 0x4c, 0xe4, 0x39, 0xac, 0x55, 0x78, 0xd3, 0x12, 0x57, 0xec, 0xc1, 0x4e,
-	0xb9, 0x95, 0xbc, 0x45, 0xae, 0xc3, 0x38, 0x91, 0x81, 0x6f, 0xf3, 0x16, 0xb9, 0x3e, 0x4c, 0x24,
-	0xf9, 0x01, 0x3c, 0xc5, 0x75, 0x3e, 0x09, 0xb5, 0x10, 0x63, 0x15, 0xac, 0x76, 0x6a, 0x5b, 0xde,
-	0xce, 0xe6, 0xdc, 0x23, 0x7a, 0xc7, 0xe5, 0xe8, 0x6d, 0x36, 0x12, 0x14, 0x50, 0x71, 0x61, 0x04,
-	0x64, 0x0f, 0xdc, 0xdf, 0x98, 0x4e, 0x42, 0x99, 0x67, 0x2a, 0x20, 0xf7, 0x51, 0x37, 0x0d, 0x9f,
-	0xe6, 0x99, 0x22, 0x6f, 0x00, 0x2c, 0x13, 0xc5, 0x6b, 0xf7, 0x11, 0xbb, 0x88, 0x96, 0xea, 0x2c,
-	0xc9, 0x3e, 0x30, 0xab, 0x5e, 0xbf, 0x97, 0x1a, 0x05, 0xa8, 0xfe, 0x1e, 0x16, 0xb5, 0xd0, 0x6c,
-	0x1c, 0x3c, 0xec, 0x38, 0x9f, 0x17, 0x5a, 0x2e, 0xb9, 0x84, 0x79, 0xa3, 0x28, 0xf8, 0x0a, 0x2d,
-	0x9e, 0xcd, 0xb5, 0x38, 0x37, 0x31, 0x7c, 0x92, 0x45, 0x87, 0xd1, 0x55, 0xf5, 0xcf, 0x10, 0xe9,
-	0xc1, 0xb2, 0x55, 0x45, 0x22, 0x1b, 0x25, 0x57, 0xc1, 0x06, 0x1a, 0x76, 0xe6, 0x1a, 0xa2, 0xb0,
-	0x87, 0x3c, 0xea, 0x0d, 0x67, 0x8b, 0xee, 0x4b, 0x58, 0xbe, 0xf3, 0xf4, 0x9b, 0x50, 0x1f, 0x9c,
-	0x1f, 0x51, 0xff, 0x01, 0x69, 0x81, 0x6b, 0x7e, 0x1d, 0x1e, 0x1d, 0x0c, 0x8e, 0x7d, 0x87, 0x34,
-	0xc0, 0x8c, 0x0b, 0x7f, 0xa1, 0xfb, 0x06, 0xea, 0xd8, 0x1c, 0x1e, 0x94, 0xcd, 0xee, 0x3f, 0x30,
-	0xe8, 0x3e, 0x3d, 0xf5, 0x1d, 0xe2, 0xc2, 0xe2, 0x3e, 0x3d, 0xdd, 0x7d, 0xe5, 0x2f, 0x98, 0xd8,
-	0xfb, 0xd7, 0xbb, 0x7e, 0x8d, 0x00, 0x2c, 0xbd, 0x7f, 0xbd, 0x1b, 0xee, 0xbe, 0xf2, 0xeb, 0xdd,
-	0x2b, 0xf0, 0x2a, 0xb9, 0x98, 0x69, 0x9a, 0x2b, 0x1e, 0x5e, 0x89, 0x94, 0xe1, 0xcc, 0x6d, 0xd2,
-	0x46, 0xae, 0xf8, 0xb1, 0x48, 0x99, 0x69, 0x3e, 0x03, 0xc9, 0x21, 0xc7, 0x39, 0xdb, 0xa4, 0x4b,
-	0xb9, 0xe2, 0x74, 0xc8, 0xc9, 0x37, 0xd0, 0x1e, 0x09, 0x19, 0xf1, 0x70, 0xaa, 0xac, 0x21, 0xbe,
-	0x8c, 0xd1, 0x81, 0x95, 0x77, 0x7f, 0x77, 0xa0, 0x59, 0xde, 0x04, 0x21, 0x50, 0x8f, 0xb9, 0x8a,
-	0x70, 0x0b, 0x97, 0xe2, 0x6f, 0x13, 0xc3, 0xc1, 0x6c, 0x87, 0x38, 0xfe, 0x26, 0x9b, 0x00, 0x4a,
-	0x33, 0xa9, 0xf1, 0x4b, 0x80, 0xb6, 0x75, 0xea, 0x62, 0xc4, 0x7c, 0x00, 0xc8, 0x13, 0x70, 0x25,
-	0x67, 0x63, 0x8b, 0xd6, 0x11, 0x6d, 0x9a, 0x00, 0x82, 0x9b, 0x00, 0x29, 0x4f, 0x85, 0xbc, 0x35,
-	0x79, 0xe1, 0x40, 0xae, 0x53, 0xd7, 0x46, 0x06, 0x8a, 0x77, 0xff, 0x74, 0xa0, 0x7d, 0x2a, 0xe2,
-	0x7c, 0xcc, 0x2f, 0x6e, 0x27, 0x1c, 0xb3, 0xfa, 0xb5, 0xbc, 0x40, 0x75, 0xab, 0x34, 0x4f, 0x31,
-	0xbb, 0xf6, 0xce, 0x8b, 0xf9, 0x93, 0xe6, 0x8e, 0xd4, 0xde, 0xe7, 0x39, 0xca, 0x2a, 0x33, 0x67,
-	0x38, 0x8b, 0x92, 0xaf, 0xc1, 0x4b, 0x51, 0x13, 0xea, 0xdb, 0x49, 0x59, 0x25, 0xa4, 0x53, 0x1b,
-	0x73, 0x8c, 0x59, 0x9e, 0x86, 0x62, 0x14, 0xda, 0xa0, 0xc2, 0x7a, 0x5b, 0x74, 0x39, 0xcb, 0xd3,
-	0xfe, 0xc8, 0xee, 0xa7, 0xba, 0x2f, 0x8a, 0xfb, 0x2a, 0x5c, 0xef, 0x5c, 0xba, 0x0b, 0x8b, 0xe7,
-	0xfd, 0xfe, 0x99, 0xe9, 0x8e, 0x26, 0xd4, 0x4f, 0xf7, 0x4f, 0x8e, 0xfc, 0x85, 0xee, 0x18, 0x1e,
-	0xf7, 0x64, 0xa2, 0x93, 0x88, 0x8d, 0x07, 0x8a, 0xcb, 0x9f, 0x44, 0x2e, 0x33, 0x7e, 0x5b, 0xf6,
-	0x6c, 0x79, 0xe8, 0x4e, 0xe5, 0xd0, 0xf7, 0xa0, 0x51, 0xbe, 0x89, 0x85, 0xff, 0x69, 0xe1, 0xca,
-	0xac, 0xa5, 0xa5, 0xa0, 0x3b, 0x84, 0x27, 0x73, 0x76, 0x53, 0xb3, 0x27, 0x52, 0x8f, 0xf2, 0x0f,
-	0x2a, 0x70, 0xf0, 0x9d, 0xcf, 0x3f, 0xd9, 0xff, 0xce, 0x96, 0xa2, 0xb8, 0xfb, 0x87, 0x03, 0xab,
-	0xff, 0x7a, 0x90, 0x24, 0x80, 0x46, 0x79, 0x6e, 0x0e, 0x9e, 0x5b, 0xb9, 0x24, 0x8f, 0xa1, 0x59,
-	0x7c, 0xb1, 0x6c, 0x41, 0x2d, 0x3a, 0x5d, 0x93, 0x6f, 0x61, 0x15, 0x87, 0x42, 0xc8, 0xc6, 0x63,
-	0x11, 0x85, 0x91, 0xc8, 0x33, 0x5d, 0xf4, 0xd9, 0x0a, 0x02, 0xfb, 0x26, 0xde, 0x33, 0x61, 0xb2,
-	0x05, 0x7e, 0x95, 0xab, 0x92, 0x4f, 0x65, 0xd3, 0xb5, 0x67, 0xd4, 0xf3, 0xe4, 0x13, 0x37, 0x9f,
-	0x88, 0x94, 0xdd, 0x84, 0xd7, 0x9c, 0x4d, 0x2c, 0xcd, 0x76, 0x9f, 0x97, 0xb2, 0x9b, 0x1f, 0x39,
-	0x9b, 0x18, 0xce, 0xc1, 0xc3, 0x5f, 0x8a, 0x29, 0x54, 0xd4, 0x1d, 0xe2, 0xbf, 0xa4, 0xbf, 0x03,
-	0x00, 0x00, 0xff, 0xff, 0x85, 0xc5, 0xe0, 0x4b, 0x35, 0x09, 0x00, 0x00,
+	0xbe, 0x40, 0x5f, 0xa7, 0xcf, 0xd2, 0xf7, 0xa8, 0x76, 0xf6, 0xce, 0x3e, 0x5a, 0xb7, 0x41, 0xf9,
+	0xe6, 0x9d, 0xdf, 0x9f, 0x9d, 0x9d, 0x9d, 0x9d, 0x33, 0xb4, 0x52, 0xae, 0x65, 0x12, 0xa9, 0xed,
+	0x89, 0x14, 0x5a, 0x90, 0x35, 0x25, 0x44, 0x76, 0x15, 0x0e, 0xf3, 0x64, 0x1c, 0x87, 0x05, 0xd4,
+	0xfd, 0xc3, 0x03, 0xef, 0xd4, 0xfe, 0x3e, 0x60, 0x8a, 0x93, 0x97, 0xb0, 0x6e, 0x09, 0x31, 0xd3,
+	0x3c, 0xd4, 0x49, 0xca, 0x95, 0x66, 0xe9, 0x24, 0x70, 0x3a, 0xce, 0x56, 0x8d, 0x12, 0xc4, 0x0e,
+	0x99, 0xe6, 0x17, 0x25, 0x42, 0x1e, 0x41, 0xd3, 0x2a, 0x92, 0x38, 0x58, 0xe8, 0x38, 0x5b, 0x2e,
+	0x6d, 0xe0, 0xfa, 0x6d, 0x4c, 0xf6, 0xe0, 0xd1, 0x64, 0xcc, 0xf4, 0x48, 0xc8, 0x34, 0xfc, 0xc8,
+	0xa5, 0x4a, 0x44, 0x16, 0x46, 0x22, 0xe6, 0x19, 0x4b, 0x79, 0x50, 0x43, 0xee, 0x46, 0x49, 0xb8,
+	0xb4, 0x78, 0xaf, 0x80, 0xc9, 0x53, 0x68, 0x6b, 0x26, 0xaf, 0xb8, 0x0e, 0x27, 0x52, 0xc4, 0x79,
+	0xa4, 0x83, 0x3a, 0x0a, 0x5a, 0x36, 0xfa, 0xce, 0x06, 0x49, 0x0c, 0xeb, 0x05, 0xcd, 0x26, 0xf1,
+	0x91, 0xc9, 0x84, 0x65, 0x3a, 0x58, 0xec, 0x38, 0x5b, 0xed, 0x9d, 0xe7, 0xdb, 0x73, 0xce, 0xbc,
+	0x5d, 0x39, 0xef, 0xf6, 0x81, 0x41, 0x2e, 0xad, 0x68, 0xaf, 0x76, 0x74, 0x76, 0x4c, 0x89, 0xf5,
+	0xab, 0x02, 0xa4, 0x0f, 0x5e, 0xb1, 0x0b, 0x93, 0xd1, 0x75, 0xb0, 0x84, 0xe6, 0x4f, 0x3f, 0x6b,
+	0xbe, 0x2f, 0xa3, 0xeb, 0xbd, 0xc6, 0xe0, 0xec, 0xe4, 0xac, 0xff, 0xf3, 0x19, 0x05, 0x6b, 0x61,
+	0x82, 0x64, 0x1b, 0xd6, 0x2a, 0x86, 0xd3, 0xac, 0x1b, 0x78, 0xc4, 0xd5, 0x19, 0xb1, 0x4c, 0xe0,
+	0x3b, 0x28, 0xd2, 0x0a, 0xa3, 0x49, 0x3e, 0xa5, 0x37, 0x91, 0xee, 0x5b, 0xa4, 0x37, 0xc9, 0x4b,
+	0xf6, 0x09, 0xb8, 0xd7, 0x42, 0x15, 0xc9, 0xba, 0x5f, 0x94, 0x6c, 0xd3, 0x18, 0x60, 0xaa, 0x14,
+	0x5a, 0x68, 0xb6, 0x93, 0xc5, 0xd6, 0x10, 0xbe, 0xc8, 0xd0, 0x33, 0x26, 0x3b, 0x59, 0x8c, 0x9e,
+	0x1b, 0xd0, 0x40, 0x4f, 0xa1, 0x02, 0x0f, 0xcf, 0xb0, 0x64, 0x96, 0x7d, 0x45, 0xba, 0xc5, 0x66,
+	0x42, 0x85, 0xfc, 0x46, 0x4b, 0x16, 0x2c, 0x23, 0xec, 0x59, 0xf8, 0xc8, 0x84, 0xa6, 0x9c, 0x48,
+	0x0a, 0xa5, 0x8c, 0x45, 0x6b, 0xc6, 0xe9, 0x99, 0x58, 0x5f, 0x91, 0x67, 0xb0, 0x52, 0xe1, 0x60,
+	0xda, 0x6d, 0xdb, 0x3e, 0x53, 0x16, 0x26, 0xf2, 0x1c, 0xd6, 0x2a, 0xbc, 0xe9, 0x11, 0x57, 0x6c,
+	0x61, 0xa7, 0xdc, 0x4a, 0xde, 0x22, 0xd7, 0x61, 0x9c, 0xc8, 0xc0, 0xb7, 0x79, 0x8b, 0x5c, 0x1f,
+	0x26, 0x92, 0xfc, 0x00, 0x9e, 0xe2, 0x3a, 0x9f, 0x84, 0x5a, 0x88, 0xb1, 0x0a, 0x56, 0x3b, 0xb5,
+	0x2d, 0x6f, 0x67, 0x73, 0x6e, 0x89, 0xde, 0x71, 0x39, 0x7a, 0x9b, 0x8d, 0x04, 0x05, 0x54, 0x5c,
+	0x18, 0x01, 0xd9, 0x03, 0xf7, 0x37, 0xa6, 0x93, 0x50, 0xe6, 0x99, 0x0a, 0xc8, 0x7d, 0xd4, 0x4d,
+	0xc3, 0xa7, 0x79, 0xa6, 0xc8, 0x1b, 0x00, 0xcb, 0x44, 0xf1, 0xda, 0x7d, 0xc4, 0x2e, 0xa2, 0xa5,
+	0x3a, 0x4b, 0xb2, 0x0f, 0xcc, 0xaa, 0xd7, 0xef, 0xa5, 0x46, 0x01, 0xaa, 0xbf, 0x87, 0x45, 0x2d,
+	0x34, 0x1b, 0x07, 0x0f, 0x3b, 0xce, 0xe7, 0x85, 0x96, 0x4b, 0x2e, 0x61, 0xde, 0x28, 0x0a, 0xbe,
+	0x42, 0x8b, 0x67, 0x73, 0x2d, 0xce, 0x4d, 0x0c, 0x9f, 0x64, 0xd1, 0x61, 0x74, 0x55, 0xfd, 0x33,
+	0x44, 0x7a, 0xb0, 0x6c, 0x55, 0x91, 0xc8, 0x46, 0xc9, 0x55, 0xb0, 0x81, 0x86, 0x9d, 0xb9, 0x86,
+	0x28, 0xec, 0x21, 0x8f, 0x7a, 0xc3, 0xd9, 0x82, 0x3c, 0x06, 0x6c, 0x7d, 0x1c, 0x51, 0x01, 0xde,
+	0xf1, 0x74, 0xdd, 0x7d, 0x09, 0xcb, 0x77, 0xc6, 0x42, 0x13, 0xea, 0x83, 0xf3, 0x23, 0xea, 0x3f,
+	0x20, 0x2d, 0x70, 0xcd, 0xaf, 0xc3, 0xa3, 0x83, 0xc1, 0xb1, 0xef, 0x90, 0x06, 0x98, 0x51, 0xe2,
+	0x2f, 0x74, 0xdf, 0x40, 0x1d, 0x1b, 0xc7, 0x83, 0xf2, 0x21, 0xf8, 0x0f, 0x0c, 0xba, 0x4f, 0x4f,
+	0x7d, 0x87, 0xb8, 0xb0, 0xb8, 0x4f, 0x4f, 0x77, 0x5f, 0xf9, 0x0b, 0x26, 0xf6, 0xfe, 0xf5, 0xae,
+	0x5f, 0x23, 0x00, 0x4b, 0xef, 0x5f, 0xef, 0x86, 0xbb, 0xaf, 0xfc, 0x7a, 0xf7, 0x0a, 0xbc, 0x4a,
+	0x9e, 0x66, 0xd2, 0xe6, 0x8a, 0x87, 0x57, 0x22, 0x65, 0x38, 0x8f, 0x9b, 0xb4, 0x91, 0x2b, 0x7e,
+	0x2c, 0x52, 0x66, 0x1a, 0xd3, 0x40, 0x72, 0xc8, 0x71, 0x06, 0x37, 0xe9, 0x52, 0xae, 0x38, 0x1d,
+	0x72, 0xf2, 0x0d, 0xb4, 0x47, 0x42, 0x46, 0x3c, 0x9c, 0x2a, 0x6b, 0x88, 0x2f, 0x63, 0x74, 0x60,
+	0xe5, 0xdd, 0xdf, 0x1d, 0x68, 0x96, 0xb7, 0x44, 0x08, 0xd4, 0x63, 0xae, 0x22, 0xdc, 0xc2, 0xa5,
+	0xf8, 0xdb, 0xc4, 0xb0, 0x22, 0x76, 0xc0, 0xe3, 0x6f, 0xb2, 0x09, 0xa0, 0x34, 0x93, 0x1a, 0xbf,
+	0x12, 0x68, 0x5b, 0xa7, 0x2e, 0x46, 0xcc, 0xc7, 0x81, 0x3c, 0x01, 0x57, 0x72, 0x36, 0xb6, 0x68,
+	0x1d, 0xd1, 0xa6, 0x09, 0x20, 0xb8, 0x09, 0x90, 0xf2, 0x54, 0xc8, 0x5b, 0x93, 0x17, 0x0e, 0xeb,
+	0x3a, 0x75, 0x6d, 0x64, 0xa0, 0x78, 0xf7, 0x2f, 0x07, 0xda, 0xa7, 0x22, 0xce, 0xc7, 0xfc, 0xe2,
+	0x76, 0xc2, 0x31, 0xab, 0x5f, 0xcb, 0xcb, 0x55, 0xb7, 0x4a, 0xf3, 0x14, 0xb3, 0x6b, 0xef, 0xbc,
+	0x98, 0x3f, 0x85, 0xee, 0x48, 0xed, 0x5d, 0x9f, 0xa3, 0xac, 0x32, 0x8f, 0x86, 0xb3, 0x28, 0xf9,
+	0x1a, 0xbc, 0x14, 0x35, 0xa1, 0xbe, 0x9d, 0x94, 0xa7, 0x84, 0x74, 0x6a, 0x63, 0xca, 0x98, 0xe5,
+	0x69, 0x28, 0x46, 0xa1, 0x0d, 0x2a, 0x3c, 0x6f, 0x8b, 0x2e, 0x67, 0x79, 0xda, 0x1f, 0xd9, 0xfd,
+	0x54, 0xf7, 0x45, 0x71, 0x5f, 0x85, 0xeb, 0x9d, 0x4b, 0x77, 0x61, 0xf1, 0xbc, 0xdf, 0x3f, 0x33,
+	0xdd, 0xd1, 0x84, 0xfa, 0xe9, 0xfe, 0xc9, 0x91, 0xbf, 0xd0, 0x1d, 0xc3, 0xe3, 0x9e, 0x4c, 0x74,
+	0x12, 0xb1, 0xf1, 0x40, 0x71, 0xf9, 0x93, 0xc8, 0x65, 0xc6, 0x6f, 0xcb, 0x7e, 0x2e, 0x8b, 0xee,
+	0x54, 0x8a, 0xbe, 0x07, 0x8d, 0xf2, 0xbd, 0x2c, 0xfc, 0x4f, 0x7b, 0x57, 0xe6, 0x30, 0x2d, 0x05,
+	0xdd, 0x21, 0x3c, 0x99, 0xb3, 0x9b, 0x9a, 0x3d, 0x9f, 0x7a, 0x94, 0x7f, 0x50, 0x81, 0x83, 0x33,
+	0x60, 0x7e, 0x65, 0xff, 0x3b, 0x5b, 0x8a, 0xe2, 0xee, 0x9f, 0x0e, 0xac, 0xfe, 0xeb, 0xb1, 0x92,
+	0x00, 0x1a, 0x65, 0xdd, 0x1c, 0xac, 0x5b, 0xb9, 0x34, 0xcf, 0xad, 0xf8, 0x9a, 0xd9, 0x03, 0xb5,
+	0xe8, 0x74, 0x4d, 0xbe, 0x85, 0x55, 0x1c, 0x18, 0x21, 0x1b, 0x8f, 0x45, 0x14, 0x46, 0x22, 0xcf,
+	0x74, 0xd1, 0x67, 0x2b, 0x08, 0xec, 0x9b, 0x78, 0xcf, 0x84, 0xc9, 0x16, 0xf8, 0x55, 0xae, 0x4a,
+	0x3e, 0x95, 0x4d, 0xd7, 0x9e, 0x51, 0xcf, 0x93, 0x4f, 0xdc, 0x7c, 0x3e, 0x52, 0x76, 0x13, 0x5e,
+	0x73, 0x36, 0xb1, 0x34, 0xdb, 0x7d, 0x5e, 0xca, 0x6e, 0x7e, 0xe4, 0x6c, 0x62, 0x38, 0x07, 0x0f,
+	0x7f, 0x29, 0x26, 0x54, 0x71, 0xee, 0x10, 0xff, 0x41, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb8,
+	0x9e, 0xa1, 0xd5, 0x51, 0x09, 0x00, 0x00,
 }
diff --git a/ui/metrics/metrics_proto/metrics.proto b/ui/metrics/metrics_proto/metrics.proto
index 4d6118b..4e8e12b 100644
--- a/ui/metrics/metrics_proto/metrics.proto
+++ b/ui/metrics/metrics_proto/metrics.proto
@@ -96,6 +96,9 @@
   optional SoongBuildMetrics soong_build_metrics = 22;
 
   optional BuildConfig build_config = 23;
+
+  // The hostname of the machine.
+  optional string hostname = 24;
 }
 
 message BuildConfig {