Skip to content

Commit 408586a

Browse files
satweensatween
authored
Merge pull request #2831 from DataDog/tvaleev/feature/RUM-11414-eliminating-rum-prefix
[RUM-11414][FO]: Replacing RumVitalEvent with VitalEvent
2 parents fd55c46 + d92b407 commit 408586a

File tree

17 files changed

+2266
-2265
lines changed

17 files changed

+2266
-2265
lines changed

‎features/dd-sdk-android-rum/api/apiSurface

Lines changed: 242 additions & 242 deletions
Large diffs are not rendered by default.

‎features/dd-sdk-android-rum/api/dd-sdk-android-rum.api

Lines changed: 1895 additions & 1895 deletions
Large diffs are not rendered by default.

‎features/dd-sdk-android-rum/generate_rum_models.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ tasks.register(
2626
"error-schema.json" to "ErrorEvent",
2727
"resource-schema.json" to "ResourceEvent",
2828
"view-schema.json" to "ViewEvent",
29-
"long_task-schema.json" to "LongTaskEvent"
29+
"long_task-schema.json" to "LongTaskEvent",
30+
"vital-schema.json" to "VitalEvent"
3031
)
3132
}
3233

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/RumConfiguration.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import com.datadog.android.rum.model.ActionEvent
2222
import com.datadog.android.rum.model.ErrorEvent
2323
import com.datadog.android.rum.model.LongTaskEvent
2424
import com.datadog.android.rum.model.ResourceEvent
25-
import com.datadog.android.rum.model.RumVitalEvent
2625
import com.datadog.android.rum.model.ViewEvent
26+
import com.datadog.android.rum.model.VitalEvent
2727
import com.datadog.android.rum.tracking.ActionTrackingStrategy
2828
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
2929
import com.datadog.android.rum.tracking.InteractionPredicate
@@ -221,12 +221,12 @@ data class RumConfiguration internal constructor(
221221
}
222222

