diff --git a/ui/metrics/metrics.go b/ui/metrics/metrics.go
index 9929b9eb5..1d7e00b19 100644
--- a/ui/metrics/metrics.go
+++ b/ui/metrics/metrics.go
@@ -141,7 +141,12 @@ func (m *Metrics) Serialize() (data []byte, err error) {
 }
 
 // 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)
 	data, err := m.Serialize()
 	if err != nil {
diff --git a/ui/metrics/metrics_proto/metrics.pb.go b/ui/metrics/metrics_proto/metrics.pb.go
index 7f7024f79..ccc903b82 100644
--- a/ui/metrics/metrics_proto/metrics.pb.go
+++ b/ui/metrics/metrics_proto/metrics.pb.go
@@ -195,11 +195,13 @@ type MetricsBase struct {
 	// The metrics for calling Soong.
 	SoongRuns []*PerfInfo `protobuf:"bytes,19,rep,name=soong_runs,json=soongRuns" json:"soong_runs,omitempty"`
 	// The metrics for calling Ninja.
-	NinjaRuns            []*PerfInfo  `protobuf:"bytes,20,rep,name=ninja_runs,json=ninjaRuns" json:"ninja_runs,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:"-"`
+	NinjaRuns   []*PerfInfo  `protobuf:"bytes,20,rep,name=ninja_runs,json=ninjaRuns" json:"ninja_runs,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{} }
@@ -379,6 +381,13 @@ func (m *MetricsBase) GetBuildConfig() *BuildConfig {
 	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"`
@@ -585,59 +594,60 @@ func init() {
 func init() { proto.RegisterFile("metrics.proto", fileDescriptor_6039342a2ba47b72) }
 
 var fileDescriptor_6039342a2ba47b72 = []byte{
-	// 860 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x6e, 0xe2, 0x46,
-	0x14, 0x5e, 0x02, 0x1b, 0xec, 0x63, 0x60, 0x9d, 0x49, 0xa4, 0x78, 0x5b, 0xad, 0x16, 0xa1, 0xfe,
-	0x50, 0xa9, 0xa5, 0x2b, 0x14, 0xa1, 0x28, 0x6a, 0x2f, 0x80, 0xa0, 0x2c, 0xda, 0x05, 0x56, 0x03,
-	0xa4, 0xdb, 0x5e, 0xd4, 0x72, 0xec, 0x81, 0xb8, 0xc5, 0x1e, 0x34, 0x33, 0x5e, 0x35, 0x0f, 0xd1,
-	0x27, 0xea, 0xc3, 0xf4, 0x55, 0xaa, 0x39, 0x83, 0x89, 0x93, 0x8b, 0x54, 0x7b, 0x37, 0x3e, 0xdf,
-	0xcf, 0x7c, 0xf3, 0x77, 0x0c, 0xf5, 0x84, 0x29, 0x11, 0x87, 0xb2, 0xb3, 0x15, 0x5c, 0x71, 0x52,
-	0xbf, 0xc9, 0xe2, 0x4d, 0xe4, 0xef, 0x8a, 0xad, 0x7f, 0x6c, 0x70, 0x26, 0x66, 0x3c, 0x08, 0x24,
-	0x23, 0x6f, 0xe0, 0xc4, 0x10, 0xa2, 0x40, 0x31, 0x5f, 0xc5, 0x09, 0x93, 0x2a, 0x48, 0xb6, 0x5e,
-	0xa9, 0x59, 0x6a, 0x97, 0x29, 0x41, 0xec, 0x32, 0x50, 0x6c, 0x91, 0x23, 0xe4, 0x25, 0x58, 0x46,
-	0x11, 0x47, 0xde, 0x41, 0xb3, 0xd4, 0xb6, 0x69, 0x15, 0xbf, 0xc7, 0x11, 0xb9, 0x80, 0x97, 0xdb,
-	0x4d, 0xa0, 0x56, 0x5c, 0x24, 0xfe, 0x27, 0x26, 0x64, 0xcc, 0x53, 0x3f, 0xe4, 0x11, 0x4b, 0x83,
-	0x84, 0x79, 0x65, 0xe4, 0x9e, 0xe6, 0x84, 0x6b, 0x83, 0x0f, 0x77, 0x30, 0xf9, 0x1a, 0x1a, 0x2a,
-	0x10, 0x6b, 0xa6, 0xfc, 0xad, 0xe0, 0x51, 0x16, 0x2a, 0xaf, 0x82, 0x82, 0xba, 0xa9, 0x7e, 0x30,
-	0x45, 0xf2, 0x3b, 0x9c, 0xec, 0x68, 0x26, 0xc4, 0xa7, 0x40, 0xc4, 0x41, 0xaa, 0xbc, 0xe7, 0xcd,
-	0x52, 0xbb, 0xd1, 0xfd, 0xb6, 0xf3, 0x60, 0xb5, 0x9d, 0xc2, 0x4a, 0x3b, 0x83, 0xe5, 0xf8, 0xfd,
-	0xe5, 0x75, 0x9f, 0x8e, 0xfb, 0xd3, 0xc5, 0x45, 0x79, 0x34, 0xbd, 0xa2, 0xc4, 0x38, 0x0d, 0xb4,
-	0xe4, 0xda, 0xf8, 0x90, 0x31, 0x38, 0x3b, 0xff, 0x40, 0x84, 0xb7, 0xde, 0x21, 0xda, 0xbe, 0x7e,
-	0xc2, 0xb6, 0x4f, 0x87, 0x6f, 0x2f, 0xaa, 0xcb, 0xe9, 0xbb, 0xe9, 0xec, 0x97, 0x29, 0x05, 0x23,
-	0xee, 0x8b, 0xf0, 0x96, 0x74, 0xe0, 0xb8, 0x60, 0xb5, 0x4f, 0x5a, 0xc5, 0x65, 0x1d, 0xdd, 0x13,
-	0xf3, 0xa9, 0xbf, 0x87, 0x5d, 0x20, 0x3f, 0xdc, 0x66, 0x7b, 0xba, 0x85, 0x74, 0xd7, 0x20, 0xc3,
-	0x6d, 0x96, 0xb3, 0x47, 0x60, 0xdf, 0x72, 0xb9, 0x8b, 0x69, 0x7f, 0x66, 0x4c, 0x4b, 0x4b, 0x31,
-	0xe4, 0x7b, 0xa8, 0xa3, 0x4d, 0x37, 0x8d, 0x8c, 0x15, 0x7c, 0xa6, 0x95, 0xa3, 0xe5, 0xdd, 0x34,
-	0x42, 0xb7, 0x53, 0xa8, 0xa2, 0x1b, 0x97, 0x9e, 0x83, 0xb9, 0x0f, 0xf5, 0xe7, 0x4c, 0x92, 0xd6,
-	0x6e, 0x1a, 0x2e, 0x7d, 0xf6, 0x97, 0x12, 0x81, 0x57, 0x43, 0xd8, 0x31, 0xf0, 0x48, 0x97, 0xf6,
-	0x9c, 0x50, 0x70, 0x29, 0xb5, 0x45, 0xfd, 0x9e, 0x33, 0xd4, 0xb5, 0x99, 0x24, 0xdf, 0xc0, 0x8b,
-	0x02, 0x07, 0x03, 0x37, 0xcc, 0x35, 0xd9, 0xb3, 0x30, 0xc8, 0x0f, 0x70, 0x5c, 0xe0, 0xed, 0x17,
-	0xf7, 0xc2, 0x6c, 0xe6, 0x9e, 0x5b, 0xc8, 0xcd, 0x33, 0xe5, 0x47, 0xb1, 0xf0, 0x5c, 0x93, 0x9b,
-	0x67, 0xea, 0x32, 0x16, 0xe4, 0x1c, 0x1c, 0xc9, 0x54, 0xb6, 0xf5, 0x15, 0xe7, 0x1b, 0xe9, 0x1d,
-	0x35, 0xcb, 0x6d, 0xa7, 0x7b, 0xfa, 0x68, 0x73, 0x3e, 0x30, 0xb1, 0x1a, 0xa7, 0x2b, 0x4e, 0x01,
-	0xb9, 0x0b, 0x4d, 0x25, 0x67, 0x60, 0xff, 0x19, 0xa8, 0xd8, 0x17, 0x59, 0x2a, 0x3d, 0xf2, 0xb4,
-	0xce, 0xd2, 0x4c, 0x9a, 0xa5, 0x92, 0xf4, 0x00, 0x24, 0xe7, 0xe9, 0xda, 0xc8, 0x8e, 0x9f, 0x96,
-	0xd9, 0x48, 0xcd, 0x75, 0x69, 0x9c, 0xfe, 0x11, 0x18, 0xdd, 0xc9, 0xff, 0xe8, 0x90, 0x8a, 0xba,
-	0x9f, 0xa1, 0x66, 0x48, 0x21, 0x4f, 0x57, 0xf1, 0xda, 0x3b, 0x6d, 0x96, 0xda, 0x4e, 0xf7, 0x8b,
-	0x47, 0x4a, 0x7c, 0x21, 0x43, 0x64, 0x50, 0xe7, 0xe6, 0xfe, 0xa3, 0xf5, 0x06, 0x6a, 0xc5, 0x67,
-	0x45, 0x2c, 0xa8, 0x2c, 0xe7, 0x23, 0xea, 0x3e, 0x23, 0x75, 0xb0, 0xf5, 0xe8, 0x72, 0x34, 0x58,
-	0x5e, 0xb9, 0x25, 0x52, 0x05, 0xfd, 0xe2, 0xdc, 0x83, 0xd6, 0x4f, 0x50, 0xd1, 0xf7, 0x87, 0x38,
-	0x90, 0xdf, 0x20, 0xf7, 0x99, 0x46, 0xfb, 0x74, 0xe2, 0x96, 0x88, 0x0d, 0xcf, 0xfb, 0x74, 0xd2,
-	0x3b, 0x73, 0x0f, 0x74, 0xed, 0xe3, 0x79, 0xcf, 0x2d, 0x13, 0x80, 0xc3, 0x8f, 0xe7, 0x3d, 0xbf,
-	0x77, 0xe6, 0x56, 0x5a, 0x6b, 0x70, 0x0a, 0x59, 0x74, 0x2b, 0xca, 0x24, 0xf3, 0xd7, 0x3c, 0x09,
-	0xb0, 0x61, 0x59, 0xb4, 0x9a, 0x49, 0x76, 0xc5, 0x93, 0x40, 0x9f, 0xa8, 0x86, 0xc4, 0x0d, 0xc3,
-	0x26, 0x65, 0xd1, 0xc3, 0x4c, 0x32, 0x7a, 0xc3, 0xc8, 0x57, 0xd0, 0x58, 0x71, 0x11, 0x32, 0x7f,
-	0xaf, 0x2c, 0x23, 0x5e, 0xc3, 0xea, 0xd2, 0xc8, 0x5b, 0x7f, 0x97, 0xc0, 0xca, 0xf7, 0x8b, 0x10,
-	0xa8, 0x44, 0x4c, 0x86, 0x38, 0x85, 0x4d, 0x71, 0xac, 0x6b, 0xd8, 0xd5, 0x4c, 0x07, 0xc4, 0x31,
-	0x79, 0x05, 0x20, 0x55, 0x20, 0x14, 0xb6, 0x51, 0xb4, 0xad, 0x50, 0x1b, 0x2b, 0xba, 0x7b, 0x92,
-	0x2f, 0xc1, 0x16, 0x2c, 0xd8, 0x18, 0xb4, 0x82, 0xa8, 0xa5, 0x0b, 0x08, 0xbe, 0x02, 0x48, 0x58,
-	0xc2, 0xc5, 0x9d, 0xce, 0x85, 0xdd, 0xac, 0x42, 0x6d, 0x53, 0x59, 0x4a, 0xd6, 0xfa, 0xb7, 0x04,
-	0x8d, 0x09, 0x8f, 0xb2, 0x0d, 0x5b, 0xdc, 0x6d, 0x19, 0xa6, 0x5a, 0xe6, 0x47, 0x27, 0xef, 0xa4,
-	0x62, 0x09, 0xa6, 0x6b, 0x74, 0xbf, 0x7b, 0xfc, 0x70, 0x1f, 0x88, 0x4c, 0x13, 0x9c, 0xff, 0x3a,
-	0x5f, 0x8c, 0x26, 0x85, 0x27, 0x8c, 0x92, 0x39, 0xda, 0x90, 0xd7, 0xe0, 0x24, 0xa8, 0xf1, 0xd5,
-	0xdd, 0x36, 0x5f, 0x1f, 0x24, 0x7b, 0x1b, 0xbd, 0x81, 0x69, 0x96, 0xf8, 0x7c, 0xe5, 0x9b, 0xa2,
-	0xc4, 0x95, 0xd6, 0x69, 0x2d, 0xcd, 0x92, 0xd9, 0xca, 0xcc, 0x27, 0x5b, 0x3f, 0x82, 0x53, 0x98,
-	0xeb, 0xe1, 0x71, 0xdb, 0xf0, 0x7c, 0x3e, 0x9b, 0x4d, 0xf5, 0xbd, 0xb0, 0xa0, 0x32, 0xe9, 0xbf,
-	0x1b, 0xb9, 0x07, 0x83, 0xa3, 0xb7, 0xe5, 0xdf, 0xf2, 0x5f, 0x97, 0x8f, 0xbf, 0xae, 0xff, 0x02,
-	0x00, 0x00, 0xff, 0xff, 0x44, 0x56, 0xd0, 0xb0, 0xca, 0x06, 0x00, 0x00,
+	// 871 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x6e, 0xdb, 0x36,
+	0x14, 0xae, 0x63, 0x27, 0x96, 0x8e, 0x62, 0x57, 0x61, 0x02, 0x44, 0xed, 0x50, 0xd4, 0x30, 0xf6,
+	0xe3, 0x01, 0x9b, 0x57, 0x18, 0x81, 0x11, 0x04, 0xdb, 0x85, 0xed, 0x18, 0xa9, 0xd1, 0xda, 0x2e,
+	0x68, 0x3b, 0xeb, 0x76, 0x31, 0x41, 0x91, 0x68, 0x47, 0x9b, 0x25, 0x1a, 0x24, 0x55, 0x2c, 0x0f,
+	0xb1, 0xe7, 0xdb, 0xe5, 0x5e, 0x65, 0xe0, 0xa1, 0xe5, 0x28, 0xb9, 0x48, 0xd1, 0x3b, 0xf2, 0x7c,
+	0x3f, 0xfc, 0x48, 0x91, 0x47, 0x50, 0x4b, 0x98, 0x12, 0x71, 0x28, 0xdb, 0x1b, 0xc1, 0x15, 0x27,
+	0xb5, 0x9b, 0x2c, 0x5e, 0x47, 0xfe, 0xb6, 0xd8, 0xfc, 0xd7, 0x06, 0x67, 0x6c, 0xc6, 0xfd, 0x40,
+	0x32, 0xf2, 0x06, 0x4e, 0x0c, 0x21, 0x0a, 0x14, 0xf3, 0x55, 0x9c, 0x30, 0xa9, 0x82, 0x64, 0xe3,
+	0x95, 0x1a, 0xa5, 0x56, 0x99, 0x12, 0xc4, 0x2e, 0x03, 0xc5, 0xe6, 0x39, 0x42, 0x5e, 0x80, 0x65,
+	0x14, 0x71, 0xe4, 0xed, 0x35, 0x4a, 0x2d, 0x9b, 0x56, 0x71, 0x3e, 0x8a, 0xc8, 0x05, 0xbc, 0xd8,
+	0xac, 0x03, 0xb5, 0xe4, 0x22, 0xf1, 0x3f, 0x31, 0x21, 0x63, 0x9e, 0xfa, 0x21, 0x8f, 0x58, 0x1a,
+	0x24, 0xcc, 0x2b, 0x23, 0xf7, 0x34, 0x27, 0x5c, 0x1b, 0x7c, 0xb0, 0x85, 0xc9, 0x37, 0x50, 0x57,
+	0x81, 0x58, 0x31, 0xe5, 0x6f, 0x04, 0x8f, 0xb2, 0x50, 0x79, 0x15, 0x14, 0xd4, 0x4c, 0xf5, 0x83,
+	0x29, 0x92, 0x3f, 0xe0, 0x64, 0x4b, 0x33, 0x21, 0x3e, 0x05, 0x22, 0x0e, 0x52, 0xe5, 0xed, 0x37,
+	0x4a, 0xad, 0x7a, 0xe7, 0xbb, 0xf6, 0x83, 0xdd, 0xb6, 0x0b, 0x3b, 0x6d, 0xf7, 0x17, 0xa3, 0xf7,
+	0x97, 0xd7, 0x3d, 0x3a, 0xea, 0x4d, 0xe6, 0x17, 0xe5, 0xe1, 0xe4, 0x8a, 0x12, 0xe3, 0xd4, 0xd7,
+	0x92, 0x6b, 0xe3, 0x43, 0x46, 0xe0, 0x6c, 0xfd, 0x03, 0x11, 0xde, 0x7a, 0x07, 0x68, 0xfb, 0xfa,
+	0x09, 0xdb, 0x1e, 0x1d, 0xbc, 0xbd, 0xa8, 0x2e, 0x26, 0xef, 0x26, 0xd3, 0x5f, 0x27, 0x14, 0x8c,
+	0xb8, 0x27, 0xc2, 0x5b, 0xd2, 0x86, 0xe3, 0x82, 0xd5, 0x2e, 0x69, 0x15, 0xb7, 0x75, 0x74, 0x4f,
+	0xcc, 0x97, 0xfe, 0x01, 0xb6, 0x81, 0xfc, 0x70, 0x93, 0xed, 0xe8, 0x16, 0xd2, 0x5d, 0x83, 0x0c,
+	0x36, 0x59, 0xce, 0x1e, 0x82, 0x7d, 0xcb, 0xe5, 0x36, 0xa6, 0xfd, 0x85, 0x31, 0x2d, 0x2d, 0xc5,
+	0x90, 0xef, 0xa1, 0x86, 0x36, 0x9d, 0x34, 0x32, 0x56, 0xf0, 0x85, 0x56, 0x8e, 0x96, 0x77, 0xd2,
+	0x08, 0xdd, 0x4e, 0xa1, 0x8a, 0x6e, 0x5c, 0x7a, 0x0e, 0xe6, 0x3e, 0xd0, 0xd3, 0xa9, 0x24, 0xcd,
+	0xed, 0x32, 0x5c, 0xfa, 0xec, 0x6f, 0x25, 0x02, 0xef, 0x10, 0x61, 0xc7, 0xc0, 0x43, 0x5d, 0xda,
+	0x71, 0x42, 0xc1, 0xa5, 0xd4, 0x16, 0xb5, 0x7b, 0xce, 0x40, 0xd7, 0xa6, 0x92, 0x7c, 0x0b, 0xcf,
+	0x0b, 0x1c, 0x0c, 0x5c, 0x37, 0xd7, 0x64, 0xc7, 0xc2, 0x20, 0x3f, 0xc2, 0x71, 0x81, 0xb7, 0xdb,
+	0xdc, 0x73, 0x73, 0x98, 0x3b, 0x6e, 0x21, 0x37, 0xcf, 0x94, 0x1f, 0xc5, 0xc2, 0x73, 0x4d, 0x6e,
+	0x9e, 0xa9, 0xcb, 0x58, 0x90, 0x73, 0x70, 0x24, 0x53, 0xd9, 0xc6, 0x57, 0x9c, 0xaf, 0xa5, 0x77,
+	0xd4, 0x28, 0xb7, 0x9c, 0xce, 0xe9, 0xa3, 0xc3, 0xf9, 0xc0, 0xc4, 0x72, 0x94, 0x2e, 0x39, 0x05,
+	0xe4, 0xce, 0x35, 0x95, 0x9c, 0x81, 0xfd, 0x57, 0xa0, 0x62, 0x5f, 0x64, 0xa9, 0xf4, 0xc8, 0xd3,
+	0x3a, 0x4b, 0x33, 0x69, 0x96, 0x4a, 0xd2, 0x05, 0x90, 0x9c, 0xa7, 0x2b, 0x23, 0x3b, 0x7e, 0x5a,
+	0x66, 0x23, 0x35, 0xd7, 0xa5, 0x71, 0xfa, 0x67, 0x60, 0x74, 0x27, 0x9f, 0xd1, 0x21, 0x15, 0x75,
+	0xbf, 0xc0, 0xa1, 0x21, 0x85, 0x3c, 0x5d, 0xc6, 0x2b, 0xef, 0xb4, 0x51, 0x6a, 0x39, 0x9d, 0x97,
+	0x8f, 0x94, 0xf8, 0x42, 0x06, 0xc8, 0xa0, 0xce, 0xcd, 0xfd, 0x84, 0xbc, 0x04, 0xbc, 0x49, 0xf8,
+	0xbe, 0x3d, 0x3c, 0xb8, 0xdd, 0xbc, 0xf9, 0x06, 0x0e, 0x8b, 0x4f, 0x8e, 0x58, 0x50, 0x59, 0xcc,
+	0x86, 0xd4, 0x7d, 0x46, 0x6a, 0x60, 0xeb, 0xd1, 0xe5, 0xb0, 0xbf, 0xb8, 0x72, 0x4b, 0xa4, 0x0a,
+	0xfa, 0x35, 0xba, 0x7b, 0xcd, 0x9f, 0xa1, 0xa2, 0xef, 0x16, 0x71, 0x20, 0xbf, 0x5d, 0xee, 0x33,
+	0x8d, 0xf6, 0xe8, 0xd8, 0x2d, 0x11, 0x1b, 0xf6, 0x7b, 0x74, 0xdc, 0x3d, 0x73, 0xf7, 0x74, 0xed,
+	0xe3, 0x79, 0xd7, 0x2d, 0x13, 0x80, 0x83, 0x8f, 0xe7, 0x5d, 0xbf, 0x7b, 0xe6, 0x56, 0x9a, 0x2b,
+	0x70, 0x0a, 0x39, 0x75, 0x9b, 0xca, 0x24, 0xf3, 0x57, 0x3c, 0x09, 0xb0, 0x99, 0x59, 0xb4, 0x9a,
+	0x49, 0x76, 0xc5, 0x93, 0x40, 0x7f, 0x6d, 0x0d, 0x89, 0x1b, 0x86, 0x0d, 0xcc, 0xa2, 0x07, 0x99,
+	0x64, 0xf4, 0x86, 0x91, 0xaf, 0xa1, 0xbe, 0xe4, 0x22, 0x64, 0xfe, 0x4e, 0x59, 0x46, 0xfc, 0x10,
+	0xab, 0x0b, 0x23, 0x6f, 0xfe, 0x53, 0x02, 0x2b, 0x3f, 0x4b, 0x42, 0xa0, 0x12, 0x31, 0x19, 0xe2,
+	0x12, 0x36, 0xc5, 0xb1, 0xae, 0xe1, 0x89, 0x98, 0xee, 0x88, 0x63, 0xf2, 0x0a, 0x40, 0xaa, 0x40,
+	0x28, 0x6c, 0xb1, 0x68, 0x5b, 0xa1, 0x36, 0x56, 0x74, 0x67, 0x25, 0x5f, 0x81, 0x2d, 0x58, 0xb0,
+	0x36, 0x68, 0x05, 0x51, 0x4b, 0x17, 0x10, 0x7c, 0x05, 0x90, 0xb0, 0x84, 0x8b, 0x3b, 0x9d, 0x0b,
+	0x3b, 0x5d, 0x85, 0xda, 0xa6, 0xb2, 0x90, 0xac, 0xf9, 0x5f, 0x09, 0xea, 0x63, 0x1e, 0x65, 0x6b,
+	0x36, 0xbf, 0xdb, 0x30, 0x4c, 0xb5, 0xc8, 0x3f, 0xab, 0xbc, 0x93, 0x8a, 0x25, 0x98, 0xae, 0xde,
+	0xf9, 0xfe, 0xf1, 0xa3, 0x7e, 0x20, 0x32, 0x0d, 0x72, 0xf6, 0xdb, 0x6c, 0x3e, 0x1c, 0x17, 0x9e,
+	0x37, 0x4a, 0x66, 0x68, 0x43, 0x5e, 0x83, 0x93, 0xa0, 0xc6, 0x57, 0x77, 0x9b, 0x7c, 0x7f, 0x90,
+	0xec, 0x6c, 0xf4, 0x01, 0xa6, 0x59, 0xe2, 0xf3, 0xa5, 0x6f, 0x8a, 0x12, 0x77, 0x5a, 0xa3, 0x87,
+	0x69, 0x96, 0x4c, 0x97, 0x66, 0x3d, 0xd9, 0xfc, 0x09, 0x9c, 0xc2, 0x5a, 0x0f, 0x3f, 0xb7, 0x0d,
+	0xfb, 0xb3, 0xe9, 0x74, 0xa2, 0xef, 0x85, 0x05, 0x95, 0x71, 0xef, 0xdd, 0xd0, 0xdd, 0xeb, 0x1f,
+	0xbd, 0x2d, 0xff, 0x9e, 0xff, 0xd6, 0x7c, 0xfc, 0xad, 0xfd, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x66,
+	0x62, 0xba, 0xc0, 0xe6, 0x06, 0x00, 0x00,
 }
diff --git a/ui/metrics/metrics_proto/metrics.proto b/ui/metrics/metrics_proto/metrics.proto
index adecaf31f..5d26b673d 100644
--- a/ui/metrics/metrics_proto/metrics.proto
+++ b/ui/metrics/metrics_proto/metrics.proto
@@ -93,6 +93,9 @@ message MetricsBase {
   repeated PerfInfo ninja_runs = 20;
 
   optional BuildConfig build_config = 23;
+
+  // The hostname of the machine.
+  optional string hostname = 24;
 }
 
 message BuildConfig {