JPERF-1409 Fix JFR flamegraph in intellij

Fixes 'Total time' tab that was previously unavailable
atlassian · Dec 6, 2023 · 73aaaed · 73aaaed
1 parent 0f66a60
commit 73aaaed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,10 @@ Dropping a requirement of a major version of a dependency is a new contract.
 
 ### Fixed
 - Bump async-profiler to v2.10.
+- Provide a default interval for async-profiler. Workaround for [IDEA-320011]. Help fix [JPERF-1409].
+
+[IDEA-320011]: https://youtrack.jetbrains.com/issue/IDEA-320011
+[JPERF-1409]: https://ecosystem.atlassian.net/browse/JPERF-1409
 
 ## [4.28.0] - 2023-10-11
 [4.28.0]: https://github.com/atlassian/infrastructure/compare/release-4.27.0...release-4.28.0

diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/profiler/AsyncProfiler.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/profiler/AsyncProfiler.kt
@@ -5,6 +5,7 @@ import com.atlassian.performance.tools.jvmtasks.api.IdempotentAction
 import com.atlassian.performance.tools.jvmtasks.api.StaticBackoff
 import com.atlassian.performance.tools.ssh.api.SshConnection
 import java.time.Duration
+import java.time.Duration.ofMillis
 import java.time.Duration.ofSeconds
 
 /**
@@ -67,6 +68,8 @@ class AsyncProfiler private constructor(
         private var outputFile: String = "flamegraph.html"
         private val startParams = mutableListOf<String>()
         private val stopParams = mutableListOf<String>()
+        private var wallClockMode: Boolean = false
+        private var interval: Duration = ofMillis(10)
 
         fun outputFile(outputFile: String) = apply { this.outputFile = outputFile }
 
@@ -93,14 +96,12 @@ class AsyncProfiler private constructor(
         fun flamegraph(outputFile: String) = output("flamegraph", outputFile)
 
         fun wallClockMode() = apply {
-            startParams.add("-e")
-            startParams.add("wall")
+            wallClockMode = true
         }
 
         fun interval(interval: Duration) = apply {
-            startParams.add("-i")
             if (interval < ofSeconds(1)) {
-                startParams.add(interval.nano.toString())
+                this.interval = interval
             } else {
                 throw Exception("The interval $interval seems to big. Usually it's counted in milliseconds or nanoseconds. Try an interval under a second.")
             }
@@ -124,9 +125,15 @@ class AsyncProfiler private constructor(
         }
 
         fun build(): Profiler {
-            val startParamsCopy = startParams + "-o $outputFormat -f $outputFile"
-            val stopParamsCopy =  stopParams + "-o $outputFormat -f $outputFile"
+            val startParamsCopy = (
+                startParams
+                    + (if (wallClockMode) "-e wall" else null)
+                    + "-i ${interval.nano}"
+                    + "-o $outputFormat"
+                    + "-f $outputFile"
+                ).filterNotNull()
+            val stopParamsCopy = stopParams + "-o $outputFormat -f $outputFile"
             return AsyncProfiler(startParamsCopy, stopParamsCopy, outputFile)
         }
     }
-}
+}