223223
/**
224-
* Sets the [EventMapper] for the RUM [RumVitalEvent]. You can use this interface implementation
225-
* to modify the [RumVitalEvent] attributes before serialisation.
224+
* Sets the [EventMapper] for the RUM [VitalEvent]. You can use this interface implementation
225+
* to modify the [VitalEvent] attributes before serialisation.
226226
*
227227
* @param eventMapper the [EventMapper] implementation.
228228
*/
229-
fun setVitalEventMapper(eventMapper: EventMapper<RumVitalEvent>): Builder {
229+
fun setVitalEventMapper(eventMapper: EventMapper<VitalEvent>): Builder {
230230
rumConfig = rumConfig.copy(vitalEventMapper = eventMapper)
231231
return this
232232
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ import com.datadog.android.rum.model.ActionEvent
9090
import com.datadog.android.rum.model.ErrorEvent
9191
import com.datadog.android.rum.model.LongTaskEvent
9292
import com.datadog.android.rum.model.ResourceEvent
93-
import com.datadog.android.rum.model.RumVitalEvent
9493
import com.datadog.android.rum.model.ViewEvent
94+
import com.datadog.android.rum.model.VitalEvent
9595
import com.datadog.android.rum.tracking.ActionTrackingStrategy
9696
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
9797
import com.datadog.android.rum.tracking.InteractionPredicate
@@ -643,7 +643,7 @@ internal class RumFeature(
643643
val resourceEventMapper: EventMapper<ResourceEvent>,
644644
val actionEventMapper: EventMapper<ActionEvent>,
645645
val longTaskEventMapper: EventMapper<LongTaskEvent>,
646-
val vitalEventMapper: EventMapper<RumVitalEvent>,
646+
val vitalEventMapper: EventMapper<VitalEvent>,
647647
val telemetryConfigurationMapper: EventMapper<TelemetryConfigurationEvent>,
648648
val backgroundEventTracking: Boolean,
649649
val trackFrustrations: Boolean,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import com.datadog.android.rum.model.ActionEvent
1111
import com.datadog.android.rum.model.ErrorEvent
1212
import com.datadog.android.rum.model.LongTaskEvent
1313
import com.datadog.android.rum.model.ResourceEvent
14-
import com.datadog.android.rum.model.RumVitalEvent
1514
import com.datadog.android.rum.model.ViewEvent
15+
import com.datadog.android.rum.model.VitalEvent
1616

1717
internal fun RumSessionType.toAction(): ActionEvent.ActionEventSessionType {
1818
return when (this) {
@@ -48,9 +48,9 @@ internal fun RumSessionType.toLongTask(): LongTaskEvent.LongTaskEventSessionType
4848
RumSessionType.USER -> LongTaskEvent.LongTaskEventSessionType.USER
4949
}
5050
}
51-
internal fun RumSessionType.toVital(): RumVitalEvent.RumVitalEventSessionType {
51+
internal fun RumSessionType.toVital(): VitalEvent.VitalEventSessionType {
5252
return when (this) {
53-
RumSessionType.SYNTHETICS -> RumVitalEvent.RumVitalEventSessionType.SYNTHETICS
54-
RumSessionType.USER -> RumVitalEvent.RumVitalEventSessionType.USER
53+
RumSessionType.SYNTHETICS -> VitalEvent.VitalEventSessionType.SYNTHETICS
54+
RumSessionType.USER -> VitalEvent.VitalEventSessionType.USER
5555
}
5656
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import com.datadog.android.rum.model.ActionEvent
1313
import com.datadog.android.rum.model.ErrorEvent
1414
import com.datadog.android.rum.model.LongTaskEvent
1515
import com.datadog.android.rum.model.ResourceEvent
16-
import com.datadog.android.rum.model.RumVitalEvent
1716
import com.datadog.android.rum.model.ViewEvent
17+
import com.datadog.android.rum.model.VitalEvent
1818
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
1919
import com.datadog.android.telemetry.model.TelemetryDebugEvent
2020
import com.datadog.android.telemetry.model.TelemetryErrorEvent
@@ -27,7 +27,7 @@ internal data class RumEventMapper(
2727
val resourceEventMapper: EventMapper<ResourceEvent> = NoOpEventMapper(),
2828
val actionEventMapper: EventMapper<ActionEvent> = NoOpEventMapper(),
2929
val longTaskEventMapper: EventMapper<LongTaskEvent> = NoOpEventMapper(),
30-
val vitalEventMapper: EventMapper<RumVitalEvent> = NoOpEventMapper(),
30+
val vitalEventMapper: EventMapper<VitalEvent> = NoOpEventMapper(),
3131
val telemetryConfigurationMapper: EventMapper<TelemetryConfigurationEvent> = NoOpEventMapper(),
3232
private val internalLogger: InternalLogger
3333
) : EventMapper<Any> {
@@ -62,7 +62,7 @@ internal data class RumEventMapper(
6262
}
6363
is ResourceEvent -> resourceEventMapper.map(event)
6464
is LongTaskEvent -> longTaskEventMapper.map(event)
65-
is RumVitalEvent -> vitalEventMapper.map(event)
65+
is VitalEvent -> vitalEventMapper.map(event)
6666
is TelemetryConfigurationEvent -> telemetryConfigurationMapper.map(event)
6767
is TelemetryDebugEvent,
6868
is TelemetryUsageEvent,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import com.datadog.android.rum.model.ActionEvent
1616
import com.datadog.android.rum.model.ErrorEvent
1717
import com.datadog.android.rum.model.LongTaskEvent
1818
import com.datadog.android.rum.model.ResourceEvent
19-
import com.datadog.android.rum.model.RumVitalEvent
2019
import com.datadog.android.rum.model.ViewEvent
20+
import com.datadog.android.rum.model.VitalEvent
2121
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
2222
import com.datadog.android.telemetry.model.TelemetryDebugEvent
2323
import com.datadog.android.telemetry.model.TelemetryErrorEvent
@@ -48,7 +48,7 @@ internal class RumEventSerializer(
4848
is LongTaskEvent -> {
4949
serializeLongTaskEvent(model)
5050
}
51-
is RumVitalEvent -> {
51+
is VitalEvent -> {
5252
serializeVitalEvent(model)
5353
}
5454
is TelemetryDebugEvent -> {
@@ -205,7 +205,7 @@ internal class RumEventSerializer(
205205
return extractKnownAttributes(sanitizedModel.toJson().asJsonObject).toString()
206206
}
207207

208-
private fun serializeVitalEvent(model: RumVitalEvent): String {
208+
private fun serializeVitalEvent(model: VitalEvent): String {
209209
val sanitizedUser = model.usr?.copy(
210210
additionalProperties = validateUserAttributes(model.usr.additionalProperties)
211211
.safeMapValuesToJson(internalLogger)

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import com.datadog.android.rum.model.ActionEvent
2121
import com.datadog.android.rum.model.ErrorEvent
2222
import com.datadog.android.rum.model.LongTaskEvent
2323
import com.datadog.android.rum.model.ResourceEvent
24-
import com.datadog.android.rum.model.RumVitalEvent
2524
import com.datadog.android.rum.model.ViewEvent
25+
import com.datadog.android.rum.model.VitalEvent
2626
import java.util.Locale
2727

2828
// region Resource.Method conversion
@@ -552,18 +552,6 @@ internal fun RumSessionScope.StartReason.toErrorSessionPrecondition(): ErrorEven
552552
ErrorEvent.SessionPrecondition.FROM_NON_INTERACTIVE_SESSION
553553
}
554554
}
555-
internal fun RumSessionScope.StartReason.toVitalSessionPrecondition(): RumVitalEvent.SessionPrecondition {
556-
return when (this) {
557-
RumSessionScope.StartReason.USER_APP_LAUNCH -> RumVitalEvent.SessionPrecondition.USER_APP_LAUNCH
558-
RumSessionScope.StartReason.INACTIVITY_TIMEOUT -> RumVitalEvent.SessionPrecondition.INACTIVITY_TIMEOUT
559-
RumSessionScope.StartReason.MAX_DURATION -> RumVitalEvent.SessionPrecondition.MAX_DURATION
560-
RumSessionScope.StartReason.EXPLICIT_STOP -> RumVitalEvent.SessionPrecondition.EXPLICIT_STOP
561-
RumSessionScope.StartReason.BACKGROUND_LAUNCH -> RumVitalEvent.SessionPrecondition.BACKGROUND_LAUNCH
562-
RumSessionScope.StartReason.PREWARM -> RumVitalEvent.SessionPrecondition.PREWARM
563-
RumSessionScope.StartReason.FROM_NON_INTERACTIVE_SESSION ->
564-
RumVitalEvent.SessionPrecondition.FROM_NON_INTERACTIVE_SESSION
565-
}
566-
}
567555

568556
internal fun RumSessionScope.StartReason.toResourceSessionPrecondition(): ResourceEvent.SessionPrecondition {
569557
return when (this) {
@@ -595,11 +583,24 @@ internal fun RumSessionScope.StartReason.toLongTaskSessionPrecondition(): LongTa
595583

596584
// region FeatureOperation
597585

598-
internal fun FailureReason.toSchemaFailureReason(): RumVitalEvent.FailureReason {
586+
internal fun RumSessionScope.StartReason.toVitalSessionPrecondition(): VitalEvent.SessionPrecondition {
587+
return when (this) {
588+
RumSessionScope.StartReason.USER_APP_LAUNCH -> VitalEvent.SessionPrecondition.USER_APP_LAUNCH
589+
RumSessionScope.StartReason.INACTIVITY_TIMEOUT -> VitalEvent.SessionPrecondition.INACTIVITY_TIMEOUT
590+
RumSessionScope.StartReason.MAX_DURATION -> VitalEvent.SessionPrecondition.MAX_DURATION
591+
RumSessionScope.StartReason.EXPLICIT_STOP -> VitalEvent.SessionPrecondition.EXPLICIT_STOP
592+
RumSessionScope.StartReason.BACKGROUND_LAUNCH -> VitalEvent.SessionPrecondition.BACKGROUND_LAUNCH
593+
RumSessionScope.StartReason.PREWARM -> VitalEvent.SessionPrecondition.PREWARM
594+
RumSessionScope.StartReason.FROM_NON_INTERACTIVE_SESSION ->
595+
VitalEvent.SessionPrecondition.FROM_NON_INTERACTIVE_SESSION
596+
}
597+
}
598+
599+
internal fun FailureReason.toSchemaFailureReason(): VitalEvent.FailureReason {
599600
return when (this) {
600-
FailureReason.ERROR -> RumVitalEvent.FailureReason.ERROR
601-
FailureReason.ABANDONED -> RumVitalEvent.FailureReason.ABANDONED
602-
FailureReason.OTHER -> RumVitalEvent.FailureReason.OTHER
601+
FailureReason.ERROR -> VitalEvent.FailureReason.ERROR
602+
FailureReason.ABANDONED -> VitalEvent.FailureReason.ABANDONED
603+
FailureReason.OTHER -> VitalEvent.FailureReason.OTHER
603604
}
604605
}
605606
//

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
5353
import com.datadog.android.rum.model.ActionEvent
5454
import com.datadog.android.rum.model.ErrorEvent
5555
import com.datadog.android.rum.model.LongTaskEvent
56-
import com.datadog.android.rum.model.RumVitalEvent
5756
import com.datadog.android.rum.model.ViewEvent
57+
import com.datadog.android.rum.model.VitalEvent
5858
import java.util.Locale
5959
import java.util.UUID
6060
import java.util.concurrent.TimeUnit
@@ -244,7 +244,7 @@ internal open class RumViewScope(
244244
datadogContext,
245245
name = event.name,
246246
operationKey = event.operationKey,
247-
stepType = RumVitalEvent.StepType.START,
247+
stepType = VitalEvent.StepType.START,
248248
failureReason = null,
249249
attributes = event.attributes
250250
)
@@ -258,7 +258,7 @@ internal open class RumViewScope(
258258
datadogContext,
259259
name = event.name,
260260
operationKey = event.operationKey,
261-
stepType = RumVitalEvent.StepType.END,
261+
stepType = VitalEvent.StepType.END,
262262
failureReason = event.failureReason?.toSchemaFailureReason(),
263263
attributes = event.attributes
264264
)
@@ -271,18 +271,18 @@ internal open class RumViewScope(
271271
datadogContext: DatadogContext,
272272
name: String,
273273
operationKey: String?,
274-
stepType: RumVitalEvent.StepType,
275-
failureReason: RumVitalEvent.FailureReason?,
274+
stepType: VitalEvent.StepType,
275+
failureReason: VitalEvent.FailureReason?,
276276
attributes: Map<String, Any?>
277-
): RumVitalEvent {
277+
): VitalEvent {
278278
val rumContext = getRumContext()
279279
val syntheticsAttribute = if (
280280
rumContext.syntheticsTestId.isNullOrBlank() ||
281281
rumContext.syntheticsResultId.isNullOrBlank()
282282
) {
283283
null
284284
} else {
285-
RumVitalEvent.Synthetics(
285+
VitalEvent.Synthetics(
286286
testId = rumContext.syntheticsTestId,
287287
resultId = rumContext.syntheticsResultId
288288
)
@@ -294,42 +294,42 @@ internal open class RumViewScope(
294294

295295
val sessionType = when {
296296
rumSessionTypeOverride != null -> rumSessionTypeOverride.toVital()
297-
syntheticsAttribute == null -> RumVitalEvent.RumVitalEventSessionType.USER
298-
else -> RumVitalEvent.RumVitalEventSessionType.SYNTHETICS
297+
syntheticsAttribute == null -> VitalEvent.VitalEventSessionType.USER
298+
else -> VitalEvent.VitalEventSessionType.SYNTHETICS
299299
}
300300

301-
return RumVitalEvent(
301+
return VitalEvent(
302302
date = eventTimestamp,
303-
context = RumVitalEvent.Context(
303+
context = VitalEvent.Context(
304304
additionalProperties = addExtraAttributes(attributes)
305305
),
306-
dd = RumVitalEvent.Dd(
307-
session = RumVitalEvent.DdSession(
306+
dd = VitalEvent.Dd(
307+
session = VitalEvent.DdSession(
308308
sessionPrecondition = rumContext.sessionStartReason.toVitalSessionPrecondition()
309309
),
310-
configuration = RumVitalEvent.Configuration(sessionSampleRate = sampleRate)
310+
configuration = VitalEvent.Configuration(sessionSampleRate = sampleRate)
311311
),
312-
application = RumVitalEvent.Application(
312+
application = VitalEvent.Application(
313313
id = rumContext.applicationId,
314314
currentLocale = datadogContext.deviceInfo.localeInfo.currentLocale
315315
),
316-
session = RumVitalEvent.RumVitalEventSession(
316+
session = VitalEvent.VitalEventSession(
317317
id = rumContext.sessionId,
318318
type = sessionType,
319319
hasReplay = hasReplay
320320
),
321-
view = RumVitalEvent.RumVitalEventView(
321+
view = VitalEvent.VitalEventView(
322322
id = rumContext.viewId.orEmpty(),
323323
name = rumContext.viewName,
324324
url = rumContext.viewUrl.orEmpty()
325325
),
326-
vital = RumVitalEvent.RumVitalEventVital(
326+
vital = VitalEvent.VitalEventVital(
327327
id = UUID.randomUUID().toString(),
328328
name = name,
329329
operationKey = operationKey,
330330
stepType = stepType,
331331
failureReason = failureReason,
332-
type = RumVitalEvent.RumVitalEventVitalType.OPERATION_STEP
332+
type = VitalEvent.VitalEventVitalType.OPERATION_STEP
333333
)
334334
)
335335
}

0 commit comments

Comments
 (0)