Skip to content

[Flutter hybrid support] Add slotId support to Full/Incremental snapshot records #3674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jonathanmos wants to merge 1 commit into from
Closed

[Flutter hybrid support] Add slotId support to Full/Incremental snapshot records #3674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions features/dd-sdk-android-session-replay/api/apiSurface
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@ data class com.datadog.android.sessionreplay.model.MobileSegment
sealed class MobileRecord
abstract fun toJson(): com.google.gson.JsonElement
data class MobileFullSnapshotRecord : MobileRecord
constructor(kotlin.Long, Data)
constructor(kotlin.Long, kotlin.String? = null, Data)
val type: kotlin.Long
override fun toJson(): com.google.gson.JsonElement
companion object
fun fromJson(kotlin.String): MobileFullSnapshotRecord
fun fromJsonObject(com.google.gson.JsonObject): MobileFullSnapshotRecord
data class MobileIncrementalSnapshotRecord : MobileRecord
constructor(kotlin.Long, MobileIncrementalData)
constructor(kotlin.Long, kotlin.String? = null, MobileIncrementalData)
val type: kotlin.Long
override fun toJson(): com.google.gson.JsonElement
companion object
Expand Down
22 changes: 14 additions & 8 deletions features/dd-sdk-android-session-replay/api/dd-sdk-android-session-replay.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,15 +560,18 @@ public final class com/datadog/android/sessionreplay/model/MobileSegment$MobileR

public final class com/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord : com/datadog/android/sessionreplay/model/MobileSegment$MobileRecord {
public static final field Companion Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord$Companion;
public fun <init> (JLcom/datadog/android/sessionreplay/model/MobileSegment$Data;)V
public fun <init> (JLjava/lang/String;Lcom/datadog/android/sessionreplay/model/MobileSegment$Data;)V
public synthetic fun <init> (JLjava/lang/String;Lcom/datadog/android/sessionreplay/model/MobileSegment$Data;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()J
public final fun component2 ()Lcom/datadog/android/sessionreplay/model/MobileSegment$Data;
public final fun copy (JLcom/datadog/android/sessionreplay/model/MobileSegment$Data;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord;
public static synthetic fun copy$default (Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord;JLcom/datadog/android/sessionreplay/model/MobileSegment$Data;ILjava/lang/Object;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord;
public final fun component2 ()Ljava/lang/String;
public final fun component3 ()Lcom/datadog/android/sessionreplay/model/MobileSegment$Data;
public final fun copy (JLjava/lang/String;Lcom/datadog/android/sessionreplay/model/MobileSegment$Data;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord;
public static synthetic fun copy$default (Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord;JLjava/lang/String;Lcom/datadog/android/sessionreplay/model/MobileSegment$Data;ILjava/lang/Object;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord;
public fun equals (Ljava/lang/Object;)Z
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord;
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileFullSnapshotRecord;
public final fun getData ()Lcom/datadog/android/sessionreplay/model/MobileSegment$Data;
public final fun getSlotId ()Ljava/lang/String;
public final fun getTimestamp ()J
public final fun getType ()J
public fun hashCode ()I
Expand All @@ -583,15 +586,18 @@ public final class com/datadog/android/sessionreplay/model/MobileSegment$MobileR

public final class com/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord : com/datadog/android/sessionreplay/model/MobileSegment$MobileRecord {
public static final field Companion Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord$Companion;
public fun <init> (JLcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;)V
public fun <init> (JLjava/lang/String;Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;)V
public synthetic fun <init> (JLjava/lang/String;Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()J
public final fun component2 ()Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;
public final fun copy (JLcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord;
public static synthetic fun copy$default (Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord;JLcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;ILjava/lang/Object;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord;
public final fun component2 ()Ljava/lang/String;
public final fun component3 ()Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;
public final fun copy (JLjava/lang/String;Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord;
public static synthetic fun copy$default (Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord;JLjava/lang/String;Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;ILjava/lang/Object;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord;
public fun equals (Ljava/lang/Object;)Z
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord;
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileRecord$MobileIncrementalSnapshotRecord;
public final fun getData ()Lcom/datadog/android/sessionreplay/model/MobileSegment$MobileIncrementalData;
public final fun getSlotId ()Ljava/lang/String;
public final fun getTimestamp ()J
public final fun getType ()J
public fun hashCode ()I
Expand Down
2 changes: 1 addition & 1 deletion ...ssion-replay/src/main/json/schemas/session-replay/mobile/full-snapshot-record-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"description": "Mobile-specific. Schema of a Record type which contains the full snapshot of a screen.",
"allOf": [
{
"$ref": "../common/_common-record-schema.json"
"$ref": "../common/_slot-supported-common-record-schema.json"
},
{
"required": ["type", "data"],
Expand Down
2 changes: 1 addition & 1 deletion ...eplay/src/main/json/schemas/session-replay/mobile/incremental-snapshot-record-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"description": "Mobile-specific. Schema of a Record type which contains mutations of a screen.",
"allOf": [
{
"$ref": "../common/_common-record-schema.json"
"$ref": "../common/_slot-supported-common-record-schema.json"
},
{
"required": ["type", "data"],
Expand Down
8 changes: 4 additions & 4 deletions ...main/kotlin/com/datadog/android/sessionreplay/internal/processor/RecordedDataProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,16 @@ internal class RecordedDataProcessor(
if (fullSnapshotRequired) {
records.add(
MobileSegment.MobileRecord.MobileFullSnapshotRecord(
timestamp,
MobileSegment.Data(wireframes)
timestamp = timestamp,
data = MobileSegment.Data(wireframes)
)
)
} else {
mutationResolver.resolveMutations(prevSnapshot, wireframes)?.let {
records.add(
MobileSegment.MobileRecord.MobileIncrementalSnapshotRecord(
timestamp,
it
timestamp = timestamp,
data = it
)
)
}
Expand Down
5 changes: 3 additions & 2 deletions ...c/test/kotlin/com/datadog/android/sessionreplay/forge/FullSnapshotRecordForgeryFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ internal class FullSnapshotRecordForgeryFactory :
ForgeryFactory<MobileSegment.MobileRecord.MobileFullSnapshotRecord> {
override fun getForgery(forge: Forge): MobileSegment.MobileRecord.MobileFullSnapshotRecord {
return MobileSegment.MobileRecord.MobileFullSnapshotRecord(
forge.aPositiveLong(),
MobileSegment.Data(forge.aList { forge.getForgery() })
timestamp = forge.aPositiveLong(),
slotId = forge.aNullable { aPositiveLong().toString() },
data = MobileSegment.Data(forge.aList { forge.getForgery() })
)
}
}
5 changes: 3 additions & 2 deletions ...kotlin/com/datadog/android/sessionreplay/forge/IncrementalSnapshotRecordForgeryFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ internal class IncrementalSnapshotRecordForgeryFactory :
ForgeryFactory<MobileSegment.MobileRecord.MobileIncrementalSnapshotRecord> {
override fun getForgery(forge: Forge): MobileSegment.MobileRecord.MobileIncrementalSnapshotRecord {
return MobileSegment.MobileRecord.MobileIncrementalSnapshotRecord(
forge.aPositiveLong(),
forge.getForgery()
timestamp = forge.aPositiveLong(),
slotId = forge.aNullable { aPositiveLong().toString() },
data = forge.getForgery()
)
}
}
Loading