added session metadata and indexes for steps (#18)

PragmaticFlow · Oct 3, 2024 · ab58779 · ab58779
1 parent a2f7467
commit ab58779
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 9 deletions.
diff --git a/benchmarks/TimescaleBenchmark/TimescaleBenchmark.csproj b/benchmarks/TimescaleBenchmark/TimescaleBenchmark.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="AutoBogus" Version="2.13.1" />
-        <PackageReference Include="NBomber" Version="5.7.0" />
+        <PackageReference Include="NBomber" Version="5.8.0-beta.4" />
         <PackageReference Include="Dapper" Version="2.1.35" />
         <PackageReference Include="RepoDb.PostgreSql" Version="1.13.1" />
         <PackageReference Include="RepoDb.PostgreSql.BulkOperations" Version="1.13.1" />

diff --git a/examples/Demo/Demo.csproj b/examples/Demo/Demo.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>    
 
     <ItemGroup>
-      <PackageReference Include="NBomber" Version="5.7.0" />      
+      <PackageReference Include="NBomber" Version="5.8.0-beta.4" />      
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/NBomber.Sinks.Timescale/Contracts/ColumnNames.cs b/src/NBomber.Sinks.Timescale/Contracts/ColumnNames.cs
@@ -6,14 +6,17 @@ public static class ColumnNames
     public const string ScenarioTimestamp = "scenario_timestamp";
     public const string SessionId = "session_id";
     public const string CurrentOperation = "current_operation";
+    public const string Metadata = "metadata";
 
     public const string NodeInfo = "node_info";
     public const string TestSuite = "test_suite";
     public const string TestName = "test_name";
 
     public const string Scenario = "scenario";
     public const string Step = "step";
-
+    public const string SortIndex = "sort_index";
+
+
     public const string AllReqCount = "all_req_count";
     public const string AllDataAll = "all_data_all";
 

diff --git a/src/NBomber.Sinks.Timescale/Contracts/PointDbRecord.cs b/src/NBomber.Sinks.Timescale/Contracts/PointDbRecord.cs
@@ -15,6 +15,7 @@ public class PointDbRecord
 
     [Column(ColumnNames.Scenario)] public string Scenario { get; set; }
     [Column(ColumnNames.Step)] public string Step { get; set; }
+    [Column(ColumnNames.SortIndex)] public int SortIndex { get; set; }
 
     [Column(ColumnNames.AllReqCount)] public int AllReqCount { get; set; }
     [Column(ColumnNames.AllDataAll)] public long AllDataAll { get; set; }
@@ -71,5 +72,6 @@ public class NodeInfoDbRecord
     [Column(ColumnNames.CurrentOperation)] public OperationType CurrentOperation { get; set; }
     [Column(ColumnNames.TestSuite)] public string TestSuite { get; set; }
     [Column(ColumnNames.TestName)] public string TestName { get; set; }
+    [Column(ColumnNames.Metadata)] public string Metadata{ get; set; }
     [Column(ColumnNames.NodeInfo)] public string NodeInfo { get; set; }
 }
diff --git a/src/NBomber.Sinks.Timescale/NBomber.Sinks.Timescale.csproj b/src/NBomber.Sinks.Timescale/NBomber.Sinks.Timescale.csproj
@@ -20,7 +20,7 @@
     </PropertyGroup>
 
     <ItemGroup>      
-      <PackageReference Include="NBomber.Contracts" Version="5.5.0" />
+      <PackageReference Include="NBomber.Contracts" Version="5.6.0-beta.10" />
       <PackageReference Include="Npgsql" Version="8.0.4" />
       <PackageReference Include="RepoDb.PostgreSql" Version="1.13.1" />
       <PackageReference Include="RepoDb.PostgreSql.BulkOperations" Version="1.13.1" />

diff --git a/src/NBomber.Sinks.Timescale/SqlQueries.cs b/src/NBomber.Sinks.Timescale/SqlQueries.cs
@@ -18,7 +18,8 @@ CREATE TABLE IF NOT EXISTS ""{StepStatsTable}""
             ""{ColumnNames.CurrentOperation}"" TEXT,            
             
             ""{ColumnNames.Scenario}"" TEXT,
