From 19ef3d21f971cf09ee1e155c3e1adcd015b582dd Mon Sep 17 00:00:00 2001 From: Marius Constantin Date: Thu, 21 Jul 2022 14:22:59 +0200 Subject: [PATCH] Small fix in the schema generator tasks --- .../android/nightly/rum/RumConfigE2ETests.kt | 4 +- .../dd-sdk-android-session-replay/apiSurface | 510 ------------------ .../generate_session_replay_models.gradle.kts | 10 +- 3 files changed, 11 insertions(+), 513 deletions(-) diff --git a/instrumented/nightly-tests/src/androidTest/kotlin/com/datadog/android/nightly/rum/RumConfigE2ETests.kt b/instrumented/nightly-tests/src/androidTest/kotlin/com/datadog/android/nightly/rum/RumConfigE2ETests.kt index d85494c43d..d30b459e0c 100644 --- a/instrumented/nightly-tests/src/androidTest/kotlin/com/datadog/android/nightly/rum/RumConfigE2ETests.kt +++ b/instrumented/nightly-tests/src/androidTest/kotlin/com/datadog/android/nightly/rum/RumConfigE2ETests.kt @@ -304,7 +304,7 @@ class RumConfigE2ETests { tracesEnabled = true, rumEnabled = true, crashReportsEnabled = true, - sessionReplayEnabled = true + sessionReplayEnabled = true ).setRumActionEventMapper( eventMapper = object : EventMapper { override fun map(event: ActionEvent): ActionEvent? { @@ -703,7 +703,7 @@ class RumConfigE2ETests { tracesEnabled = true, rumEnabled = true, crashReportsEnabled = true, - sessionReplayEnabled = true + sessionReplayEnabled = true ) .useViewTrackingStrategy(strategy) .setVitalsUpdateFrequency(VitalsUpdateFrequency.NEVER) diff --git a/library/dd-sdk-android-session-replay/apiSurface b/library/dd-sdk-android-session-replay/apiSurface index c8c16a8386..df30478304 100644 --- a/library/dd-sdk-android-session-replay/apiSurface +++ b/library/dd-sdk-android-session-replay/apiSurface @@ -8,345 +8,6 @@ class com.datadog.android.sessionreplay.SessionReplayLifecycleCallback : android override fun onActivityDestroyed(android.app.Activity) fun register(android.app.Application) fun unregisterAndStopRecorders(android.app.Application) -data class com.datadog.android.sessionreplay.model.FullSnapshotRecord - constructor(kotlin.Long, Data) - val type: kotlin.Long - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): FullSnapshotRecord - data class Data - constructor(kotlin.collections.List) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Data - sealed class Wireframe - abstract fun toJson(): com.google.gson.JsonElement - data class ShapeWireframe : Wireframe - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, ShapeStyle? = null, ShapeBorder? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeWireframe - data class TextWireframe : Wireframe - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, ShapeStyle? = null, ShapeBorder? = null, kotlin.String, TextStyle, TextPosition? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextWireframe - companion object - fun fromJson(kotlin.String): Wireframe - data class ShapeStyle - constructor(kotlin.String? = null, kotlin.Number? = null, kotlin.Number? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeStyle - data class ShapeBorder - constructor(kotlin.String, kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeBorder - data class TextStyle - constructor(kotlin.String, kotlin.Long, Type, kotlin.String) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextStyle - data class TextPosition - constructor(Padding? = null, Alignment? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextPosition - data class Padding - constructor(kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Padding - data class Alignment - constructor(Horizontal? = null, Vertical? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Alignment - enum Type - constructor(kotlin.String) - - SERIF - - SANS_SERIF - - SCRIPT - - MONOSPACED - - DYNAMIC - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Type - enum Horizontal - constructor(kotlin.String) - - LEFT - - RIGHT - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Horizontal - enum Vertical - constructor(kotlin.String) - - TOP - - BOTTOM - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Vertical -sealed class com.datadog.android.sessionreplay.model.IncrementalData - abstract fun toJson(): com.google.gson.JsonElement - data class MutationData : IncrementalData - constructor(kotlin.collections.List? = null, kotlin.collections.List? = null, kotlin.collections.List? = null) - val source: kotlin.Long - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): MutationData - data class ViewportResizeData : IncrementalData - constructor(kotlin.Long? = null, kotlin.Long? = null) - val source: kotlin.Long - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ViewportResizeData - data class TouchData : IncrementalData - constructor(kotlin.collections.List? = null) - val source: kotlin.Long - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TouchData - companion object - fun fromJson(kotlin.String): IncrementalData - data class Add - constructor(kotlin.Long? = null, Wireframe) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Add - data class Remove - constructor(kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Remove - sealed class WireframeUpdateMutation - abstract fun toJson(): com.google.gson.JsonElement - data class TextWireframeUpdate : WireframeUpdateMutation - constructor(kotlin.Long, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, ShapeStyle? = null, ShapeBorder? = null, kotlin.String? = null, TextStyle? = null, TextPosition? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextWireframeUpdate - data class ShapeWireframeUpdate : WireframeUpdateMutation - constructor(kotlin.Long, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, ShapeStyle? = null, ShapeBorder? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeWireframeUpdate - companion object - fun fromJson(kotlin.String): WireframeUpdateMutation - data class Position - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Position - sealed class Wireframe - abstract fun toJson(): com.google.gson.JsonElement - data class ShapeWireframe : Wireframe - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, ShapeStyle? = null, ShapeBorder? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeWireframe - data class TextWireframe : Wireframe - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, ShapeStyle? = null, ShapeBorder? = null, kotlin.String, TextStyle, TextPosition? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextWireframe - companion object - fun fromJson(kotlin.String): Wireframe - data class ShapeStyle - constructor(kotlin.String? = null, kotlin.Number? = null, kotlin.Number? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeStyle - data class ShapeBorder - constructor(kotlin.String, kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeBorder - data class TextStyle - constructor(kotlin.String, kotlin.Long, Type, kotlin.String) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextStyle - data class TextPosition - constructor(Padding? = null, Alignment? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextPosition - data class Padding - constructor(kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Padding - data class Alignment - constructor(Horizontal? = null, Vertical? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Alignment - enum Type - constructor(kotlin.String) - - SERIF - - SANS_SERIF - - SCRIPT - - MONOSPACED - - DYNAMIC - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Type - enum Horizontal - constructor(kotlin.String) - - LEFT - - RIGHT - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Horizontal - enum Vertical - constructor(kotlin.String) - - TOP - - BOTTOM - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Vertical -data class com.datadog.android.sessionreplay.model.IncrementalSnapshotRecord - constructor(kotlin.Long, IncrementalData) - val type: kotlin.Long - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): IncrementalSnapshotRecord - sealed class IncrementalData - abstract fun toJson(): com.google.gson.JsonElement - data class MutationData : IncrementalData - constructor(kotlin.collections.List? = null, kotlin.collections.List? = null, kotlin.collections.List? = null) - val source: kotlin.Long - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): MutationData - data class ViewportResizeData : IncrementalData - constructor(kotlin.Long? = null, kotlin.Long? = null) - val source: kotlin.Long - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ViewportResizeData - data class TouchData : IncrementalData - constructor(kotlin.collections.List? = null) - val source: kotlin.Long - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TouchData - companion object - fun fromJson(kotlin.String): IncrementalData - data class Add - constructor(kotlin.Long? = null, Wireframe) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Add - data class Remove - constructor(kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Remove - sealed class WireframeUpdateMutation - abstract fun toJson(): com.google.gson.JsonElement - data class TextWireframeUpdate : WireframeUpdateMutation - constructor(kotlin.Long, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, ShapeStyle? = null, ShapeBorder? = null, kotlin.String? = null, TextStyle? = null, TextPosition? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextWireframeUpdate - data class ShapeWireframeUpdate : WireframeUpdateMutation - constructor(kotlin.Long, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, ShapeStyle? = null, ShapeBorder? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeWireframeUpdate - companion object - fun fromJson(kotlin.String): WireframeUpdateMutation - data class Position - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Position - sealed class Wireframe - abstract fun toJson(): com.google.gson.JsonElement - data class ShapeWireframe : Wireframe - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, ShapeStyle? = null, ShapeBorder? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeWireframe - data class TextWireframe : Wireframe - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, ShapeStyle? = null, ShapeBorder? = null, kotlin.String, TextStyle, TextPosition? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextWireframe - companion object - fun fromJson(kotlin.String): Wireframe - data class ShapeStyle - constructor(kotlin.String? = null, kotlin.Number? = null, kotlin.Number? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeStyle - data class ShapeBorder - constructor(kotlin.String, kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeBorder - data class TextStyle - constructor(kotlin.String, kotlin.Long, Type, kotlin.String) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextStyle - data class TextPosition - constructor(Padding? = null, Alignment? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextPosition - data class Padding - constructor(kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Padding - data class Alignment - constructor(Horizontal? = null, Vertical? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Alignment - enum Type - constructor(kotlin.String) - - SERIF - - SANS_SERIF - - SCRIPT - - MONOSPACED - - DYNAMIC - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Type - enum Horizontal - constructor(kotlin.String) - - LEFT - - RIGHT - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Horizontal - enum Vertical - constructor(kotlin.String) - - TOP - - BOTTOM - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Vertical sealed class com.datadog.android.sessionreplay.model.Record abstract fun toJson(): com.google.gson.JsonElement data class FullSnapshotRecord : Record @@ -736,16 +397,6 @@ data class com.datadog.android.sessionreplay.model.Segment fun toJson(): com.google.gson.JsonElement companion object fun fromJson(kotlin.String): Vertical -data class com.datadog.android.sessionreplay.model.ShapeBorder - constructor(kotlin.String, kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeBorder -data class com.datadog.android.sessionreplay.model.ShapeStyle - constructor(kotlin.String? = null, kotlin.Number? = null, kotlin.Number? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeStyle data class com.datadog.android.sessionreplay.model.TextPosition constructor(Padding? = null, Alignment? = null) fun toJson(): com.google.gson.JsonElement @@ -777,164 +428,3 @@ data class com.datadog.android.sessionreplay.model.TextPosition fun toJson(): com.google.gson.JsonElement companion object fun fromJson(kotlin.String): Vertical -data class com.datadog.android.sessionreplay.model.TextStyle - constructor(kotlin.String, kotlin.Long, Type, kotlin.String) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextStyle - enum Type - constructor(kotlin.String) - - SERIF - - SANS_SERIF - - SCRIPT - - MONOSPACED - - DYNAMIC - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Type -sealed class com.datadog.android.sessionreplay.model.Wireframe - abstract fun toJson(): com.google.gson.JsonElement - data class ShapeWireframe : Wireframe - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, ShapeStyle? = null, ShapeBorder? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeWireframe - data class TextWireframe : Wireframe - constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, ShapeStyle? = null, ShapeBorder? = null, kotlin.String, TextStyle, TextPosition? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextWireframe - companion object - fun fromJson(kotlin.String): Wireframe - data class ShapeStyle - constructor(kotlin.String? = null, kotlin.Number? = null, kotlin.Number? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeStyle - data class ShapeBorder - constructor(kotlin.String, kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeBorder - data class TextStyle - constructor(kotlin.String, kotlin.Long, Type, kotlin.String) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextStyle - data class TextPosition - constructor(Padding? = null, Alignment? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextPosition - data class Padding - constructor(kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Padding - data class Alignment - constructor(Horizontal? = null, Vertical? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Alignment - enum Type - constructor(kotlin.String) - - SERIF - - SANS_SERIF - - SCRIPT - - MONOSPACED - - DYNAMIC - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Type - enum Horizontal - constructor(kotlin.String) - - LEFT - - RIGHT - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Horizontal - enum Vertical - constructor(kotlin.String) - - TOP - - BOTTOM - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Vertical -sealed class com.datadog.android.sessionreplay.model.WireframeUpdateMutation - abstract fun toJson(): com.google.gson.JsonElement - data class TextWireframeUpdate : WireframeUpdateMutation - constructor(kotlin.Long, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, ShapeStyle? = null, ShapeBorder? = null, kotlin.String? = null, TextStyle? = null, TextPosition? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextWireframeUpdate - data class ShapeWireframeUpdate : WireframeUpdateMutation - constructor(kotlin.Long, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, ShapeStyle? = null, ShapeBorder? = null) - val type: kotlin.String - override fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeWireframeUpdate - companion object - fun fromJson(kotlin.String): WireframeUpdateMutation - data class ShapeStyle - constructor(kotlin.String? = null, kotlin.Number? = null, kotlin.Number? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeStyle - data class ShapeBorder - constructor(kotlin.String, kotlin.Long) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): ShapeBorder - data class TextStyle - constructor(kotlin.String, kotlin.Long, Type, kotlin.String) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextStyle - data class TextPosition - constructor(Padding? = null, Alignment? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): TextPosition - data class Padding - constructor(kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Padding - data class Alignment - constructor(Horizontal? = null, Vertical? = null) - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Alignment - enum Type - constructor(kotlin.String) - - SERIF - - SANS_SERIF - - SCRIPT - - MONOSPACED - - DYNAMIC - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Type - enum Horizontal - constructor(kotlin.String) - - LEFT - - RIGHT - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Horizontal - enum Vertical - constructor(kotlin.String) - - TOP - - BOTTOM - - CENTER - fun toJson(): com.google.gson.JsonElement - companion object - fun fromJson(kotlin.String): Vertical -data class com.datadog.android.sessionreplay.recorder.Node - constructor(Int, Node? = null) diff --git a/library/dd-sdk-android-session-replay/generate_session_replay_models.gradle.kts b/library/dd-sdk-android-session-replay/generate_session_replay_models.gradle.kts index 0291abf061..14b0552e0c 100644 --- a/library/dd-sdk-android-session-replay/generate_session_replay_models.gradle.kts +++ b/library/dd-sdk-android-session-replay/generate_session_replay_models.gradle.kts @@ -36,7 +36,15 @@ tasks.register( "shape-wireframe-schema.json", "text-wireframe-schema.json", "shape-wireframe-update-schema.json", - "text-wireframe-update-schema.json" + "text-wireframe-update-schema.json", + "full-snapshot-record-schema.json", + "incremental-snapshot-record-schema.json", + "incremental-data-schema.json", + "text-style-schema.json", + "shape-style-schema.json", + "shape-border-schema.json", + "wireframe-schema.json", + "wireframe-update-mutation-schema.json" ) }