Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 767ce714 authored by Jeongik Cha's avatar Jeongik Cha
Browse files

Add time unit for CriticalPathInfo's fields' name 

Bug: 271526845
Test: check metrics
Change-Id: Ie7e133033371906b29caad16d0b6bcd238b9f8db
parent da4a78bf

ui/metrics/metrics_proto/metrics.pb.go

+41 −39
Original line number Diff line number Diff line
@@ -1444,10 +1444,10 @@ type CriticalPathInfo struct { 
	sizeCache     protoimpl.SizeCache

	unknownFields protoimpl.UnknownFields



	// Real time which the build system spent

	ElapsedTime *uint64 `protobuf:"varint,1,opt,name=elapsed_time,json=elapsedTime" json:"elapsed_time,omitempty"`

	// The sum of execution time of the longest path from leave to the root

	CriticalPathTime *uint64 `protobuf:"varint,2,opt,name=critical_path_time,json=criticalPathTime" json:"critical_path_time,omitempty"`

	// Real time which the build system spent in microseconds

	ElapsedTimeMicros *uint64 `protobuf:"varint,1,opt,name=elapsed_time_micros,json=elapsedTimeMicros" json:"elapsed_time_micros,omitempty"`

	// The sum of execution time of the longest path from leave to the root in microseconds

	CriticalPathTimeMicros *uint64 `protobuf:"varint,2,opt,name=critical_path_time_micros,json=criticalPathTimeMicros" json:"critical_path_time_micros,omitempty"`

	// Detailed job information in a critical path.

	CriticalPath []*JobInfo `protobuf:"bytes,4,rep,name=critical_path,json=criticalPath" json:"critical_path,omitempty"`

	// Detailed job information for long running jobs (>30 seconds). These may or may not also be on a critical path.
@@ -1486,16 +1486,16 @@ func (*CriticalPathInfo) Descriptor() ([]byte, []int) { 
	return file_metrics_proto_rawDescGZIP(), []int{11}

}



func (x *CriticalPathInfo) GetElapsedTime() uint64 {

	if x != nil && x.ElapsedTime != nil {

		return *x.ElapsedTime

func (x *CriticalPathInfo) GetElapsedTimeMicros() uint64 {

	if x != nil && x.ElapsedTimeMicros != nil {

		return *x.ElapsedTimeMicros

	}

	return 0

}



func (x *CriticalPathInfo) GetCriticalPathTime() uint64 {

	if x != nil && x.CriticalPathTime != nil {

		return *x.CriticalPathTime

func (x *CriticalPathInfo) GetCriticalPathTimeMicros() uint64 {

	if x != nil && x.CriticalPathTimeMicros != nil {

		return *x.CriticalPathTimeMicros

	}

	return 0

}
@@ -1519,8 +1519,8 @@ type JobInfo struct { 
	sizeCache     protoimpl.SizeCache

	unknownFields protoimpl.UnknownFields



	// Real time which a job spent

	ElapsedTime *uint64 `protobuf:"varint,1,opt,name=elapsed_time,json=elapsedTime" json:"elapsed_time,omitempty"`

	// Real time which a job spent in microseconds

	ElapsedTimeMicros *uint64 `protobuf:"varint,1,opt,name=elapsed_time_micros,json=elapsedTimeMicros" json:"elapsed_time_micros,omitempty"`

	// Description of a job

	JobDescription *string `protobuf:"bytes,2,opt,name=job_description,json=jobDescription" json:"job_description,omitempty"`

}
@@ -1557,9 +1557,9 @@ func (*JobInfo) Descriptor() ([]byte, []int) { 
	return file_metrics_proto_rawDescGZIP(), []int{12}

}



func (x *JobInfo) GetElapsedTime() uint64 {

	if x != nil && x.ElapsedTime != nil {

		return *x.ElapsedTime

func (x *JobInfo) GetElapsedTimeMicros() uint64 {

	if x != nil && x.ElapsedTimeMicros != nil {

		return *x.ElapsedTimeMicros

	}

	return 0

}
@@ -1842,30 +1842,32 @@ var file_metrics_proto_rawDesc = []byte{ 
	0x5f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,

	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x19, 0x6d, 0x69, 0x78, 0x65, 0x64, 0x42, 0x75,

	0x69, 0x6c, 0x64, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x6f, 0x64, 0x75, 0x6c,

	0x65, 0x73, 0x22, 0xf0, 0x01, 0x0a, 0x10, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x50,

	0x61, 0x74, 0x68, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x21, 0x0a, 0x0c, 0x65, 0x6c, 0x61, 0x70, 0x73,

	0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x65,

	0x6c, 0x61, 0x70, 0x73, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x63, 0x72,

	0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x74, 0x69, 0x6d, 0x65,

	0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c,

	0x50, 0x61, 0x74, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x0d, 0x63, 0x72, 0x69, 0x74,

	0x69, 0x63, 0x61, 0x6c, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,

	0x1c, 0x2e, 0x73, 0x6f, 0x6f, 0x6e, 0x67, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x6d, 0x65,

	0x74, 0x72, 0x69, 0x63, 0x73, 0x2e, 0x4a, 0x6f, 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x63,

	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x12, 0x48, 0x0a, 0x11, 0x6c,

	0x6f, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x6a, 0x6f, 0x62, 0x73,

	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x6f, 0x6f, 0x6e, 0x67, 0x5f, 0x62,

	0x75, 0x69, 0x6c, 0x64, 0x5f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2e, 0x4a, 0x6f, 0x62,

	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0f, 0x6c, 0x6f, 0x6e, 0x67, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e,

	0x67, 0x4a, 0x6f, 0x62, 0x73, 0x22, 0x55, 0x0a, 0x07, 0x4a, 0x6f, 0x62, 0x49, 0x6e, 0x66, 0x6f,

	0x12, 0x21, 0x0a, 0x0c, 0x65, 0x6c, 0x61, 0x70, 0x73, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65,

	0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x65, 0x6c, 0x61, 0x70, 0x73, 0x65, 0x64, 0x54,

	0x69, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x6a, 0x6f, 0x62, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72,

	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6a, 0x6f,

	0x62, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x28, 0x5a, 0x26,

	0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64, 0x2f, 0x73, 0x6f, 0x6f, 0x6e, 0x67, 0x2f, 0x75, 0x69,

	0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73,

	0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,

	0x65, 0x73, 0x22, 0x8a, 0x02, 0x0a, 0x10, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x50,

	0x61, 0x74, 0x68, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2e, 0x0a, 0x13, 0x65, 0x6c, 0x61, 0x70, 0x73,

	0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x18, 0x01,

	0x20, 0x01, 0x28, 0x04, 0x52, 0x11, 0x65, 0x6c, 0x61, 0x70, 0x73, 0x65, 0x64, 0x54, 0x69, 0x6d,

	0x65, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x12, 0x39, 0x0a, 0x19, 0x63, 0x72, 0x69, 0x74, 0x69,

	0x63, 0x61, 0x6c, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x69,

	0x63, 0x72, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x16, 0x63, 0x72, 0x69, 0x74,

	0x69, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x69, 0x63, 0x72,

	0x6f, 0x73, 0x12, 0x41, 0x0a, 0x0d, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x70,

	0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x6f, 0x6f, 0x6e,

	0x67, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2e,

	0x4a, 0x6f, 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61,

	0x6c, 0x50, 0x61, 0x74, 0x68, 0x12, 0x48, 0x0a, 0x11, 0x6c, 0x6f, 0x6e, 0x67, 0x5f, 0x72, 0x75,

	0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x6a, 0x6f, 0x62, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,

	0x32, 0x1c, 0x2e, 0x73, 0x6f, 0x6f, 0x6e, 0x67, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x6d,

	0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2e, 0x4a, 0x6f, 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0f,

	0x6c, 0x6f, 0x6e, 0x67, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x73, 0x22,

	0x62, 0x0a, 0x07, 0x4a, 0x6f, 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2e, 0x0a, 0x13, 0x65, 0x6c,

	0x61, 0x70, 0x73, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x69, 0x63, 0x72, 0x6f,

	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x11, 0x65, 0x6c, 0x61, 0x70, 0x73, 0x65, 0x64,

	0x54, 0x69, 0x6d, 0x65, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x6a, 0x6f,

	0x62, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,

	0x01, 0x28, 0x09, 0x52, 0x0e, 0x6a, 0x6f, 0x62, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,

	0x69, 0x6f, 0x6e, 0x42, 0x28, 0x5a, 0x26, 0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64, 0x2f, 0x73,

	0x6f, 0x6f, 0x6e, 0x67, 0x2f, 0x75, 0x69, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2f,

	0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,

}



var (

ui/metrics/metrics_proto/metrics.proto

+6 −6
Original line number Diff line number Diff line
@@ -321,10 +321,10 @@ message MixedBuildsInfo{ 
// CriticalPathInfo contains critical path nodes's information.

// A critical path is a path determining the minimum time needed for the whole build given perfect parallelism.

message CriticalPathInfo {

  // Real time which the build system spent

  optional uint64 elapsed_time = 1;

  // The sum of execution time of the longest path from leave to the root

  optional uint64 critical_path_time = 2;

  // Real time which the build system spent in microseconds

  optional uint64 elapsed_time_micros = 1;

  // The sum of execution time of the longest path from leave to the root in microseconds

  optional uint64 critical_path_time_micros = 2;

  // Detailed job information in a critical path.

  repeated JobInfo critical_path = 4;

  // Detailed job information for long running jobs (>30 seconds). These may or may not also be on a critical path.
@@ -332,8 +332,8 @@ message CriticalPathInfo { 
}



message JobInfo {

  // Real time which a job spent

  optional uint64 elapsed_time = 1;

  // Real time which a job spent in microseconds

  optional uint64 elapsed_time_micros = 1;

  // Description of a job

  optional string job_description = 2;

}

ui/status/critical_path.go

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ func (cp *CriticalPath) longRunningJobs() (nodes []*node) { 
func addJobInfos(jobInfos *[]*soong_metrics_proto.JobInfo, sources []*node) {

	for _, job := range sources {

		jobInfo := soong_metrics_proto.JobInfo{}

		jobInfo.ElapsedTime = proto.Uint64(uint64(job.duration.Microseconds()))

		jobInfo.ElapsedTimeMicros = proto.Uint64(uint64(job.duration.Microseconds()))

		jobInfo.JobDescription = &job.action.Description

		*jobInfos = append(*jobInfos, &jobInfo)

	}
@@ -149,8 +149,8 @@ func addJobInfos(jobInfos *[]*soong_metrics_proto.JobInfo, sources []*node) { 
func (cp *CriticalPath) WriteToMetrics(met *metrics.Metrics) {

	criticalPathInfo := soong_metrics_proto.CriticalPathInfo{}

	path, elapsedTime, criticalTime := cp.criticalPath()

	criticalPathInfo.ElapsedTime = proto.Uint64(uint64(elapsedTime.Microseconds()))

	criticalPathInfo.CriticalPathTime = proto.Uint64(uint64(criticalTime.Microseconds()))

	criticalPathInfo.ElapsedTimeMicros = proto.Uint64(uint64(elapsedTime.Microseconds()))

	criticalPathInfo.CriticalPathTimeMicros = proto.Uint64(uint64(criticalTime.Microseconds()))

	addJobInfos(&criticalPathInfo.LongRunningJobs, cp.longRunningJobs())

	addJobInfos(&criticalPathInfo.CriticalPath, path)

	met.SetCriticalPathInfo(criticalPathInfo)