|
@@ -18,21 +18,16 @@ package build
|
|
|
// another.
|
|
|
|
|
|
import (
|
|
|
- "bufio"
|
|
|
"fmt"
|
|
|
"io/ioutil"
|
|
|
"os"
|
|
|
"path/filepath"
|
|
|
- "strconv"
|
|
|
- "strings"
|
|
|
"time"
|
|
|
|
|
|
- "android/soong/shared"
|
|
|
"android/soong/ui/metrics"
|
|
|
|
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
|
|
- bazel_metrics_proto "android/soong/ui/metrics/bazel_metrics_proto"
|
|
|
upload_proto "android/soong/ui/metrics/upload_proto"
|
|
|
)
|
|
|
|
|
@@ -78,123 +73,16 @@ func pruneMetricsFiles(paths []string) []string {
|
|
|
return metricsFiles
|
|
|
}
|
|
|
|
|
|
-func parseTimingToNanos(str string) int64 {
|
|
|
- millisString := removeDecimalPoint(str)
|
|
|
- timingMillis, _ := strconv.ParseInt(millisString, 10, 64)
|
|
|
- return timingMillis * 1000000
|
|
|
-}
|
|
|
-
|
|
|
-func parsePercentageToTenThousandths(str string) int32 {
|
|
|
- percentageString := removeDecimalPoint(str)
|
|
|
- //remove the % at the end of the string
|
|
|
- percentage := strings.ReplaceAll(percentageString, "%", "")
|
|
|
- percentagePortion, _ := strconv.ParseInt(percentage, 10, 32)
|
|
|
- return int32(percentagePortion)
|
|
|
-}
|
|
|
-
|
|
|
-func removeDecimalPoint(numString string) string {
|
|
|
- // The format is always 0.425 or 10.425
|
|
|
- return strings.ReplaceAll(numString, ".", "")
|
|
|
-}
|
|
|
-
|
|
|
-func parseTotal(line string) int64 {
|
|
|
- words := strings.Fields(line)
|
|
|
- timing := words[3]
|
|
|
- return parseTimingToNanos(timing)
|
|
|
-}
|
|
|
-
|
|
|
-func parsePhaseTiming(line string) bazel_metrics_proto.PhaseTiming {
|
|
|
- words := strings.Fields(line)
|
|
|
- getPhaseNameAndTimingAndPercentage := func([]string) (string, int64, int32) {
|
|
|
- // Sample lines include:
|
|
|
- // Total launch phase time 0.011 s 2.59%
|
|
|
- // Total target pattern evaluation phase time 0.011 s 2.59%
|
|
|
- var beginning int
|
|
|
- var end int
|
|
|
- for ind, word := range words {
|
|
|
- if word == "Total" {
|
|
|
- beginning = ind + 1
|
|
|
- } else if beginning > 0 && word == "phase" {
|
|
|
- end = ind
|
|
|
- break
|
|
|
- }
|
|
|
- }
|
|
|
- phaseName := strings.Join(words[beginning:end], " ")
|
|
|
-
|
|
|
- // end is now "phase" - advance by 2 for timing and 4 for percentage
|
|
|
- percentageString := words[end+4]
|
|
|
- timingString := words[end+2]
|
|
|
- timing := parseTimingToNanos(timingString)
|
|
|
- percentagePortion := parsePercentageToTenThousandths(percentageString)
|
|
|
- return phaseName, timing, percentagePortion
|
|
|
- }
|
|
|
-
|
|
|
- phaseName, timing, portion := getPhaseNameAndTimingAndPercentage(words)
|
|
|
- phaseTiming := bazel_metrics_proto.PhaseTiming{}
|
|
|
- phaseTiming.DurationNanos = &timing
|
|
|
- phaseTiming.PortionOfBuildTime = &portion
|
|
|
-
|
|
|
- phaseTiming.PhaseName = &phaseName
|
|
|
- return phaseTiming
|
|
|
-}
|
|
|
-
|
|
|
-// This method takes a file created by bazel's --analyze-profile mode and
|
|
|
-// writes bazel metrics data to the provided filepath.
|
|
|
-// TODO(b/279987768) - move this outside of upload.go
|
|
|
-func processBazelMetrics(bazelProfileFile string, bazelMetricsFile string, ctx Context, config Config) {
|
|
|
- if bazelProfileFile == "" {
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- readBazelProto := func(filepath string) bazel_metrics_proto.BazelMetrics {
|
|
|
- //serialize the proto, write it
|
|
|
- bazelMetrics := bazel_metrics_proto.BazelMetrics{}
|
|
|
-
|
|
|
- file, err := os.ReadFile(filepath)
|
|
|
- if err != nil {
|
|
|
- ctx.Fatalln("Error reading metrics file\n", err)
|
|
|
- }
|
|
|
-
|
|
|
- scanner := bufio.NewScanner(strings.NewReader(string(file)))
|
|
|
- scanner.Split(bufio.ScanLines)
|
|
|
-
|
|
|
- var phaseTimings []*bazel_metrics_proto.PhaseTiming
|
|
|
- for scanner.Scan() {
|
|
|
- line := scanner.Text()
|
|
|
- if strings.HasPrefix(line, "Total run time") {
|
|
|
- total := parseTotal(line)
|
|
|
- bazelMetrics.Total = &total
|
|
|
- } else if strings.HasPrefix(line, "Total") {
|
|
|
- phaseTiming := parsePhaseTiming(line)
|
|
|
- phaseTimings = append(phaseTimings, &phaseTiming)
|
|
|
- }
|
|
|
- }
|
|
|
- bazelMetrics.PhaseTimings = phaseTimings
|
|
|
-
|
|
|
- return bazelMetrics
|
|
|
- }
|
|
|
-
|
|
|
- if _, err := os.Stat(bazelProfileFile); err != nil {
|
|
|
- // We can assume bazel didn't run if the profile doesn't exist
|
|
|
- return
|
|
|
- }
|
|
|
- bazelProto := readBazelProto(bazelProfileFile)
|
|
|
- bazelProto.ExitCode = proto.Int32(config.bazelExitCode)
|
|
|
- shared.Save(&bazelProto, bazelMetricsFile)
|
|
|
-}
|
|
|
-
|
|
|
// UploadMetrics uploads a set of metrics files to a server for analysis.
|
|
|
// The metrics files are first copied to a temporary directory
|
|
|
// and the uploader is then executed in the background to allow the user/system
|
|
|
// to continue working. Soong communicates to the uploader through the
|
|
|
// upload_proto raw protobuf file.
|
|
|
-func UploadMetrics(ctx Context, config Config, simpleOutput bool, buildStarted time.Time, bazelProfileFile string, bazelMetricsFile string, paths ...string) {
|
|
|
+func UploadMetrics(ctx Context, config Config, simpleOutput bool, buildStarted time.Time, paths ...string) {
|
|
|
ctx.BeginTrace(metrics.RunSetupTool, "upload_metrics")
|
|
|
defer ctx.EndTrace()
|
|
|
|
|
|
uploader := config.MetricsUploaderApp()
|
|
|
- processBazelMetrics(bazelProfileFile, bazelMetricsFile, ctx, config)
|
|
|
-
|
|
|
if uploader == "" {
|
|
|
// If the uploader path was not specified, no metrics shall be uploaded.
|
|
|
return
|