update to perfana-java-client 1.6.0, and to events-gatling-maven-plug…

…in 3.1.2-events-1-SNAPSHOT, fixed IDEPathHelper for gatling highcharts update to 3.6.1
perfana · Aug 26, 2021 · d821326 · d821326
1 parent 6ed6439
commit d821326
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@
 # Simple Build Tool
 # http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
 
+.idea/
+gatling-afterburner.iml
+
 dist/*
 target/
 lib_managed/
@@ -31,31 +34,10 @@ buildNumber.properties
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
 # CMake
 cmake-build-debug/
 cmake-build-release/
 
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
 ## File-based project format:
 *.iws
 
@@ -77,4 +59,4 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
-fabric.properties
+fabric.properties
diff --git a/pom.xml b/pom.xml
@@ -13,10 +13,10 @@
         <encoding>UTF-8</encoding>
 
         <!-- dependency versioning -->
-        <gatling.version>3.3.1</gatling.version>
-        <events-gatling-maven-plugin.version>3.1.0-events-3</events-gatling-maven-plugin.version>
-        <perfana-java-client.version>1.4.3</perfana-java-client.version>
-        <test-events-wiremock.version>1.1.2</test-events-wiremock.version>
+        <gatling.version>3.6.1</gatling.version>
+        <events-gatling-maven-plugin.version>3.1.2-events-1-SNAPSHOT</events-gatling-maven-plugin.version>
+        <perfana-java-client.version>1.6.0</perfana-java-client.version>
+        <test-events-wiremock.version>1.2.0</test-events-wiremock.version>
 
         <!-- Perfana url  -->
         <perfanaUrl>http://perfana:3000</perfanaUrl>
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>2.6.2</version>
+            <version>2.7.4</version>
         </dependency>
     </dependencies>
 
@@ -164,12 +164,12 @@
                     <events>
                     <!-- here you can define events, with own properties per event,
                          so you can form instance create two wiremock events with different wiremockUrls for example -->
-                    <MyWireMockEvent>
-                        <eventFactory>nl.stokpop.event.wiremock.WiremockEventFactory</eventFactory>
-                        <enabled>${eventsEnabled}</enabled>
-                        <wiremockFilesDir>src/test/resources/wiremock</wiremockFilesDir>
-                        <wiremockUrl>${wiremockUrl}</wiremockUrl>
-                    </MyWireMockEvent>
+<!--                    <MyWireMockEvent>-->
+<!--                        <eventFactory>nl.stokpop.event.wiremock.WiremockEventFactory</eventFactory>-->
+<!--                        <enabled>${eventsEnabled}</enabled>-->
+<!--                        <wiremockFilesDir>src/test/resources/wiremock</wiremockFilesDir>-->
+<!--                        <wiremockUrl>${wiremockUrl}</wiremockUrl>-->
+<!--                    </MyWireMockEvent>-->
                     <MyPerfanaEvent>
                         <eventFactory>io.perfana.event.PerfanaEventFactory</eventFactory>
                         <enabled>${perfanaEnabled}</enabled>

diff --git a/src/test/scala/io/perfana/afterburner/gatling/helpers/IDEPathHelper.scala b/src/test/scala/io/perfana/afterburner/gatling/helpers/IDEPathHelper.scala
@@ -1,27 +1,25 @@
 package io.perfana.afterburner.gatling.helpers
 
-import java.nio.file.Path
-
-import io.gatling.commons.util.PathHelper._
+import java.nio.file.{Path, Paths}
 
 /**
   * Utility object to create the paths used throughout this loadtest script.
   */
 object IDEPathHelper {
 
-  val gatlingConfUrl: Path = getClass.getClassLoader.getResource("gatling.conf").toURI
-  val projectRootDir = gatlingConfUrl.ancestor(3)
-
-  val mavenSourcesDirectory = projectRootDir / "src" / "test" / "scala"
-  val mavenResourcesDirectory = projectRootDir / "src" / "test" / "resources"
-  val mavenTargetDirectory = projectRootDir / "target"
-  val mavenBinariesDirectory = mavenTargetDirectory / "test-classes"
+	private val gatlingConfUrl: Path = Paths.get(getClass.getClassLoader.getResource("gatling.conf").toURI)
+	private val projectRootDir = gatlingConfUrl.getParent.getParent.getParent
+	private val mavenTargetDirectory = projectRootDir.resolve("target")
 
-  val dataDirectory = mavenResourcesDirectory / "data"
-  val bodiesDirectory = mavenResourcesDirectory / "request-bodies"
+    private val mavenSrcTestDirectory = projectRootDir.resolve("src").resolve("test")
 
-  val recorderOutputDirectory = mavenSourcesDirectory
-  val resultsDirectory = mavenTargetDirectory / "results"
+    val mavenSourcesDirectory = mavenSrcTestDirectory.resolve("scala")
+    val mavenResourcesDirectory = mavenSrcTestDirectory.resolve("resources")
+    val mavenBinariesDirectory = mavenTargetDirectory.resolve("test-classes")
+    val resultsDirectory = mavenTargetDirectory.resolve("gatling")
+	val recorderOutputDirectory = mavenSourcesDirectory
+    val recorderConfigFile = mavenResourcesDirectory.resolve("recorder.conf")
 
-  val recorderConfigFile = mavenResourcesDirectory / "recorder.conf"
+	val dataDirectory = mavenResourcesDirectory.resolve("data")
+	val bodiesDirectory = mavenResourcesDirectory.resolve("bodies")
 }