Fix grok pattern, add attributes to benchmarking classes

Author: codebrain

build/scripts/Benchmarking.fsx

@@ -127,7 +127,7 @@ module Benchmarker =
             DotNetCli.RunCommand(fun p ->
                 { p with
                     WorkingDir = testsProjectDirectory
-                }) "run -f net46 -c Release -- Benchmark --namespace Tests"
+                }) "run -f net46 -c Release Benchmark non-interactive"
         finally
             let benchmarkOutputFiles =
                 let output = combinePaths testsProjectDirectory "BenchmarkDotNet.Artifacts"
@@ -189,7 +189,7 @@ module Benchmarker =
 
             let processor = new GrokProcessor();
             processor.Field <- new Field("_ingest._value.displayInfo")
-            processor.Patterns <- ["%{WORD:_ingest._value.class}.%{WORD:_ingest._value.method}: Job-%{WORD:_ingest._value.jobName}\\(Jit=%{WORD:_ingest._value.jit}, Runtime=%{WORD:_ingest._value.clr}, LaunchCount=%{NUMBER:_ingest._value.launchCount}, RunStrategy=%{WORD:_ingest._value.runStrategy}, TargetCount=%{NUMBER:_ingest._value.targetCount}, UnrollFactor=%{NUMBER:_ingest._value.unrollFactor}, WarmupCount=%{NUMBER:_ingest._value.warmupCount}\\)"]
+            processor.Patterns <- ["%{WORD:_ingest._value.class}.%{DATA:_ingest._value.method}: Job-%{WORD:_ingest._value.jobName}\\(Jit=%{WORD:_ingest._value.jit}, Runtime=%{WORD:_ingest._value.clr}, LaunchCount=%{NUMBER:_ingest._value.launchCount}, RunStrategy=%{WORD:_ingest._value.runStrategy}, TargetCount=%{NUMBER:_ingest._value.targetCount}, UnrollFactor=%{NUMBER:_ingest._value.unrollFactor}, WarmupCount=%{NUMBER:_ingest._value.warmupCount}\\)"]
 
             let forEachProcessor = new ForeachProcessor()
             forEachProcessor.Field <- new Field("benchmarks")

src/Tests/ClientConcepts/HighLevel/Caching/PropertyNameResolverBenchmarkTests.cs

@@ -6,6 +6,7 @@
 
 namespace Tests.ClientConcepts.HighLevel.Caching
 {
+	[BenchmarkConfig(100)]
 	public class PropertyNameResolverBenchmarkTests
 	{
 		private FieldResolver _expressionResolver;

src/Tests/Document/Multiple/Bulk/BulkDeserializationBenchmarkTests.cs

@@ -18,6 +18,7 @@
 
 namespace Tests.Document.Multiple.Bulk
 {
+	[BenchmarkConfig]
 	public class BulkDeserializationBenchmarkTests
 	{
 		private static readonly IElasticClient Client = TestClient.GetInMemoryClient();

src/Tests/Program.cs

@@ -90,6 +90,18 @@ public static void Main(string[] args)
 			}
 			else if (args[0].Equals("Benchmark", StringComparison.OrdinalIgnoreCase))
 			{
+				Console.WriteLine("Running Benchmarking.");
+				if (args[1].Equals("non-interactive", StringComparison.OrdinalIgnoreCase))
+				{
+					Console.WriteLine("Running as Non-Interactive.");
+					foreach (var benchmarkType in GetBenchmarkTypes())
+					{
+						BenchmarkRunner.Run(benchmarkType);
+					}
+					return;
+				}
+
+				Console.WriteLine("Running interactive.");
 				var benchmarkSwitcher = new BenchmarkSwitcher(GetBenchmarkTypes());
 				benchmarkSwitcher.Run(arguments);
 			}