Update gatling to support JDK11

adobe-apiplatform · Oct 21, 2019 · 576ba0d · 576ba0d
1 parent 12cb891
commit 576ba0d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 25 deletions.
diff --git a/tests/performance/gatling_tests/build.gradle b/tests/performance/gatling_tests/build.gradle
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    id "com.github.lkishalmi.gatling" version "0.7.2"
+    id "com.github.lkishalmi.gatling" version "3.2.9"
 }
 
 apply plugin: 'eclipse'
@@ -26,6 +26,13 @@ repositories {
     mavenCentral()
 }
 
+sourceSets {
+    gatling {
+        scala.srcDirs = ["src/gatling/scala/"]
+        resources.srcDirs = ["src/gatling/resoruces/"]
+    }
+}
+
 dependencies {
     gatling "io.spray:spray-json_2.12:1.3.4"
     gatling "commons-io:commons-io:2.6"

diff --git a/...ling_tests/src/gatling/scala/org/apache/openwhisk/BlockingInvokeOneActionSimulation.scala b/...ling_tests/src/gatling/scala/org/apache/openwhisk/BlockingInvokeOneActionSimulation.scala
@@ -23,8 +23,7 @@ import org.apache.openwhisk.extension.whisk.OpenWhiskProtocolBuilder
 import org.apache.openwhisk.extension.whisk.Predef._
 import io.gatling.core.Predef._
 import io.gatling.core.structure.ScenarioBuilder
-import io.gatling.core.util.Resource
-import org.apache.commons.io.FileUtils
+import io.gatling.core.util.ClasspathPackagedResource
 
 import scala.concurrent.duration._
 
@@ -56,12 +55,10 @@ class BlockingInvokeOneActionSimulation extends Simulation {
   // Define scenario
   val test: ScenarioBuilder = scenario(s"Invoke one ${if (async) "async" else "sync"} action blocking")
     .doIf(_.userId == 1) {
-      exec(
-        openWhisk("Create action")
-          .authenticate(uuid, key)
-          .action(actionName)
-          .create(FileUtils
-            .readFileToString(Resource.body(actionfile).get.file, StandardCharsets.UTF_8)))
+      exec(openWhisk("Create action")
+        .authenticate(uuid, key)
+        .action(actionName)
+        .create(ClasspathPackagedResource(actionfile, getClass.getResource(actionfile)).string(StandardCharsets.UTF_8)))
     }
     .rendezVous(connections)
     .during(5.seconds) {

diff --git a/...e/gatling_tests/src/gatling/scala/org/apache/openwhisk/ColdBlockingInvokeSimulation.scala b/...e/gatling_tests/src/gatling/scala/org/apache/openwhisk/ColdBlockingInvokeSimulation.scala
@@ -24,8 +24,7 @@ import org.apache.openwhisk.extension.whisk.Predef._
 import io.gatling.core.Predef._
 import io.gatling.core.session.Expression
 import io.gatling.core.structure.ScenarioBuilder
-import io.gatling.core.util.Resource
-import org.apache.commons.io.FileUtils
+import io.gatling.core.util.ClasspathPackagedResource
 
 import scala.concurrent.duration._
 
@@ -84,8 +83,8 @@ class ColdBlockingInvokeSimulation extends Simulation {
     }
 
   private def actionCode = {
-    val code = FileUtils
-      .readFileToString(Resource.body("nodeJSAction.js").get.file, StandardCharsets.UTF_8)
+    val code = ClasspathPackagedResource("nodeJSAction.js", getClass.getResource("nodeJSAction.js"))
+      .string(StandardCharsets.UTF_8)
     //Pad the code with empty space to increase the stored code size
     if (codeSize > 0) code + " " * codeSize else code
   }

diff --git a/.../performance/gatling_tests/src/gatling/scala/org/apache/openwhisk/LatencySimulation.scala b/.../performance/gatling_tests/src/gatling/scala/org/apache/openwhisk/LatencySimulation.scala
@@ -23,8 +23,7 @@ import java.util.Base64
 import org.apache.openwhisk.extension.whisk.Predef._
 import io.gatling.core.Predef._
 import io.gatling.core.session.Expression
-import io.gatling.core.util.Resource
-import org.apache.commons.io.FileUtils
+import io.gatling.core.util.ClasspathPackagedResource
 
 import scala.concurrent.duration._
 
@@ -65,14 +64,15 @@ class LatencySimulation extends Simulation {
    * `main` is only needed for java. This is the name of the class where the main method is located.
    */
   val actions: Seq[(String, String, String, String)] = Map(
-    "nodejs:default" -> (FileUtils
-      .readFileToString(Resource.body("nodeJSAction.js").get.file, StandardCharsets.UTF_8), "latencyTest_node", ""),
-    "python:default" -> (FileUtils
-      .readFileToString(Resource.body("pythonAction.py").get.file, StandardCharsets.UTF_8), "latencyTest_python", ""),
-    "swift:default" -> (FileUtils
-      .readFileToString(Resource.body("swiftAction.swift").get.file, StandardCharsets.UTF_8), "latencyTest_swift", ""),
-    "java:default" -> (Base64.getEncoder.encodeToString(
-      FileUtils.readFileToByteArray(Resource.body("javaAction.jar").get.file)), "latencyTest_java", "JavaAction"))
+    "nodejs:default" -> (ClasspathPackagedResource("nodeJSAction.js", getClass.getResource("nodeJSAction.js")).string(
+      StandardCharsets.UTF_8), "latencyTest_node", ""),
+    "python:default" -> (ClasspathPackagedResource("pythonAction.py", getClass.getResource("pythonAction.py")).string(
+      StandardCharsets.UTF_8), "latencyTest_python", ""),
+    "swift:default" -> (ClasspathPackagedResource("swiftAction.swift", getClass.getResource("swiftAction.swift"))
+      .string(StandardCharsets.UTF_8), "latencyTest_swift", ""),
+    "java:default" -> (Base64.getEncoder.encodeToString(ClasspathPackagedResource(
+      "javaAction.jar",
+      getClass.getResource("javaAction.jar")).bytes), "latencyTest_java", "JavaAction"))
     .filterNot(e => excludedKinds.contains(e._1))
     .map {
       case (kind, (code, name, main)) =>

diff --git a/...sts/src/gatling/scala/org/apache/openwhisk/extension/whisk/OpenWhiskProtocolBuilder.scala b/...sts/src/gatling/scala/org/apache/openwhisk/extension/whisk/OpenWhiskProtocolBuilder.scala
@@ -20,9 +20,9 @@ package org.apache.openwhisk.extension.whisk
 import java.net.URL
 
 import com.softwaremill.quicklens._
-import io.gatling.core.Predef._
 import io.gatling.core.config.GatlingConfiguration
 import io.gatling.http.Predef._
+import io.gatling.core.Predef._
 import io.gatling.http.protocol.HttpProtocol
 
 import scala.language.implicitConversions
@@ -72,7 +72,7 @@ case class OpenWhiskProtocolBuilder(private val protocol: OpenWhiskProtocol) {
   /** build the http protocol with the parameters provided by the openwhisk-protocol. */
   def build(implicit configuration: GatlingConfiguration) = {
     http
-      .baseURL(s"${protocol.protocol}://${protocol.apiHost}:${protocol.port}")
+      .baseUrl(s"${protocol.protocol}://${protocol.apiHost}:${protocol.port}")
       .contentTypeHeader("application/json")
       .userAgentHeader("gatlingLoadTest")
       .warmUp("http://google.com")