added IWorkerPlugin.stats:NodeStats -> Task<DataSet>

src/NBomber.Contracts/Contracts.fs

@@ -148,15 +148,15 @@ type IReportingSink =
     abstract Init: context:IBaseContext * infraConfig:IConfiguration -> Task
     abstract Start: unit -> Task
     abstract SaveRealtimeStats: stats:ScenarioStats[] -> Task
-    abstract SaveFinalStats: stats:NodeStats[] -> Task
+    abstract SaveFinalStats: stats:NodeStats -> Task
     abstract Stop: unit -> Task
 
 type IWorkerPlugin =
     inherit IDisposable
     abstract PluginName: string
     abstract Init: context:IBaseContext * infraConfig:IConfiguration -> Task
     abstract Start: unit -> Task
-    abstract GetStats: currentOperation:OperationType -> Task<DataSet>
+    abstract GetStats: stats:NodeStats -> Task<DataSet>
     abstract GetHints: unit -> string[]
     abstract Stop: unit -> Task
 

src/NBomber/Domain/Stats/Statistics.fs

@@ -205,8 +205,7 @@ module ScenarioStats =
 
 module NodeStats =
 
-    let create (testInfo: TestInfo) (nodeInfo: NodeInfo)
-               (scnStats: ScenarioStats[]) (pluginStats: DataSet[]) =
+    let create (testInfo: TestInfo) (nodeInfo: NodeInfo) (scnStats: ScenarioStats[]) =
 
         let maxDuration = scnStats |> Array.maxBy(fun x -> x.Duration) |> fun scn -> scn.Duration
 
@@ -215,7 +214,7 @@ module NodeStats =
           FailCount = scnStats |> Array.sumBy(fun x -> x.FailCount)
           AllBytes = scnStats |> Array.sumBy(fun x -> x.AllBytes)
           ScenarioStats = scnStats
-          PluginStats = pluginStats
+          PluginStats = Array.empty
           NodeInfo = nodeInfo
           TestInfo = testInfo
           ReportFiles = Array.empty

src/NBomber/DomainServices/NBomberRunner.fs

