Skip to content

Commit 207affa

Browse files
satweensatween
committed
Merge develop
1 parent 0209212 commit 207affa

File tree

14 files changed

+137
-240
lines changed

14 files changed

+137
-240
lines changed

‎dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/user/DatadogUserInfoProviderTest.kt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -348,26 +348,4 @@ internal class DatadogUserInfoProviderTest {
348348
// Then
349349
assertThat(testedProvider.getUserInfo()).isEqualTo(UserInfo())
350350
}
351-
352-
@Test
353-
fun `M delegate to persister W clearUserInfo()`(
354-
@StringForgery(type = StringForgeryType.HEXADECIMAL) id: String,
355-
@StringForgery(type = StringForgeryType.HEXADECIMAL) anonymousId: String,
356-
@StringForgery name: String,
357-
@StringForgery(regex = "\\w+@\\w+") email: String,
358-
@MapForgery(
359-
key = AdvancedForgery(string = [StringForgery(StringForgeryType.ALPHA_NUMERICAL)]),
360-
value = AdvancedForgery(string = [StringForgery(StringForgeryType.ALPHA_NUMERICAL)])
361-
) fakeUserProperties: Map<String, String>
362-
) {
363-
// Given
364-
testedProvider.setUserInfo(id, name, email, fakeUserProperties)
365-
testedProvider.setAnonymousId(anonymousId)
366-
367-
// When
368-
testedProvider.clearUserInfo()
369-
370-
// Then
371-
verify(mockWriter).write(UserInfo(anonymousId))
372-
}
373351
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ internal open class RumViewScope(
981981

982982
val accessibilityState = accessibilityReader.getState()
983983
if (accessibilityState.isNotEmpty()) {
984-
eventAdditionalAttributes[ACCESSIBILITY_KEY] = accessibilityState
984+
viewCustomAttributes[ACCESSIBILITY_KEY] = accessibilityState
985985
}
986986
val uiSlownessReport = slowFramesListener?.resolveReport(viewId, viewComplete, durationNs)
987987
val slowFrames = uiSlownessReport?.slowFramesRecords?.map {

‎features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/assertj/ErrorEventAssert.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,22 @@ internal class ErrorEventAssert(actual: ErrorEvent) :
312312
return this
313313
}
314314

315+
fun hasUserSession(): ErrorEventAssert {
316+
assertThat(actual.session.type)
317+
.overridingErrorMessage(
318+
"Expected event to have session.type:user but was ${actual.session.type}"
319+
).isEqualTo(ErrorEvent.ErrorEventSessionType.USER)
320+
return this
321+
}
322+
323+
fun hasSyntheticsSession(): ErrorEventAssert {
324+
assertThat(actual.session.type)
325+
.overridingErrorMessage(
326+
"Expected event to have session.type:synthetics but was ${actual.session.type}"
327+
).isEqualTo(ErrorEvent.ErrorEventSessionType.SYNTHETICS)
328+
return this
329+
}
330+
315331
fun hasNoSyntheticsTest(): ErrorEventAssert {
316332
assertThat(actual.synthetics?.testId)
317333
.overridingErrorMessage(

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import com.datadog.android.api.storage.EventType
1818
import com.datadog.android.core.InternalSdkCore
1919
import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
2020
import com.datadog.android.rum.RumActionType
21+
import com.datadog.android.rum.RumSessionType
2122
import com.datadog.android.rum.assertj.ActionEventAssert.Companion.assertThat
2223
import com.datadog.android.rum.internal.FeaturesContextResolver
2324
import com.datadog.android.rum.internal.domain.RumContext
@@ -138,6 +139,8 @@ internal class RumActionScopeAttributePropagationTest {
138139
@LongForgery(-1000L, 1000L)
139140
var fakeServerOffset: Long = 0L
140141

142+
private var fakeRumSessionType: RumSessionType? = null
143+
141144
@BeforeEach
142145
fun `set up`(forge: Forge) {
143146
fakeEventTime = Time()
@@ -160,6 +163,8 @@ internal class RumActionScopeAttributePropagationTest {
160163
callback.invoke(fakeDatadogContext, mockEventWriteScope)
161164
}
162165

166+
fakeRumSessionType = forge.aNullable { aValueFrom(RumSessionType::class.java) }
167+
163168
testedScope = RumActionScope(
164169
parentScope = mockParentScope,
165170
sdkCore = rumMonitor.mockSdkCore,
@@ -173,7 +178,8 @@ internal class RumActionScopeAttributePropagationTest {
173178
maxDurationMs = TEST_MAX_DURATION_MS,
174179
featuresContextResolver = mockFeaturesContextResolver,
175180
trackFrustrations = true,
176-
sampleRate = fakeSampleRate
181+
sampleRate = fakeSampleRate,
182+
rumSessionTypeOverride = fakeRumSessionType
177183
)
178184
}
179185

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1646,6 +1646,7 @@ internal class RumActionScopeTest {
16461646
expectedAttributes.putAll(fakeParentAttributes)
16471647
expectedAttributes.putAll(fakeAttributes)
16481648
whenever(mockParentScope.getCustomAttributes()) doReturn fakeParentAttributes
1649+
16491650
testedScope = RumActionScope(
16501651
parentScope = mockParentScope,
16511652
sdkCore = rumMonitor.mockSdkCore,

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ import com.datadog.android.api.feature.FeatureScope
1515
import com.datadog.android.api.storage.DataWriter
1616
import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
1717
import com.datadog.android.rum.RumSessionListener
18+
import com.datadog.android.rum.RumSessionType
1819
import com.datadog.android.rum.internal.FeaturesContextResolver
1920
import com.datadog.android.rum.internal.domain.Time
21+
import com.datadog.android.rum.internal.domain.accessibility.AccessibilityReader
2022
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher
2123
import com.datadog.android.rum.internal.metric.slowframes.SlowFramesListener
2224
import com.datadog.android.rum.internal.vitals.VitalMonitor
@@ -107,6 +109,9 @@ internal class RumApplicationScopeAttributePropagationTest {
107109
@Mock
108110
lateinit var mockInitialResourceIdentifier: InitialResourceIdentifier
109111

112+
@Mock
113+
lateinit var mockAccessibilityReader: AccessibilityReader
114+
110115
@Mock
111116
lateinit var mockSlowFramesListener: SlowFramesListener
112117

@@ -140,6 +145,8 @@ internal class RumApplicationScopeAttributePropagationTest {
140145
@StringForgery
141146
lateinit var fakeApplicationId: String
142147

148+
private var fakeRumSessionType: RumSessionType? = null
149+
143150
@BeforeEach
144151
fun `set up`(forge: Forge) {
145152
fakeGlobalAttributes = forge.exhaustiveAttributes()
@@ -167,7 +174,7 @@ internal class RumApplicationScopeAttributePropagationTest {
167174
}
168175

169176
whenever(rumMonitor.mockSdkCore.internalLogger) doReturn mock()
170-
177+
fakeRumSessionType = forge.aNullable { aValueFrom(RumSessionType::class.java) }
171178
testedScope = RumApplicationScope(
172179
applicationId = fakeApplicationId,
173180
sdkCore = rumMonitor.mockSdkCore,
@@ -182,7 +189,9 @@ internal class RumApplicationScopeAttributePropagationTest {
182189
sessionListener = mockSessionListener,
183190
initialResourceIdentifier = mockInitialResourceIdentifier,
184191
lastInteractionIdentifier = mockLastInteractionIdentifier,
185-
slowFramesListener = mockSlowFramesListener
192+
slowFramesListener = mockSlowFramesListener,
193+
rumSessionTypeOverride = fakeRumSessionType,
194+
accessibilityReader = mockAccessibilityReader
186195
)
187196
}
188197

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import com.datadog.android.rum.DdRumContentProvider
2020
import com.datadog.android.rum.RumActionType
2121
import com.datadog.android.rum.RumSessionListener
2222
import com.datadog.android.rum.RumSessionType
23-
import com.datadog.android.rum.internal.domain.RumContext
2423
import com.datadog.android.rum.internal.domain.accessibility.AccessibilityReader
2524
import com.datadog.android.rum.internal.domain.state.ViewUIPerformanceReport
2625
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
1919
import com.datadog.android.rum.RumErrorSource
2020
import com.datadog.android.rum.RumResourceKind
2121
import com.datadog.android.rum.RumResourceMethod
22+
import com.datadog.android.rum.RumSessionType
2223
import com.datadog.android.rum.assertj.ErrorEventAssert.Companion.assertThat
2324
import com.datadog.android.rum.assertj.ResourceEventAssert.Companion.assertThat
2425
import com.datadog.android.rum.internal.FeaturesContextResolver
@@ -151,13 +152,16 @@ internal class RumResourceScopeAttributePropagationTest {
151152
@LongForgery(-1000L, 1000L)
152153
var fakeServerOffset: Long = 0L
153154

155+
private var fakeRumSessionType: RumSessionType? = null
156+
154157
@BeforeEach
155158
fun `set up`(forge: Forge) {
156159
fakeEventTime = Time()
157160

158161
fakeParentAttributes = forge.exhaustiveAttributes()
159162
fakeResourceAttributes = forge.exhaustiveAttributes()
160163
fakeErrorAttributes = forge.exhaustiveAttributes()
164+
fakeRumSessionType = forge.aNullable { aValueFrom(RumSessionType::class.java) }
161165

162166
whenever(mockParentScope.getCustomAttributes()) doReturn fakeParentAttributes.toMutableMap()
163167
whenever(mockParentScope.getRumContext()) doReturn fakeParentContext
@@ -187,7 +191,8 @@ internal class RumResourceScopeAttributePropagationTest {
187191
firstPartyHostHeaderTypeResolver = mockResolver,
188192
featuresContextResolver = mockFeaturesContextResolver,
189193
sampleRate = fakeSampleRate,
190-
networkSettledMetricResolver = mockNetworkSettledMetricResolver
194+
networkSettledMetricResolver = mockNetworkSettledMetricResolver,
195+
rumSessionTypeOverride = fakeRumSessionType
191196
)
192197
}
193198

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ import com.datadog.android.api.storage.EventBatchWriter
1515
import com.datadog.android.core.InternalSdkCore
1616
import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
1717
import com.datadog.android.rum.RumSessionListener
18+
import com.datadog.android.rum.RumSessionType
1819
import com.datadog.android.rum.internal.FeaturesContextResolver
1920
import com.datadog.android.rum.internal.domain.RumContext
2021
import com.datadog.android.rum.internal.domain.Time
22+
import com.datadog.android.rum.internal.domain.accessibility.AccessibilityReader
2123
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher
2224
import com.datadog.android.rum.internal.metric.slowframes.SlowFramesListener
2325
import com.datadog.android.rum.internal.vitals.VitalMonitor
@@ -44,8 +46,6 @@ import org.mockito.kotlin.mock
4446
import org.mockito.kotlin.whenever
4547
import org.mockito.quality.Strictness
4648
import java.util.concurrent.TimeUnit
47-
import kotlin.math.max
48-
import kotlin.math.min
4949

5050
@Extensions(
5151
ExtendWith(MockitoExtension::class),
@@ -90,6 +90,9 @@ internal class RumSessionScopeAttributePropagationTest {
9090
@Mock
9191
lateinit var mockInternalLogger: InternalLogger
9292

93+
@Mock
94+
lateinit var mockAccessibilityReader: AccessibilityReader
95+
9396
@Mock
9497
lateinit var mockRumFeatureScope: FeatureScope
9598

@@ -134,14 +137,15 @@ internal class RumSessionScopeAttributePropagationTest {
134137

135138
@BoolForgery
136139
var fakeTrackFrustrations: Boolean = true
140+
private var fakeRumSessionType: RumSessionType? = null
137141

138142
@BeforeEach
139143
fun `set up`(forge: Forge) {
140144
fakeParentAttributes = forge.exhaustiveAttributes()
141145
whenever(mockParentScope.getCustomAttributes()) doReturn fakeParentAttributes.toMutableMap()
142146

143147
whenever(mockSdkCore.internalLogger) doReturn mock()
144-
148+
fakeRumSessionType = forge.aNullable { aValueFrom(RumSessionType::class.java) }
145149
testedScope = RumSessionScope(
146150
parentScope = mockParentScope,
147151
sdkCore = mockSdkCore,
@@ -160,7 +164,9 @@ internal class RumSessionScopeAttributePropagationTest {
160164
lastInteractionIdentifier = mockLastInteractionIdentifier,
161165
slowFramesListener = mockSlowFramesListener,
162166
sessionInactivityNanos = TEST_INACTIVITY_NS,
163-
sessionMaxDurationNanos = TEST_MAX_DURATION_NS
167+
sessionMaxDurationNanos = TEST_MAX_DURATION_NS,
168+
rumSessionTypeOverride = fakeRumSessionType,
169+
accessibilityReader = mockAccessibilityReader
164170
)
165171
}
166172

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ import com.datadog.android.api.storage.EventBatchWriter
1515
import com.datadog.android.core.InternalSdkCore
1616
import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
1717
import com.datadog.android.rum.RumSessionListener
18+
import com.datadog.android.rum.RumSessionType
1819
import com.datadog.android.rum.internal.FeaturesContextResolver
1920
import com.datadog.android.rum.internal.domain.RumContext
2021
import com.datadog.android.rum.internal.domain.Time
22+
import com.datadog.android.rum.internal.domain.accessibility.AccessibilityReader
2123
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher
2224
import com.datadog.android.rum.internal.metric.slowframes.SlowFramesListener
2325
import com.datadog.android.rum.internal.vitals.VitalMonitor
@@ -43,8 +45,6 @@ import org.mockito.kotlin.doReturn
4345
import org.mockito.kotlin.mock
4446
import org.mockito.kotlin.whenever
4547
import org.mockito.quality.Strictness
46-
import kotlin.math.max
47-
import kotlin.math.min
4848

4949
@Extensions(
5050
ExtendWith(MockitoExtension::class),
@@ -68,6 +68,9 @@ internal class RumViewManagerScopeAttributePropagationTest {
6868
@Mock
6969
lateinit var mockResolver: FirstPartyHostHeaderTypeResolver
7070

71+
@Mock
72+
lateinit var mockAccessibilityReader: AccessibilityReader
73+
7174
@Mock
7275
lateinit var mockSessionListener: RumSessionListener
7376

@@ -137,9 +140,12 @@ internal class RumViewManagerScopeAttributePropagationTest {
137140
@BoolForgery
138141
var fakeTrackFrustrations: Boolean = true
139142

143+
private var fakeRumSessionType: RumSessionType? = null
144+
140145
@BeforeEach
141146
fun `set up`(forge: Forge) {
142147
fakeParentAttributes = forge.exhaustiveAttributes()
148+
fakeRumSessionType = forge.aNullable { aValueFrom(RumSessionType::class.java) }
143149
whenever(mockParentScope.getCustomAttributes()) doReturn fakeParentAttributes.toMutableMap()
144150

145151
whenever(mockSdkCore.internalLogger) doReturn mock()
@@ -159,7 +165,9 @@ internal class RumViewManagerScopeAttributePropagationTest {
159165
applicationDisplayed = false,
160166
initialResourceIdentifier = mockInitialResourceIdentifier,
161167
lastInteractionIdentifier = mockLastInteractionIdentifier,
162-
slowFramesListener = mockSlowFramesListener
168+
slowFramesListener = mockSlowFramesListener,
169+
accessibilityReader = mockAccessibilityReader,
170+
rumSessionTypeOverride = fakeRumSessionType
163171
)
164172
}
165173

0 commit comments

Comments
 (0)