-            ""{ColumnNames.Step}"" TEXT,            
+            ""{ColumnNames.Step}"" TEXT, 
+            ""{ColumnNames.SortIndex}"" INT,
             
             ""{ColumnNames.AllReqCount}"" INT,
             ""{ColumnNames.AllDataAll}"" BIGINT,
@@ -79,6 +80,7 @@ CREATE TABLE IF NOT EXISTS ""{SessionsTable}""
             ""{ColumnNames.CurrentOperation}"" TEXT, 
             ""{ColumnNames.TestSuite}"" TEXT,
             ""{ColumnNames.TestName}"" TEXT,
+            ""{ColumnNames.Metadata}"" JSONB,
             ""{ColumnNames.NodeInfo}"" JSONB            
         );    
        ";

diff --git a/src/NBomber.Sinks.Timescale/TimescaleDbSink.cs b/src/NBomber.Sinks.Timescale/TimescaleDbSink.cs
@@ -68,7 +68,7 @@ public async Task Init(IBaseContext context, IConfiguration infraConfig)
         await migration.Run();  
     }
 
-    public async Task Start()
+    public async Task Start(SessionStartInfo sessionInfo)
     {
         if (_mainConnection != null)
         {
@@ -82,6 +82,7 @@ public async Task Start()
                 CurrentOperation = OperationType.Bombing,
                 TestSuite = testInfo.TestSuite,
                 TestName = testInfo.TestName,
+                Metadata = Json.serialize(sessionInfo),
                 NodeInfo = Json.serialize(nodeInfo)
             };
 
@@ -91,13 +92,15 @@ public async Task Start()
                         ""{ColumnNames.CurrentOperation}"",
                         ""{ColumnNames.TestSuite}"",
                         ""{ColumnNames.TestName}"",
+                        ""{ColumnNames.Metadata}"",
                         ""{ColumnNames.NodeInfo}"")
                         VALUES 
                         ('{record.Time}',
                         '{record.SessionId}',
                         '{record.CurrentOperation}',
                         '{record.TestSuite}',
                         '{record.TestName}',
+                        '{record.Metadata}'::jsonb,
                         '{record.NodeInfo}'::jsonb)";
             try
             {
@@ -164,7 +167,7 @@ private async Task SaveScenarioStats(ScenarioStats[] stats, bool isFinal = false
 
     private ScenarioStats AddGlobalInfoStep(ScenarioStats scnStats)
     {
-        var globalStepInfo = new StepStats("global information", scnStats.Ok, scnStats.Fail);
+        var globalStepInfo = new StepStats("global information", scnStats.Ok, scnStats.Fail, 0);
         scnStats.StepStats = scnStats.StepStats.Append(globalStepInfo).ToArray();
 
         return scnStats;
@@ -197,6 +200,7 @@ private PointDbRecord[] MapToPoint(ScenarioStats scnStats, DateTime currentTime)
                 CurrentOperation = nodeInfo.CurrentOperation,
                 Scenario = scnStats.ScenarioName,
                 Step = step.StepName,
+                SortIndex = step.SortIndex,
 
                 AllReqCount = step.Ok.Request.Count + step.Fail.Request.Count,
                 AllDataAll = step.Ok.DataTransfer.AllBytes + step.Fail.DataTransfer.AllBytes,

diff --git a/tests/Nbomber.Sinks.Timescale.Tests/Nbomber.Sinks.Timescale.Tests.csproj b/tests/Nbomber.Sinks.Timescale.Tests/Nbomber.Sinks.Timescale.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -16,7 +16,7 @@
     </PackageReference>
     <PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="NBomber" Version="5.7.0" />
+    <PackageReference Include="NBomber" Version="5.8.0-beta.4" />
 	<PackageReference Include="RepoDb.PostgreSql" Version="1.13.1" />
     <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">