@@ -27,7 +27,7 @@ let runSession (testInfo: TestInfo) (nodeInfo: NodeInfo) (context: NBomberContex
         use testHost      = new TestHost(dep, scenarios, Scenario.getStepOrder, RunningStep.execSteps)
         let! result       = testHost.RunSession(sessionArgs)
 
-        let finalStats =
+        let! finalStats =
             Report.build dep.Logger result testHost.TargetScenarios
             |> Report.save dep ctx result.FinalStats
 

src/NBomber/DomainServices/Reports/Report.fs

@@ -91,7 +91,7 @@ let saveToFolder (logger: ILogger, folder: string, fileName: string,
     | ex -> logger.Error(ex, "Report.save failed")
             Array.empty
 
-let save (dep: IGlobalDependency) (context: NBomberContext) (stats: NodeStats) (report: ReportsContent) =
+let save (dep: IGlobalDependency) (context: NBomberContext) (stats: NodeStats) (report: ReportsContent) = backgroundTask {
 
     let fileName = context |> NBomberContext.getReportFileNameOrDefault DateTime.UtcNow
     let folder   = context |> NBomberContext.getReportFolderOrDefault stats.TestInfo.SessionId
@@ -102,11 +102,11 @@ let save (dep: IGlobalDependency) (context: NBomberContext) (stats: NodeStats) (
     if formats.Length > 0 then
         let reportFiles = saveToFolder(dep.Logger, folder, fileName, formats, report)
         let finalStats = { stats with ReportFiles = reportFiles }
-        dep.ReportingSinks
-        |> List.map(fun x -> x.SaveFinalStats [| finalStats |])
-        |> Task.WhenAll
-        |> fun t -> t.Wait()
+        do! dep.ReportingSinks
+            |> List.map(fun x -> x.SaveFinalStats finalStats)
+            |> Task.WhenAll
 
-        finalStats
+        return finalStats
     else
-        stats
+        return stats
+}

src/NBomber/DomainServices/TestHost/TestHost.fs

@@ -129,7 +129,7 @@ type internal TestHost(dep: IGlobalDependency,
         do! schedulers |> List.map(fun x -> x.Start isWarmUp) |> Task.WhenAll
 
         // wait on final metrics and reporting tick
-        do! Task.Delay(Constants.ReportingTimerCompleteMs)
+        do! Task.Delay Constants.ReportingTimerCompleteMs
 
         flushStatsTimer |> Option.iter(fun x -> x.Stop())
         reportingTimer.Stop()

src/NBomber/DomainServices/TestHost/TestHostPlugins.fs

@@ -48,11 +48,11 @@ let getHints (plugins: IWorkerPlugin list) =
     )
     |> Seq.toList
 
-let getStats (logger: ILogger) (plugins: IWorkerPlugin list) (operation: OperationType) = backgroundTask {
+let getStats (logger: ILogger) (plugins: IWorkerPlugin list) (stats: NodeStats) = backgroundTask {
     try
         let pluginStatusesTask =
             plugins
-            |> List.map(fun plugin -> plugin.GetStats operation)
+            |> List.map(fun plugin -> plugin.GetStats stats)
             |> Task.WhenAll
 
         let! finishedTask = Task.WhenAny(pluginStatusesTask, Task.Delay(Constants.GetPluginStatsTimeout))
@@ -62,7 +62,7 @@ let getStats (logger: ILogger) (plugins: IWorkerPlugin list) (operation: Operati
             return Array.empty
     with
     | ex ->
-        logger.Error(ex, "Getting plugin stats failed with the following error")
+        logger.Error("Getting plugin stats failed: {0}", ex.ToString())
         return Array.empty
 }
 

src/NBomber/DomainServices/TestHost/TestHostReportingActor.fs

@@ -34,14 +34,14 @@ let getFinalScenarioStats (schedulers: ScenarioScheduler list) =
     |> List.map(fun x -> x.GetFinalStats())
     |> Task.WhenAll
 
-let getPluginStats (dep: IGlobalDependency) (operation: OperationType) = backgroundTask {
+let getPluginStats (dep: IGlobalDependency) (stats: NodeStats) = backgroundTask {
     try
         let pluginStatusesTask =
             dep.WorkerPlugins
-            |> List.map(fun plugin -> plugin.GetStats operation)
+            |> List.map(fun plugin -> plugin.GetStats stats)
             |> Task.WhenAll
 
-        let! finishedTask = Task.WhenAny(pluginStatusesTask, Task.Delay(Constants.GetPluginStatsTimeout))
+        let! finishedTask = Task.WhenAny(pluginStatusesTask, Task.Delay Constants.GetPluginStatsTimeout)
         if finishedTask.Id = pluginStatusesTask.Id then return pluginStatusesTask.Result
         else
             dep.Logger.Error("Getting plugin stats failed with the timeout error")
@@ -57,12 +57,13 @@ let getFinalStats (dep: IGlobalDependency)
                   (testInfo: TestInfo)
                   (nodeInfo: NodeInfo) = backgroundTask {
 
-    let pluginStats = getPluginStats dep nodeInfo.CurrentOperation
-    let scenarioStats = getFinalScenarioStats schedulers
-    do! Task.WhenAll(pluginStats, scenarioStats)
+    let! scenarioStats = getFinalScenarioStats schedulers
 
-    return if Array.isEmpty scenarioStats.Result then None
-           else Some(NodeStats.create testInfo nodeInfo scenarioStats.Result pluginStats.Result)
+    if Array.isEmpty scenarioStats then return None
+    else
+        let nodeStats = NodeStats.create testInfo nodeInfo scenarioStats
+        let! pluginStats = getPluginStats dep nodeStats
+        return Some { nodeStats with PluginStats = pluginStats }
 }
 
 type ActorMessage =
@@ -104,7 +105,7 @@ type TestHostReportingActor(dep: IGlobalDependency, schedulers: ScenarioSchedule
                     |> TaskOption.map(NodeStats.round >> reply.TrySetResult)
                     |> Task.WaitAll
             with
-            | ex -> dep.Logger.Error(ex, "TestHostReporting actor failed")
+            | ex -> dep.Logger.Error("TestHostReporting actor failed: {0}", ex.ToString())
         }
         :> Task
     )

src/NBomber/NBomber.fsproj

@@ -90,7 +90,7 @@
         <PackageReference Include="FuncyDown" Version="1.3.0" />
         <PackageReference Include="HdrHistogram" Version="2.5.0" />
         <PackageReference Include="Json.Net.DataSetConverters" Version="1.1.0" />
-        <PackageReference Include="NBomber.Contracts" Version="[3.0.0-beta5]" />
+<!--        <PackageReference Include="NBomber.Contracts" Version="[3.0.0-beta5]" />-->
         <PackageReference Include="Serilog" Version="2.10.0" />
         <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
         <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
@@ -109,4 +109,7 @@
         <EmbeddedResource Include="Resources\HtmlReport\assets\css\index.css" />
         <EmbeddedResource Include="Resources\HtmlReport\index.html" />
     </ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\NBomber.Contracts\NBomber.Contracts.fsproj" />
+    </ItemGroup>
 </Project>

tests/NBomber.IntegrationTests/Plugins/PluginTests.fs

@@ -154,9 +154,8 @@ let ``GetStats should be invoked only one time when final stats fetching`` () =
             member _.Init(_, _) = Task.CompletedTask
             member _.Start() = Task.CompletedTask
 
-            member _.GetStats(operation) =
-                if operation = OperationType.Complete then
-                    pluginGetStatsInvokedCounter <- pluginGetStatsInvokedCounter + 1
+            member _.GetStats(stats) =
+                pluginGetStatsInvokedCounter <- pluginGetStatsInvokedCounter + 1
                 Task.FromResult(new DataSet())
 
             member _.GetHints() = Array.empty

tests/NBomber.IntegrationTests/StatisticsTests.fs

@@ -284,7 +284,7 @@ module NodeStatsTests =
         let scenario2 = { baseScenarioStats with RequestCount = requestCount2 }
 
         let nodeStats =
-            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |] Array.empty
+            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |]
 
         test <@ nodeStats.RequestCount = requestCount1 + requestCount2 @>
 
@@ -295,7 +295,7 @@ module NodeStatsTests =
         let scenario2 = { baseScenarioStats with OkCount = okCount2 }
 
         let nodeStats =
-            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |] Array.empty
+            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |]
 
         test <@ nodeStats.OkCount = okCount1 + okCount2 @>
 
@@ -306,7 +306,7 @@ module NodeStatsTests =
         let scenario2 = { baseScenarioStats with FailCount = failCount2 }
 
         let nodeStats =
-            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |] Array.empty
+            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |]
 
         test <@ nodeStats.FailCount = failCount1 + failCount2 @>
 
@@ -317,7 +317,7 @@ module NodeStatsTests =
         let scenario2 = { baseScenarioStats with AllBytes = allBytes2 }
 
         let nodeStats =
-            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |] Array.empty
+            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |]
 
         test <@ nodeStats.AllBytes = allBytes1 + allBytes2 @>
 
@@ -327,7 +327,7 @@ module NodeStatsTests =
         let scenario2 = { baseScenarioStats with Duration = seconds 20 }
 
         let nodeStats =
-            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |] Array.empty
+            Statistics.NodeStats.create baseTestInfo baseNodeInfo [| scenario1; scenario2 |]
 
         test <@ nodeStats.Duration = seconds 20 @>