feat: update gatling 3.11.4 (#5)

* feat: update gatling 3.11.4 * feat: update gatling 3.11.4
galax-io · Jun 26, 2024 · 38cfc29 · 38cfc29
1 parent d886f6f
commit 38cfc29
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 18 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,7 +2,7 @@ import sbt.*
 
 object Dependencies {
 
-  val gatlingVersion = "3.10.5"
+  val gatlingVersion = "3.11.4"
 
   lazy val gatlingCore: Seq[ModuleID] = Seq(
     "io.gatling" % "gatling-core",

diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
 # suppress inspection "UnusedProperty"
-sbt.version=1.9.9
+sbt.version=1.10.0
diff --git a/src/main/scala/org/galaxio/gatling/jdbc/actions/DBBatchAction.scala b/src/main/scala/org/galaxio/gatling/jdbc/actions/DBBatchAction.scala
@@ -7,6 +7,7 @@ import io.gatling.core.session.{Expression, Session}
 import io.gatling.core.structure.ScenarioContext
 import io.gatling.core.util.NameGen
 import actions.{BatchAction, BatchInsertAction, BatchUpdateAction}
+import io.gatling.core.stats.StatsEngine
 import org.galaxio.gatling.jdbc.db._
 
 final case class DBBatchAction(
@@ -80,7 +81,7 @@ final case class DBBatchAction(
       ))
       .onFailure(m =>
         batchName(session).map { rn =>
-          ctx.coreComponents.statsEngine.logCrash(session.scenario, session.groups, rn, m)
+          ctx.coreComponents.statsEngine.logRequestCrash(session.scenario, session.groups, rn, m)
           executeNext(
             session,
             ctx.coreComponents.clock.nowMillis,
@@ -94,4 +95,6 @@ final case class DBBatchAction(
         },
       )
   }
+
+  override def statsEngine: StatsEngine = ctx.coreComponents.statsEngine
 }
diff --git a/src/main/scala/org/galaxio/gatling/jdbc/actions/DBCallAction.scala b/src/main/scala/org/galaxio/gatling/jdbc/actions/DBCallAction.scala
@@ -4,6 +4,7 @@ import io.gatling.commons.stats.{KO, OK}
 import io.gatling.commons.validation._
 import io.gatling.core.action.{Action, ChainableAction}
 import io.gatling.core.session.{Expression, Session}
+import io.gatling.core.stats.StatsEngine
 import io.gatling.core.structure.ScenarioContext
 import io.gatling.core.util.NameGen
 import org.galaxio.gatling.jdbc.db.SQL
@@ -48,7 +49,7 @@ case class DBCallAction(
       ))
       .onFailure(m =>
         requestName(session).map { rn =>
-          ctx.coreComponents.statsEngine.logCrash(session.scenario, session.groups, rn, m)
+          ctx.coreComponents.statsEngine.logRequestCrash(session.scenario, session.groups, rn, m)
           executeNext(
             session,
             ctx.coreComponents.clock.nowMillis,
@@ -62,4 +63,5 @@ case class DBCallAction(
         },
       )
 
+  override def statsEngine: StatsEngine = ctx.coreComponents.statsEngine
 }
diff --git a/src/main/scala/org/galaxio/gatling/jdbc/actions/DBInsertAction.scala b/src/main/scala/org/galaxio/gatling/jdbc/actions/DBInsertAction.scala
@@ -4,6 +4,7 @@ import io.gatling.commons.stats.{KO, OK}
 import io.gatling.commons.validation._
 import io.gatling.core.action.{Action, ChainableAction}
 import io.gatling.core.session.{Expression, Session}
+import io.gatling.core.stats.StatsEngine
 import io.gatling.core.structure.ScenarioContext
 import io.gatling.core.util.NameGen
 import org.galaxio.gatling.jdbc.db.SQL
@@ -39,7 +40,7 @@ case class DBInsertAction(
       ))
       .onFailure(m =>
         requestName(session).map { rn =>
-          ctx.coreComponents.statsEngine.logCrash(session.scenario, session.groups, rn, m)
+          ctx.coreComponents.statsEngine.logRequestCrash(session.scenario, session.groups, rn, m)
           executeNext(
             session,
             ctx.coreComponents.clock.nowMillis,
@@ -53,4 +54,5 @@ case class DBInsertAction(
         },
       )
 
+  override def statsEngine: StatsEngine = ctx.coreComponents.statsEngine
 }
diff --git a/src/main/scala/org/galaxio/gatling/jdbc/actions/DBQueryAction.scala b/src/main/scala/org/galaxio/gatling/jdbc/actions/DBQueryAction.scala
@@ -5,6 +5,7 @@ import io.gatling.commons.validation.{Failure => GFailure, _}
 import io.gatling.core.action.{Action, ChainableAction}
 import io.gatling.core.check.Check
 import io.gatling.core.session.{Expression, Session}
+import io.gatling.core.stats.StatsEngine
 import io.gatling.core.structure.ScenarioContext
 import io.gatling.core.util.NameGen
 import org.galaxio.gatling.jdbc.db.SQL
@@ -72,7 +73,7 @@ case class DBQueryAction(
       ))
       .onFailure(m =>
         requestName(session).map { rn =>
-          ctx.coreComponents.statsEngine.logCrash(session.scenario, session.groups, rn, m)
+          ctx.coreComponents.statsEngine.logRequestCrash(session.scenario, session.groups, rn, m)
           executeNext(
             session,
             ctx.coreComponents.clock.nowMillis,
@@ -85,4 +86,6 @@ case class DBQueryAction(
           )
         },
       )
+
+  override def statsEngine: StatsEngine = ctx.coreComponents.statsEngine
 }
diff --git a/src/main/scala/org/galaxio/gatling/jdbc/actions/DBRawQueryAction.scala b/src/main/scala/org/galaxio/gatling/jdbc/actions/DBRawQueryAction.scala
@@ -4,6 +4,7 @@ import io.gatling.commons.stats.{KO, OK}
 import io.gatling.commons.validation._
 import io.gatling.core.action.{Action, ChainableAction}
 import io.gatling.core.session.{Expression, Session}
+import io.gatling.core.stats.StatsEngine
 import io.gatling.core.structure.ScenarioContext
 import io.gatling.core.util.NameGen
 import org.galaxio.gatling.jdbc.db.SQL
@@ -36,7 +37,7 @@ case class DBRawQueryAction(requestName: Expression[String], query: Expression[S
       ))
       .onFailure(m =>
         requestName(session).map { rn =>
-          ctx.coreComponents.statsEngine.logCrash(session.scenario, session.groups, rn, m)
+          ctx.coreComponents.statsEngine.logRequestCrash(session.scenario, session.groups, rn, m)
           executeNext(
             session,
             ctx.coreComponents.clock.nowMillis,
@@ -49,4 +50,6 @@ case class DBRawQueryAction(requestName: Expression[String], query: Expression[S
           )
         },
       )
+
+  override def statsEngine: StatsEngine = ctx.coreComponents.statsEngine
 }
diff --git a/src/test/java/org/galaxio/performance/GatlingRunner.scala b/src/test/java/org/galaxio/performance/GatlingRunner.scala
@@ -1,8 +1,8 @@
 package org.galaxio.performance
 
 import io.gatling.app.Gatling
-import io.gatling.core.config.GatlingPropertiesBuilder
-import org.galaxio.performance.jdbc.test.JdbcDebugTest;
+import io.gatling.shared.cli.GatlingCliOptions
+import org.galaxio.performance.jdbc.test.JdbcDebugTest
 
 object GatlingRunner {
 
@@ -11,10 +11,17 @@ object GatlingRunner {
     // this is where you specify the class you want to run
     val simulationClass = classOf[JdbcDebugTest].getName
 
-    val props = new GatlingPropertiesBuilder
-    props.simulationClass(simulationClass)
-
-    Gatling.fromMap(props.build)
+    Gatling.main(
+      args ++
+        Array(
+          GatlingCliOptions.Simulation.shortOption,
+          simulationClass,
+          GatlingCliOptions.ResultsFolder.shortOption,
+          "results",
+          GatlingCliOptions.Launcher.shortOption,
+          "sbt",
+        ),
+    )
   }
 
 }
diff --git a/src/test/scala/org/galaxio/performance/jdbc/test/GatlingRunner.scala b/src/test/scala/org/galaxio/performance/jdbc/test/GatlingRunner.scala
@@ -1,7 +1,7 @@
 package org.galaxio.performance.jdbc.test
 
 import io.gatling.app.Gatling
-import io.gatling.core.config.GatlingPropertiesBuilder
+import io.gatling.shared.cli.GatlingCliOptions
 
 object GatlingRunner {
 
@@ -10,10 +10,17 @@ object GatlingRunner {
     // this is where you specify the class you want to run
     val simulationClass = classOf[DebugTest].getName
 
-    val props = new GatlingPropertiesBuilder
-    props.simulationClass(simulationClass)
-
-    Gatling.fromMap(props.build)
+    Gatling.main(
+      args ++
+        Array(
+          GatlingCliOptions.Simulation.shortOption,
+          simulationClass,
+          GatlingCliOptions.ResultsFolder.shortOption,
+          "results",
+          GatlingCliOptions.Launcher.shortOption,
+          "sbt",
+        ),
+    )
   }
 
 }