tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Upload build.trace.gz for user builds." into main

Browse source
This commit is contained in:
Yu Liu 2024-06-04 17:24:50 +00:00 committed by Gerrit Code Review
commit fba4e70227
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmd/soong_ui/main.go
View file

@ -155,7 +155,6 @@ func main() {
// Create a new trace file writer, making it log events to the log instance. // Create a new trace file writer, making it log events to the log instance.
trace := tracer.New(log) trace := tracer.New(log)
defer trace.Close()
// Create a new Status instance, which manages action counts and event output channels. // Create a new Status instance, which manages action counts and event output channels.
stat := &status.Status{} stat := &status.Status{}
@ -194,14 +193,29 @@ func main() {
soongMetricsFile := filepath.Join(logsDir, c.logsPrefix+"soong_metrics") soongMetricsFile := filepath.Join(logsDir, c.logsPrefix+"soong_metrics")
rbeMetricsFile := filepath.Join(logsDir, c.logsPrefix+"rbe_metrics.pb") rbeMetricsFile := filepath.Join(logsDir, c.logsPrefix+"rbe_metrics.pb")
soongBuildMetricsFile := filepath.Join(logsDir, c.logsPrefix+"soong_build_metrics.pb") soongBuildMetricsFile := filepath.Join(logsDir, c.logsPrefix+"soong_build_metrics.pb")
buildTraceFile := filepath.Join(logsDir, c.logsPrefix+"build.trace.gz")
metricsFiles := []string{ metricsFiles := []string{
buildErrorFile, // build error strings buildErrorFile, // build error strings
rbeMetricsFile, // high level metrics related to remote build execution. rbeMetricsFile, // high level metrics related to remote build execution.
soongMetricsFile, // high level metrics related to this build system. soongMetricsFile, // high level metrics related to this build system.
soongBuildMetricsFile, // high level metrics related to soong build soongBuildMetricsFile, // high level metrics related to soong build
buildTraceFile,
} }
defer func() {
stat.Finish()
criticalPath.WriteToMetrics(met)
met.Dump(soongMetricsFile)
if !config.SkipMetricsUpload() {
build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, metricsFiles...)
}
}()
// This has to come after the metrics uploading function, so that
// build.trace.gz is closed and ready for upload.
defer trace.Close()
os.MkdirAll(logsDir, 0777) os.MkdirAll(logsDir, 0777)
log.SetOutput(filepath.Join(logsDir, c.logsPrefix+"soong.log")) log.SetOutput(filepath.Join(logsDir, c.logsPrefix+"soong.log"))
@ -222,16 +236,7 @@ func main() {
config = freshConfig() config = freshConfig()
} }
defer func() {
stat.Finish()
criticalPath.WriteToMetrics(met)
met.Dump(soongMetricsFile)
if !config.SkipMetricsUpload() {
build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, metricsFiles...)
}
}()
c.run(buildCtx, config, args) c.run(buildCtx, config, args)
} }
// This function must not modify config, since product config may cause us to recreate the config, // This function must not modify config, since product config may cause us to recreate the config,