Skip to content

Commit b465b54

Browse files
authored
Add formatting to Summary File Logger (#519)
* final summary * save * up version * fix test * fix pr * up version * save
1 parent 8b0c8b2 commit b465b54

14 files changed

Lines changed: 416 additions & 475 deletions

File tree

.github/workflows/pull-request.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
dotnet-version: 9.0.x
3535

3636
- name: Initialize CodeQL
37+
if: false # this is causing PR to fail on Windows with single slashes on Windows, temporarily disabling since we have it in Linux PR
3738
uses: github/codeql-action/init@v2
3839
with:
3940
languages: ${{ matrix.language }}
@@ -51,6 +52,7 @@ jobs:
5152
run: ./build-test.cmd
5253

5354
- name: Perform CodeQL Analysis
55+
if: false # this is causing PR to fail on Windows with single slashes on Windows, temporarily disabling since we have it in Linux PR
5456
uses: github/codeql-action/analyze@v2
5557
with:
5658
category: "/language:${{matrix.language}}"

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.18
1+
2.0.19

src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdMetricsParserTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public void DiskSpdParserVerifyForCoreCountGreaterThan64WhichAddsProcessorGroupi
206206
var parser = new DiskSpdMetricsParser(results, "diskspd.exe -b8K -r8K -t32 -o16 -w100 -d900 -Suw -W30 -D -L -Rtext D:\\diskspd-test.dat");
207207

208208
IList<Metric> metrics = parser.Parse();
209-
metrics.LogConsole("test");
209+
metrics.LogConsole("test", "testtool");
210210

211211
// cpu metrics
212212
MetricAssert.Exists(metrics, "cpu usage 0", 92.79, "percentage");

src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierBenchmarkClientExecutorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public async Task MemtierBenchmarkClientExecutorEmitsTheExpectedMetricsRawMetric
300300

301301
await executor.ExecuteAsync(CancellationToken.None);
302302

303-
IEnumerable<Tuple<LogLevel, EventId, object, Exception>> metricsEmitted = this.mockFixture.Logger.MessagesLogged(new Regex("ScenarioResult"));
303+
IEnumerable<Tuple<LogLevel, EventId, object, Exception>> metricsEmitted = this.mockFixture.Logger.MessagesLogged(new Regex("(ScenarioResult)|(SucceededOrFailed)"));
304304
Assert.AreEqual(30, metricsEmitted.Count());
305305

306306
IEnumerable<string> expectedMetrics = new List<string>
@@ -362,7 +362,7 @@ public async Task MemtierBenchmarkClientExecutorEmitsTheExpectedMetricsAggregate
362362

363363
await executor.ExecuteAsync(CancellationToken.None);
364364

365-
IEnumerable<Tuple<LogLevel, EventId, object, Exception>> metricsEmitted = this.mockFixture.Logger.MessagesLogged(new Regex("ScenarioResult"));
365+
IEnumerable<Tuple<LogLevel, EventId, object, Exception>> metricsEmitted = this.mockFixture.Logger.MessagesLogged(new Regex("(ScenarioResult)|(SucceededOrFailed)"));
366366
Assert.AreEqual(141, metricsEmitted.Count());
367367

368368
IEnumerable<string> expectedMetrics = new List<string>

src/VirtualClient/VirtualClient.Actions/DiskSpd/DiskSpdExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ private void CaptureMetrics(DiskWorkloadProcess workload, EventContext telemetry
355355
metrics = metrics.FilterBy(this.MetricFilters).ToList();
356356
}
357357

358-
metrics.LogConsole(this.MetricScenario ?? this.Scenario);
358+
metrics.LogConsole(this.MetricScenario ?? this.Scenario, "DiskSpd");
359359

360360
this.Logger.LogMetrics(
361361
"DiskSpd",

src/VirtualClient/VirtualClient.Actions/OpenSSL/OpenSslExecutor.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ private void CaptureMetrics(IProcessProxy workloadProcess, string commandArgumen
150150
commandArguments,
151151
this.Tags,
152152
telemetryContext);
153+
154+
metrics.LogConsole(this.Scenario, "OpenSSL");
153155
}
154156
catch (SchemaException exc)
155157
{

src/VirtualClient/VirtualClient.Actions/SPECcpu/SpecCpuExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ private async Task CaptureMetricsAsync(IProcessProxy process, string commandArgu
337337

338338
SpecCpuMetricsParser parser = new SpecCpuMetricsParser(results);
339339
IList<Metric> metrics = parser.Parse();
340-
metrics.LogConsole(this.Scenario);
340+
metrics.LogConsole(this.Scenario, "SPECcpu");
341341

342342
this.Logger.LogMetrics(
343343
toolName: "SPECcpu",

src/VirtualClient/VirtualClient.Contracts.UnitTests/VirtualClientComponentTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ public async Task VirtualClientComponentLogsExpectedMetricsOnSuccessfulExecution
453453
component.Parameters.Clear();
454454
await component.ExecuteAsync(CancellationToken.None);
455455

456-
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.ScenarioResult");
456+
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.SucceededOrFailed");
457457
Assert.IsTrue(messageLogged.Count() == 1);
458458

459459
EventContext context = messageLogged.First().Item3 as EventContext;
@@ -484,7 +484,7 @@ public async Task VirtualClientComponentLogsExpectedMetricsOnSuccessfulExecution
484484
component.Parameters[nameof(component.Scenario)] = "AnyScenarioDefined";
485485
await component.ExecuteAsync(CancellationToken.None);
486486

487-
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.ScenarioResult");
487+
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.SucceededOrFailed");
488488
Assert.IsTrue(messageLogged.Count() == 1);
489489

490490
EventContext context = messageLogged.First().Item3 as EventContext;
@@ -517,8 +517,8 @@ public async Task VirtualClientComponentLogsExpectedMetricsOnSuccessfulExecution
517517

518518
await component.ExecuteAsync(CancellationToken.None);
519519

520-
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.ScenarioResult");
521-
Assert.IsTrue(messageLogged.Count() == 1);
520+
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.SucceededOrFailed");
521+
Assert.AreEqual(1, messageLogged.Count());
522522

523523
EventContext context = messageLogged.First().Item3 as EventContext;
524524

@@ -558,7 +558,7 @@ public async Task VirtualClientComponentLogsExpectedMetricsOnFailedExecutions_Sc
558558
// Exception is expected to surface.
559559
}
560560

561-
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.ScenarioResult");
561+
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.SucceededOrFailed");
562562
Assert.IsTrue(messageLogged.Count() == 1);
563563

564564
EventContext context = messageLogged.First().Item3 as EventContext;
@@ -599,8 +599,8 @@ public async Task VirtualClientComponentLogsExpectedMetricsOnFailedExecutions_Sc
599599
// Exception is expected to surface.
600600
}
601601

602-
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.ScenarioResult");
603-
Assert.IsTrue(messageLogged.Count() == 1);
602+
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.SucceededOrFailed");
603+
Assert.AreEqual(1, messageLogged.Count());
604604

605605
EventContext context = messageLogged.First().Item3 as EventContext;
606606

@@ -641,7 +641,7 @@ public async Task VirtualClientComponentLogsExpectedMetricsOnFailedExecutions_Sc
641641
// Exception is expected to surface.
642642
}
643643

644-
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.ScenarioResult");
644+
var messageLogged = this.mockFixture.Logger.MessagesLogged($"{component.TypeName}.SucceededOrFailed");
645645
Assert.IsTrue(messageLogged.Count() == 1);
646646

647647
EventContext context = messageLogged.First().Item3 as EventContext;

0 commit comments

Comments
 (0)