Skip to content

Commit 42fca1b

Browse files
satweensatween
committed
RUM-9361: post-review fixes
1 parent 9a1d826 commit 42fca1b

File tree

4 files changed

+30
-26
lines changed

4 files changed

+30
-26
lines changed

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/metric/slowframes/SlowFramesListener.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import kotlin.math.min
1616

1717
internal interface SlowFramesListener : FrameStateListener {
1818
fun onViewCreated(viewId: String, startedTimestampNs: Long)
19-
fun resolveReport(viewId: String, isViewCompleted: Boolean, viewDuration: Long): ViewUIPerformanceReport?
19+
fun resolveReport(viewId: String, isViewCompleted: Boolean, viewDurationNs: Long): ViewUIPerformanceReport?
2020
fun onAddLongTask(durationNs: Long)
2121
}
2222

@@ -41,15 +41,19 @@ internal class DefaultSlowFramesListener(
4141
}
4242

4343
// Called from the main thread
44-
override fun resolveReport(viewId: String, isViewCompleted: Boolean, viewDuration: Long): ViewUIPerformanceReport? {
44+
override fun resolveReport(
45+
viewId: String,
46+
isViewCompleted: Boolean,
47+
viewDurationNs: Long
48+
): ViewUIPerformanceReport? {
4549
@Suppress("UnsafeThirdPartyFunctionCall") // can't have NPE here
4650
val report = if (isViewCompleted) slowFramesRecords.remove(viewId) else slowFramesRecords[viewId]
4751

4852
if (report == null) return null
4953

5054
// making sure that report is not partially updated
5155
return synchronized(report) {
52-
if (isViewCompleted) metricDispatcher.sendMetric(viewId, viewDuration)
56+
if (isViewCompleted) metricDispatcher.sendMetric(viewId, viewDurationNs)
5357
report.copy()
5458
}
5559
}

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/metric/slowframes/UISlownessMetricDispatcher.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal interface UISlownessMetricDispatcher {
2323

2424
fun incrementMissedFrameCount(viewId: String)
2525

26-
fun sendMetric(viewId: String, viewDuration: Long)
26+
fun sendMetric(viewId: String, viewDurationNs: Long)
2727
}
2828

2929
internal class DefaultUISlownessMetricDispatcher(
@@ -61,7 +61,7 @@ internal class DefaultUISlownessMetricDispatcher(
6161
}
6262

6363
// Called from the main thread
64-
override fun sendMetric(viewId: String, viewDuration: Long) {
64+
override fun sendMetric(viewId: String, viewDurationNs: Long) {
6565
val telemetry = viewTelemetry.remove(viewId)
6666
if (telemetry == null) {
6767
internalLogger.log(
@@ -79,7 +79,7 @@ internal class DefaultUISlownessMetricDispatcher(
7979
slowFramesCount = telemetry.slowFramesCount.get(),
8080
ignoredFramesCount = telemetry.ignoredFramesCount.get(),
8181
missedFramesCount = telemetry.missedFrameCount.get(),
82-
viewDuration = viewDuration
82+
viewDurationNs = viewDurationNs
8383
)
8484
)
8585
}
@@ -88,13 +88,13 @@ internal class DefaultUISlownessMetricDispatcher(
8888
slowFramesCount: Int,
8989
ignoredFramesCount: Int,
9090
missedFramesCount: Int,
91-
viewDuration: Long
91+
viewDurationNs: Long
9292
): Map<String, Any> = buildMap {
9393
put(KEY_METRIC_TYPE, VALUE_METRIC_TYPE)
9494
put(
9595
KEY_RUM_UI_SLOWNESS,
9696
buildMap {
97-
put(KEY_VIEW_DURATION, viewDuration)
97+
put(KEY_VIEW_DURATION, viewDurationNs)
9898
put(
9999
KEY_SLOW_FRAMES,
100100
buildMap {

‎features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ internal class RumViewScopeTest {
235235
var fakeTrackFrustrations: Boolean = true
236236

237237
@LongForgery(min = 1L)
238-
var fakeViewDuration: Long = 0
238+
var fakeViewDurationNs: Long = 0
239239

240240
lateinit var fakeReplayStats: ViewEvent.ReplayStats
241241

@@ -9632,14 +9632,14 @@ internal class RumViewScopeTest {
96329632
fakeEvent = RumRawEvent.StopView(
96339633
key = testedScope.key,
96349634
attributes = forge.exhaustiveAttributes(),
9635-
eventTime = Time(nanoTime = fakeEventTime.nanoTime + fakeViewDuration)
9635+
eventTime = Time(nanoTime = fakeEventTime.nanoTime + fakeViewDurationNs)
96369636
)
96379637

96389638
// When
96399639
testedScope.handleEvent(fakeEvent, mockWriter)
96409640

96419641
// Then
9642-
verify(mockSlowFramesListener).resolveReport(testedScope.viewId, true, fakeViewDuration)
9642+
verify(mockSlowFramesListener).resolveReport(testedScope.viewId, true, fakeViewDurationNs)
96439643
}
96449644

96459645
@Test
@@ -9648,24 +9648,24 @@ internal class RumViewScopeTest {
96489648
) {
96499649
// When
96509650
testedScope.handleEvent(
9651-
forge.startViewEvent(eventTime = Time(nanoTime = fakeEventTime.nanoTime + fakeViewDuration)),
9651+
forge.startViewEvent(eventTime = Time(nanoTime = fakeEventTime.nanoTime + fakeViewDurationNs)),
96529652
mockWriter
96539653
)
96549654

96559655
// Then
9656-
verify(mockSlowFramesListener).resolveReport(testedScope.viewId, true, fakeViewDuration)
9656+
verify(mockSlowFramesListener).resolveReport(testedScope.viewId, true, fakeViewDurationNs)
96579657
}
96589658

96599659
@Test
96609660
fun `M call resolveReport(viewId, true, Long) of slowFramesListener W handleEvent(StopSession)`() {
96619661
// When
96629662
testedScope.handleEvent(
9663-
RumRawEvent.StopSession(eventTime = Time(nanoTime = fakeEventTime.nanoTime + fakeViewDuration)),
9663+
RumRawEvent.StopSession(eventTime = Time(nanoTime = fakeEventTime.nanoTime + fakeViewDurationNs)),
96649664
mockWriter
96659665
)
96669666

96679667
// Then
9668-
verify(mockSlowFramesListener).resolveReport(testedScope.viewId, true, fakeViewDuration)
9668+
verify(mockSlowFramesListener).resolveReport(testedScope.viewId, true, fakeViewDurationNs)
96699669
}
96709670

96719671
@Test

‎features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/metric/slowframes/DefaultUISlownessMetricDispatcherTest.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ internal class DefaultUISlownessMetricDispatcherTest {
5353
var fakeSamplingRate: Float = 0f
5454

5555
@LongForgery(min = 1, max = 100)
56-
var fakeViewDuration: Long = 0
56+
var fakeViewDurationNs: Long = 0
5757

5858
@Forgery
5959
lateinit var fakeSlowFramesConfiguration: SlowFramesConfiguration
@@ -79,7 +79,7 @@ internal class DefaultUISlownessMetricDispatcherTest {
7979

8080
// When
8181
testedDispatcher.incrementSlowFrameCount(fakeViewId)
82-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
82+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
8383

8484
// Then
8585
verify(mockInternalLogger).logMetric(
@@ -97,7 +97,7 @@ internal class DefaultUISlownessMetricDispatcherTest {
9797

9898
// When
9999
testedDispatcher.incrementIgnoredFrameCount(fakeViewId)
100-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
100+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
101101

102102
// Then
103103
verify(mockInternalLogger).logMetric(
@@ -115,7 +115,7 @@ internal class DefaultUISlownessMetricDispatcherTest {
115115

116116
// When
117117
testedDispatcher.incrementMissedFrameCount(fakeViewId)
118-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
118+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
119119

120120
// Then
121121
verify(mockInternalLogger).logMetric(
@@ -133,12 +133,12 @@ internal class DefaultUISlownessMetricDispatcherTest {
133133

134134
// When
135135
testedDispatcher.incrementMissedFrameCount(fakeViewId)
136-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
136+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
137137

138138
// Then
139139
verify(mockInternalLogger).logMetric(
140140
argThat { invoke() == DefaultUISlownessMetricDispatcher.UI_SLOWNESS_MESSAGE },
141-
argThat { hasExpectedValue(fakeViewDuration, KEY_RUM_UI_SLOWNESS, KEY_VIEW_DURATION) },
141+
argThat { hasExpectedValue(fakeViewDurationNs, KEY_RUM_UI_SLOWNESS, KEY_VIEW_DURATION) },
142142
eq(fakeSamplingRate),
143143
eq(null)
144144
)
@@ -150,8 +150,8 @@ internal class DefaultUISlownessMetricDispatcherTest {
150150
testedDispatcher.onViewCreated(fakeViewId)
151151

152152
// When
153-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
154-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
153+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
154+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
155155

156156
// Then
157157
verify(mockInternalLogger).logMetric(
@@ -168,8 +168,8 @@ internal class DefaultUISlownessMetricDispatcherTest {
168168
testedDispatcher.onViewCreated(fakeViewId)
169169

170170
// When
171-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
172-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
171+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
172+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
173173

174174
// Then
175175
verify(mockInternalLogger).log(
@@ -192,7 +192,7 @@ internal class DefaultUISlownessMetricDispatcherTest {
192192
testedDispatcher.onViewCreated(fakeViewId)
193193

194194
// When
195-
testedDispatcher.sendMetric(fakeViewId, fakeViewDuration)
195+
testedDispatcher.sendMetric(fakeViewId, fakeViewDurationNs)
196196

197197
// Then
198198
verify(mockInternalLogger).logMetric(

0 commit comments

Comments
 (0)