JPERF-1409 Revert adding requestId

I've found no jira log entries in JPT that contain requestId. In other words, I'm not sure if it's valuable so better skip it. It can be easily added later
atlassian · Nov 8, 2023 · f9aa00c · f9aa00c
1 parent 21c68b9
commit f9aa00c
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,7 +28,6 @@ Dropping a requirement of a major version of a dependency is a new contract.
 
 ### Added
 - Add `nodeId` to `PerformanceServerTiming`. Aid with [JPERF-1409].
-- Add `requestId` to `PerformanceServerTiming`. Aid with [JPERF-1409].
 - Add `ActionMetric.toBackendTimeSlots()`. Aid with [JPERF-1409].
 
 ### Fixed

diff --git a/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/ActionMetric.kt b/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/ActionMetric.kt
@@ -48,10 +48,6 @@ data class ActionMetric @Deprecated("Use ActionMetric.Builder instead.") constru
                 ?.description
                 ?.toLong()
                 ?: throw Exception("No threadId in $this, so we cannot map it to a backend timeslot"),
-            requestId = resource
-                .serverTiming
-                .find { it.name == "requestId" }
-                ?.description,
             nodeId = resource
                 .serverTiming
                 .find { it.name == "nodeId" }

diff --git a/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/BackendTimeSlot.kt b/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/BackendTimeSlot.kt
@@ -7,13 +7,12 @@ class BackendTimeSlot internal constructor(
     val start: Instant,
     val end: Instant,
     val threadId: Long,
-    val requestId: String?,
     val nodeId: String?
 ) {
     val duration: Duration = Duration.between(start, end)
 
     fun contains(instant: Instant): Boolean = instant.isAfter(start) && instant.isBefore(end)
-    
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
@@ -23,7 +22,6 @@ class BackendTimeSlot internal constructor(
         if (start != other.start) return false
         if (end != other.end) return false
         if (threadId != other.threadId) return false
-        if (requestId != other.requestId) return false
         if (nodeId != other.nodeId) return false
         if (duration != other.duration) return false
 
@@ -34,14 +32,13 @@ class BackendTimeSlot internal constructor(
         var result = start.hashCode()
         result = 31 * result + end.hashCode()
         result = 31 * result + threadId.hashCode()
-        result = 31 * result + (requestId?.hashCode() ?: 0)
         result = 31 * result + (nodeId?.hashCode() ?: 0)
         result = 31 * result + duration.hashCode()
         return result
     }
 
     override fun toString(): String {
-        return "BackendTimeSlot(start=$start, end=$end, threadId=$threadId, requestId=$requestId, nodeId=$nodeId, duration=$duration)"
+        return "BackendTimeSlot(start=$start, end=$end, threadId=$threadId, nodeId=$nodeId, duration=$duration)"
     }
 
 

diff --git a/src/main/kotlin/com/atlassian/performance/tools/jiraactions/w3c/harvesters/JsResources.kt b/src/main/kotlin/com/atlassian/performance/tools/jiraactions/w3c/harvesters/JsResources.kt
@@ -75,9 +75,7 @@ private fun parseServerTimings(
     val result = jsServerTimings.map { parseServerTiming(it) }.toMutableList()
     val responseHeaders = getResponseHeaders(jsExecutor)
     val nodeId = responseHeaders["x-anodeid"]
-    val requestId = responseHeaders["x-arequestid"]
     addAttribute(result, "nodeId", nodeId)
-    addAttribute(result, "requestId", requestId)
     return result
 }
 

diff --git a/...tlin/com/atlassian/performance/tools/jiraactions/api/scenario/AbstractJiraCoreScenario.kt b/...tlin/com/atlassian/performance/tools/jiraactions/api/scenario/AbstractJiraCoreScenario.kt
@@ -10,7 +10,6 @@ import com.atlassian.performance.tools.jiraactions.api.memories.UserMemory
 import com.atlassian.performance.tools.jiraactions.api.page.isElementPresent
 import com.atlassian.performance.tools.jiraactions.api.page.tolerateDirtyFormsOnCurrentPage
 import com.atlassian.performance.tools.jiraactions.api.w3c.JavascriptW3cPerformanceTimeline
-import com.atlassian.performance.tools.jiraactions.api.w3c.PerformanceResourceTiming
 import com.atlassian.performance.tools.jiraactions.api.webdriver.sendKeysAndValidate
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
@@ -99,17 +98,6 @@ abstract class AbstractJiraCoreScenario {
     private fun assertDrilldown(metrics: List<ActionMetric>) {
         val navigationsPerMetric = metrics.map { it.drilldown?.navigations ?: emptyList() }
         assertThat(navigationsPerMetric).`as`("all results contain timings in drilldown").hasSize(metrics.size)
-        val navigationsCount = navigationsPerMetric.flatten().count()
-        val navigationsWithRequestIdCount =
-            navigationsPerMetric.flatten().mapNotNull { toRequestId(it.resource) }.count()
-        assertThat(navigationsWithRequestIdCount).`as`("all results contain requestIds in drilldown").isEqualTo(navigationsCount)
-    }
-
-    private fun toRequestId(resource: PerformanceResourceTiming): String? {
-        return resource
-            .serverTiming
-            ?.find { it.name == "requestId" }
-            ?.description
     }
 
     private fun goToServices(driver: RemoteWebDriver, jira: Jira) {