Merge pull request #16786 from tamird/bench-quotes

cmd/benchmark: include branch and name configuration keys

pkg/cmd/benchmark/main.go

@@ -58,22 +58,22 @@ func do(ctx context.Context) error {
 	}
 
 	show, err := func() ([]byte, error) {
-		cmd := exec.CommandContext(ctx, "git", "show", "--format='%H	%cI'", "HEAD")
+		cmd := exec.CommandContext(ctx, "git", "show", "-s", "--format=%H%n%cI", "HEAD")
 		cmd.Dir = rootPkg.Dir
 		return cmd.Output()
 	}()
 	if err != nil {
 		return errors.Wrap(err, "could not determine commit hash and committer date")
 	}
-	parts := strings.Split(string(bytes.TrimSpace(show)), "	")
+	parts := strings.Split(string(bytes.TrimSpace(show)), "\n")
 	if len(parts) != 2 {
 		return errors.Errorf("expected commit hash and committer date, got %s", show)
 	}
 	commit, commitTime := parts[0], parts[1]
 
 	data, ok := os.LookupEnv(serviceAccountJSONEnv)
 	if !ok {
-		return errors.Errorf("Service account JSON environment variable %s is not set", serviceAccountJSONEnv)
+		return errors.Errorf("service account JSON environment variable %s is not set", serviceAccountJSONEnv)
 	}
 
 	conf, err := google.JWTConfigFromJSON([]byte(data), "https://www.googleapis.com/auth/userinfo.email")
@@ -135,9 +135,11 @@ func do(ctx context.Context) error {
 
 		if _, err := fmt.Fprintf(
 			buffer,
-			"commit: %s\ncommit-time: %s\niteration: %d\nstart-time: %s\n",
+			"commit: %s\ncommit-time: %s\nbranch: %s\nname: %s\niteration: %d\nstart-time: %s\n",
 			commit,
 			commitTime,
+			"master",
+			"nightly",
 			i,
 			timeutil.Now().UTC().Format(time.RFC3339),
 		); err != nil {