From 389c3e9cea0e1f2b34d475e858942ae9c6f12e05 Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Fri, 26 Jul 2024 13:33:42 +0200
Subject: all: make coverage-merger client name configurable

---
 tools/syz-bq.sh                          |  4 +++-
 tools/syz-covermerger/syz_covermerger.go | 23 ++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/syz-bq.sh b/tools/syz-bq.sh
index cc45be917..f15de82cf 100755
--- a/tools/syz-bq.sh
+++ b/tools/syz-bq.sh
@@ -5,7 +5,7 @@
 set -e # exit on any problem
 set -o pipefail
 
-while getopts w:d:t:n:r:b: option
+while getopts w:d:t:n:r:b:c: option
 do
     case "${option}"
         in
@@ -15,6 +15,7 @@ do
         n)namespace=${OPTARG};;
         r)repo=${OPTARG};;
         b)branch=${OPTARG};;
+        c)client_name=${OPTARG};;
     esac
 done
 
@@ -128,6 +129,7 @@ go run ./tools/syz-covermerger/ -workdir $workdir \
   -branch $branch \
   -commit $base_commit \
   -to-dashapi https://syzkaller.appspot.com \
+  -dashboard-client-name $client_name \
   -namespace $namespace \
   -duration $duration \
   -date-to $to_date \
diff --git a/tools/syz-covermerger/syz_covermerger.go b/tools/syz-covermerger/syz_covermerger.go
index b2d10cc1e..2f2d820a7 100644
--- a/tools/syz-covermerger/syz_covermerger.go
+++ b/tools/syz-covermerger/syz_covermerger.go
@@ -22,14 +22,15 @@ import (
 var (
 	flagWorkdir = flag.String("workdir", "workdir-cover-aggregation",
 		"[optional] used to clone repos")
-	flagRepo      = flag.String("repo", "", "[required] repo to be used as an aggregation point")
-	flagBranch    = flag.String("branch", "", "[required] branch to be used as an aggregation point")
-	flagCommit    = flag.String("commit", "", "[required] commit hash to be used as an aggregation point")
-	flagNamespace = flag.String("namespace", "upstream", "[optional] target namespace")
-	flagDuration  = flag.Int64("duration", 0, "[optional] used to mark DB records")
-	flagDateTo    = flag.String("date-to", "", "[optional] used to mark DB records")
-	flagTotalRows = flag.Int64("total-rows", 0, "[optional] source size, is used for version contol")
-	flagToDashAPI = flag.String("to-dashapi", "", "[optional] dashapi address")
+	flagRepo                = flag.String("repo", "", "[required] repo to be used as an aggregation point")
+	flagBranch              = flag.String("branch", "", "[required] branch to be used as an aggregation point")
+	flagCommit              = flag.String("commit", "", "[required] commit hash to be used as an aggregation point")
+	flagNamespace           = flag.String("namespace", "upstream", "[optional] target namespace")
+	flagDuration            = flag.Int64("duration", 0, "[optional] used to mark DB records")
+	flagDateTo              = flag.String("date-to", "", "[optional] used to mark DB records")
+	flagTotalRows           = flag.Int64("total-rows", 0, "[optional] source size, is used for version contol")
+	flagToDashAPI           = flag.String("to-dashapi", "", "[optional] dashapi address")
+	flagDashboardClientName = flag.String("dashboard-client-name", "coverage-merger", "[optional]")
 )
 
 func main() {
@@ -55,7 +56,7 @@ func main() {
 	}
 	coverage, _, _ := mergeResultsToCoverage(mergeResult)
 	if *flagToDashAPI != "" {
-		if err := saveCoverage(*flagToDashAPI, &dashapi.MergedCoverage{
+		if err := saveCoverage(*flagToDashAPI, *flagDashboardClientName, &dashapi.MergedCoverage{
 			Namespace: *flagNamespace,
 			Repo:      *flagRepo,
 			Commit:    *flagCommit,
@@ -69,8 +70,8 @@ func main() {
 	}
 }
 
-func saveCoverage(dashboard string, d *dashapi.MergedCoverage) error {
-	dash, err := dashapi.New("coverage-merger", dashboard, "")
+func saveCoverage(dashboard, clientName string, d *dashapi.MergedCoverage) error {
+	dash, err := dashapi.New(clientName, dashboard, "")
 	if err != nil {
 		log.Panicf("failed dashapi.New(): %v", err)
 	}
-- 
cgit mrf-deployment