Skip to content

Commit da8cf0d

Browse files
committed
Revert "chore: add code to exclude console logger when using testadapter"
This reverts commit 8551dbf.
1 parent 8551dbf commit da8cf0d

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
using BenchmarkDotNet.Configs;
2-
using BenchmarkDotNet.Loggers;
32
using BenchmarkDotNet.Running;
43
using BenchmarkDotNet.TestAdapter.Remoting;
54
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
65
using System;
76
using System.Collections.Generic;
8-
using System.Collections.Immutable;
97
using System.Linq;
10-
using System.Reflection;
118
using System.Threading;
129

1310
namespace BenchmarkDotNet.TestAdapter
@@ -17,9 +14,6 @@ namespace BenchmarkDotNet.TestAdapter
1714
/// </summary>
1815
internal class BenchmarkExecutor
1916
{
20-
// Gets FieldInfo of ImmutableConfig's loggers.
21-
private static readonly FieldInfo? loggersField = typeof(ImmutableConfig).GetField("loggers", BindingFlags.Instance | BindingFlags.NonPublic);
22-
2317
private readonly CancellationTokenSource cts = new ();
2418

2519
/// <summary>
@@ -70,21 +64,10 @@ public void RunBenchmarks(string assemblyPath, TestExecutionRecorderWrapper reco
7064

7165
// Modify all the benchmarks so that the event process and logger is added.
7266
benchmarks = benchmarks
73-
.Select(b =>
74-
{
75-
ImmutableConfig config = b.Config.AddEventProcessor(eventProcessor).AddLogger(logger).CreateImmutableConfig();
76-
77-
// Remove console logger from ImmutableCofig to fix duplicated console logs are outputted issue.
78-
if (loggersField != null && loggersField.DeclaringType == typeof(ImmutableHashSet))
79-
{
80-
var loggers = config.GetLoggers()
81-
.Where(x => x is not ConsoleLogger)
82-
.ToImmutableHashSet();
83-
loggersField.SetValue(config, loggers);
84-
}
85-
86-
return new BenchmarkRunInfo(b.BenchmarksCases, b.Type, config);
87-
})
67+
.Select(b => new BenchmarkRunInfo(
68+
b.BenchmarksCases,
69+
b.Type,
70+
b.Config.AddEventProcessor(eventProcessor).AddLogger(logger).CreateImmutableConfig()))
8871
.ToArray();
8972

9073
// Run all the benchmarks, and ensure that any tests that don't have a result yet are sent.

src/BenchmarkDotNet.TestAdapter/Utility/LoggerHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ private void SendMessage(TestMessageLevel level, string? assemblyName, string me
5454

5555
InnerLogger.SendMessage(level, $"[BenchmarkDotNet {Stopwatch.Elapsed:hh\\:mm\\:ss\\.ff}] {assemblyText}{message}");
5656
}
57-
}
57+
}

0 commit comments

Comments
 (0)