Merge pull request #17849 from rchande/simplifyBenchview

Have perf.runner configure benchview so internal test's don't have to

src/Test/Perf/Runner/Program.cs

@@ -47,6 +47,8 @@ public static int Main(string[] args)
                 {
                     return -1;
                 }
+
+                Benchview.SetConfiguration(submissionType, branch);
             }
 
             Cleanup();
@@ -60,7 +62,7 @@ public static int Main(string[] args)
             if (shouldReportBenchview)
             {
                 Log("Uploading results to benchview");
-                Benchview.UploadBenchviewReport(submissionType, submissionName, branch);
+                Benchview.UploadBenchviewReport(submissionName);
             }
 
             if (shouldUploadTrace)

src/Test/Perf/Utilities/Benchview.cs

@@ -16,6 +16,9 @@ public static class Benchview
         private static readonly string s_outputDirectory = GetCPCDirectoryPath();
         private static readonly string[] s_validSubmissionTypes = new string[] { "rolling", "private", "local" };
 
+        private static string s_submissionType;
+        private static string s_branch;
+
         public static string[] ValidSubmissionTypes
         {
             get
@@ -63,20 +66,26 @@ public static bool CheckEnvironment()
             return true;
         }
 
-        public static void UploadBenchviewReport(string submissionType, string submissionName, string branch)
+        public static void SetConfiguration(string submissionType, string branch)
+        {
+            s_submissionType = submissionType;
+            s_branch = branch;
+        }
+
+        public static void UploadBenchviewReport(string submissionName)
         {
             var consumptionXml = Path.Combine(GetCPCDirectoryPath(), "consumptionTempResults.xml");
-            UploadBenchviewReport(consumptionXml, submissionType, submissionName, branch);
+            UploadBenchviewReport(consumptionXml, submissionName);
         }
 
-        public static void UploadBenchviewReport(string filepath, string submissionType, string submissionName, string branch)
+        public static void UploadBenchviewReport(string filepath, string submissionName)
         {
             var consumptionXml = Path.Combine(GetCPCDirectoryPath(), "consumptionTempResults.xml");
             var result = ConvertConsumptionToMeasurementJson(filepath);
 
             if (result)
             {
-                var submissionJson = CreateSubmissionJson(submissionType, submissionName, branch, Path.Combine(s_outputDirectory, "measurement.json"));
+                var submissionJson = CreateSubmissionJson(s_submissionType, submissionName, s_branch, Path.Combine(s_outputDirectory, "measurement.json"));
 
                 Log("Uploading json to Azure blob storage");
                 var uploadPy = Path.Combine(s_scriptDirectory, "upload.py");