Skip to content

Commit 9b2229c

Browse files
brdeyobrdeyo
committed
Update 'ProcessResults' telemetry to include file paths.
1 parent db0fbdd commit 9b2229c

29 files changed

Lines changed: 176 additions & 180 deletions

File tree

‎src/VirtualClient/VirtualClient.Actions/CoreMark/CoreMarkExecutor.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,23 +163,22 @@ private async Task CaptureMetricsAsync(IProcessProxy process, string commandArgu
163163

164164
this.MetadataContract.Apply(telemetryContext);
165165

166-
IEnumerable<string> results = await this.LoadResultsAsync(
167-
new string[] { this.OutputFile1Path, this.OutputFile2Path },
168-
cancellationToken);
166+
IEnumerable<string> resultsFiles = new string[] { this.OutputFile1Path, this.OutputFile2Path };
169167

170-
foreach (string result in results)
168+
foreach (string filePath in resultsFiles)
171169
{
172170
if (process.IsErrored())
173171
{
174172
await this.LogProcessDetailsAsync(process, telemetryContext, "CoreMark", logToFile: true);
175173
process.ThrowIfWorkloadFailed();
176174
}
177175

178-
await this.LogProcessDetailsAsync(process, telemetryContext, "CoreMark", results: result.AsArray(), logToFile: true);
176+
KeyValuePair<string, string> results = await this.LoadResultsAsync(filePath, cancellationToken);
177+
await this.LogProcessDetailsAsync(process, telemetryContext, "CoreMark", logToFile: true, results: results);
179178

180-
if (!string.IsNullOrWhiteSpace(result))
179+
if (!string.IsNullOrWhiteSpace(results.Value))
181180
{
182-
CoreMarkMetricsParser parser = new CoreMarkMetricsParser(result);
181+
CoreMarkMetricsParser parser = new CoreMarkMetricsParser(results.Value);
183182
IList<Metric> metrics = parser.Parse();
184183

185184
this.Logger.LogMetrics(

‎src/VirtualClient/VirtualClient.Actions/CtsTraffic/CtsTrafficExecutor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,11 @@ protected async Task CaptureMetricsAsync(IProcessProxy process, string commandAr
260260
{
261261
if (this.FileSystem.File.Exists(this.StatusFileName))
262262
{
263-
string contents = await this.LoadResultsAsync(this.StatusFileName, cancellationToken);
263+
KeyValuePair<string, string> results = await this.LoadResultsAsync(this.StatusFileName, cancellationToken);
264264

265-
await this.LogProcessDetailsAsync(process, telemetryContext, $"{this.TypeName}-{this.Role}", contents.AsArray(), logToFile: true);
265+
await this.LogProcessDetailsAsync(process, telemetryContext, $"{this.TypeName}-{this.Role}", logToFile: true, results: results);
266266

267-
CtsTrafficMetricsParser parser = new CtsTrafficMetricsParser(contents);
267+
CtsTrafficMetricsParser parser = new CtsTrafficMetricsParser(results.Value);
268268
IList<Metric> metrics = parser.Parse();
269269

270270
this.Logger.LogMetrics(

‎src/VirtualClient/VirtualClient.Actions/DeathStarBench/DeathStarBenchClientExecutor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ private async Task CaptureMetricsAsync(IProcessProxy process, string commandArgu
157157
{
158158
if (!cancellationToken.IsCancellationRequested)
159159
{
160-
string results = await this.LoadResultsAsync(resultsPath, cancellationToken);
161-
await this.LogProcessDetailsAsync(process, telemetryContext, "DeathStarBench", results: results.AsArray(), logToFile: true);
160+
KeyValuePair<string, string> results = await this.LoadResultsAsync(resultsPath, cancellationToken);
161+
await this.LogProcessDetailsAsync(process, telemetryContext, "DeathStarBench", logToFile: true, results: results);
162162

163163
this.MetadataContract.AddForScenario(
164164
"DeathStarBench",
@@ -167,7 +167,7 @@ private async Task CaptureMetricsAsync(IProcessProxy process, string commandArgu
167167

168168
this.MetadataContract.Apply(telemetryContext);
169169

170-
DeathStarBenchMetricsParser deathStarBenchMetricsParser = new DeathStarBenchMetricsParser(results);
170+
DeathStarBenchMetricsParser deathStarBenchMetricsParser = new DeathStarBenchMetricsParser(results.Value);
171171
IList<Metric> metrics = deathStarBenchMetricsParser.Parse();
172172

173173
this.Logger.LogMetrics(

‎src/VirtualClient/VirtualClient.Actions/HPCG/HpcgExecutor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ private async Task CaptureMetricsAsync(IProcessProxy process, EventContext telem
140140
{
141141
foreach (string file in outputFiles)
142142
{
143-
string results = await this.LoadResultsAsync(file, cancellationToken);
143+
KeyValuePair<string, string> results = await this.LoadResultsAsync(file, cancellationToken);
144144

145-
await this.LogProcessDetailsAsync(process, telemetryContext, "Hpcg", results: results.AsArray(), logToFile: true);
145+
await this.LogProcessDetailsAsync(process, telemetryContext, "Hpcg", logToFile: true, results: results);
146146

147147
this.MetadataContract.AddForScenario(
148148
"HPCG",
@@ -152,7 +152,7 @@ private async Task CaptureMetricsAsync(IProcessProxy process, EventContext telem
152152

153153
this.MetadataContract.Apply(telemetryContext);
154154

155-
HpcgMetricsParser parser = new HpcgMetricsParser(results);
155+
HpcgMetricsParser parser = new HpcgMetricsParser(results.Value);
156156
IList<Metric> metrics = parser.Parse();
157157

158158
this.Logger.LogMetrics(

‎src/VirtualClient/VirtualClient.Actions/LAPACK/LAPACKExecutor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ private async Task CaptureMetricsAsync(IProcessProxy process, string resultsFile
184184
ErrorReason.WorkloadFailed);
185185
}
186186

187-
string results = await this.LoadResultsAsync(resultsFilePath, cancellationToken);
188-
await this.LogProcessDetailsAsync(process, telemetryContext, "LAPACK", results.AsArray(), logToFile: true);
187+
KeyValuePair<string, string> results = await this.LoadResultsAsync(resultsFilePath, cancellationToken);
188+
await this.LogProcessDetailsAsync(process, telemetryContext, "LAPACK", logToFile: true, results: results);
189189

190-
LAPACKMetricsParser lapackParser = new LAPACKMetricsParser(results);
190+
LAPACKMetricsParser lapackParser = new LAPACKMetricsParser(results.Value);
191191
IList<Metric> metrics = lapackParser.Parse();
192192

193193
this.Logger.LogMetrics(

‎src/VirtualClient/VirtualClient.Actions/Lzbench/LzbenchExecutor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ private async Task CaptureMetricsAsync(IProcessProxy process, string commandArgu
174174

175175
foreach (string file in resultsFiles)
176176
{
177-
string results = await this.LoadResultsAsync(file, cancellationToken);
178-
await this.LogProcessDetailsAsync(process, telemetryContext, "LZbench", results.AsArray(), logToFile: true);
177+
KeyValuePair<string, string> results = await this.LoadResultsAsync(file, cancellationToken);
178+
await this.LogProcessDetailsAsync(process, telemetryContext, "LZbench", logToFile: true, results: results);
179179

180-
LzbenchMetricsParser parser = new LzbenchMetricsParser(results);
180+
LzbenchMetricsParser parser = new LzbenchMetricsParser(results.Value);
181181
IList<Metric> metrics = parser.Parse();
182182

183183
this.Logger.LogMetrics(

‎src/VirtualClient/VirtualClient.Actions/MLPerf/MLPerfExecutor.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,10 +396,10 @@ private async Task CaptureMetricsAsync(IProcessProxy process, EventContext telem
396396

397397
foreach (string file in resultsFiles)
398398
{
399-
string results = await this.LoadResultsAsync(file, cancellationToken);
400-
await this.LogProcessDetailsAsync(process, telemetryContext, "MLPerf", results: results.AsArray(), logToFile: true);
399+
KeyValuePair<string, string> results = await this.LoadResultsAsync(file, cancellationToken);
400+
await this.LogProcessDetailsAsync(process, telemetryContext, "MLPerf", logToFile: true, results: results);
401401

402-
MLPerfMetricsParser parser = new MLPerfMetricsParser(results, accuracyMode: true);
402+
MLPerfMetricsParser parser = new MLPerfMetricsParser(results.Value, accuracyMode: true);
403403
IList<Metric> metrics = parser.Parse();
404404

405405
this.Logger.LogMetrics(
@@ -422,10 +422,10 @@ private async Task CaptureMetricsAsync(IProcessProxy process, EventContext telem
422422

423423
foreach (string file in resultsFiles)
424424
{
425-
string results = await this.LoadResultsAsync(file, cancellationToken);
426-
await this.LogProcessDetailsAsync(process, telemetryContext, "MLPerf", results: results.AsArray(), logToFile: true);
425+
KeyValuePair<string, string> results = await this.LoadResultsAsync(file, cancellationToken);
426+
await this.LogProcessDetailsAsync(process, telemetryContext, "MLPerf", logToFile: true, results: results);
427427

428-
MLPerfMetricsParser parser = new MLPerfMetricsParser(results, accuracyMode: false);
428+
MLPerfMetricsParser parser = new MLPerfMetricsParser(results.Value, accuracyMode: false);
429429
IList<Metric> metrics = parser.Parse();
430430

431431
this.Logger.LogMetrics(

‎src/VirtualClient/VirtualClient.Actions/Network/NetworkingWorkload/NTttcp/NTttcpExecutor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ await this.ProcessStartRetryPolicy.ExecuteAsync(async () =>
340340
else
341341
{
342342
string results = await this.WaitForResultsAsync(TimeSpan.FromMinutes(1), relatedContext);
343-
await this.LogProcessDetailsAsync(process, relatedContext, "NTttcp", results: results.AsArray());
343+
await this.LogProcessDetailsAsync(process, relatedContext, "NTttcp", results: new KeyValuePair<string, string>(this.ResultsPath, results));
344344

345345
this.CaptureMetrics(
346346
results,

‎src/VirtualClient/VirtualClient.Actions/Network/NetworkingWorkload/SockPerf/SockPerfClientExecutor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ await this.ProcessStartRetryPolicy.ExecuteAsync(async () =>
7575
else
7676
{
7777
string results = await this.WaitForResultsAsync(TimeSpan.FromMinutes(1), relatedContext);
78-
await this.LogProcessDetailsAsync(process, relatedContext, "SockPerf", results: results.AsArray());
78+
await this.LogProcessDetailsAsync(process, relatedContext, "SockPerf", results: new KeyValuePair<string, string>(this.ResultsPath, results));
7979

8080
this.CaptureMetrics(
8181
results,

‎src/VirtualClient/VirtualClient.Actions/Network2/NetworkingWorkload2/NTttcp/NTttcpExecutor2.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ await this.ProcessStartRetryPolicy.ExecuteAsync(async () =>
371371

372372
await this.WaitForResultsAsync(TimeSpan.FromMinutes(2), relatedContext, cancellationToken);
373373

374-
string results = await this.LoadResultsAsync(this.ResultsPath, cancellationToken);
375-
await this.LogProcessDetailsAsync(process, relatedContext, "NTttcp", results: results.AsArray(), logToFile: true);
374+
KeyValuePair<string, string> results = await this.LoadResultsAsync(this.ResultsPath, cancellationToken);
375+
await this.LogProcessDetailsAsync(process, relatedContext, "NTttcp", logToFile: true, results: results);
376376
}
377377
}
378378
catch (TimeoutException exc)
@@ -411,12 +411,12 @@ protected async Task CaptureMetricsAsync(string commandArguments, DateTime start
411411

412412
if (fileAccess.Exists(this.ResultsPath))
413413
{
414-
string resultsContent = await this.LoadResultsAsync(this.ResultsPath, CancellationToken.None);
414+
KeyValuePair<string, string> results = await this.LoadResultsAsync(this.ResultsPath, CancellationToken.None);
415415

416-
if (!string.IsNullOrWhiteSpace(resultsContent))
416+
if (!string.IsNullOrWhiteSpace(results.Value))
417417
{
418418
bool isRoleClient = (this.Role == ClientRole.Client) ? true : false;
419-
MetricsParser parser = new NTttcpMetricsParser2(resultsContent, isRoleClient);
419+
MetricsParser parser = new NTttcpMetricsParser2(results.Value, isRoleClient);
420420
IList<Metric> metrics = parser.Parse();
421421

422422
if (parser.Metadata.Any())

0 commit comments

Comments
 (0)