diff --git a/dd-sdk-android/apiSurface b/dd-sdk-android/apiSurface index 99859f3e38..8ec2b448cc 100644 --- a/dd-sdk-android/apiSurface +++ b/dd-sdk-android/apiSurface @@ -1608,7 +1608,7 @@ data class com.datadog.android.telemetry.model.TelemetryConfigurationEvent companion object fun fromJson(kotlin.String): Telemetry data class Configuration - constructor(kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.String? = null, kotlin.Boolean? = null, kotlin.String? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.collections.List? = null, kotlin.collections.List? = null, kotlin.Boolean? = null, ViewTrackingStrategy? = null, kotlin.Boolean? = null, kotlin.Long? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.String? = null, kotlin.Boolean? = null, kotlin.Long? = null, kotlin.Long? = null) + constructor(kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.String? = null, kotlin.Boolean? = null, kotlin.String? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.collections.List? = null, kotlin.collections.List? = null, kotlin.Boolean? = null, ViewTrackingStrategy? = null, kotlin.Boolean? = null, kotlin.Long? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.Boolean? = null, kotlin.String? = null, kotlin.Boolean? = null, kotlin.Long? = null, kotlin.Long? = null) fun toJson(): com.google.gson.JsonElement companion object fun fromJson(kotlin.String): Configuration diff --git a/dd-sdk-android/src/main/json/telemetry/configuration-schema.json b/dd-sdk-android/src/main/json/telemetry/configuration-schema.json index 6903b42a3d..98e4bf97ad 100644 --- a/dd-sdk-android/src/main/json/telemetry/configuration-schema.json +++ b/dd-sdk-android/src/main/json/telemetry/configuration-schema.json @@ -9,17 +9,12 @@ "$ref": "_common-schema.json" }, { - "required": [ - "telemetry" - ], + "required": ["telemetry"], "properties": { "telemetry": { "type": "object", "description": "The telemetry configuration information", - "required": [ - "type", - "configuration" - ], + "required": ["type", "configuration"], "properties": { "type": { "type": "string", @@ -70,11 +65,13 @@ "type": "integer", "description": "The percentage of sessions with Browser RUM & Session Replay pricing tracked", "minimum": 0, - "maximum": 100 + "maximum": 100, + "readOnly": false }, "use_proxy": { "type": "boolean", - "description": "Whether a proxy configured is used" + "description": "Whether a proxy configured is used", + "readOnly": false }, "use_before_send": { "type": "boolean", @@ -88,6 +85,14 @@ "type": "boolean", "description": "Whether sessions across subdomains for the same site are tracked" }, + "track_resources": { + "type": "boolean", + "description": "Whether resources are tracked" + }, + "track_long_task": { + "type": "boolean", + "description": "Whether long tasks are tracked" + }, "use_cross_site_session_cookie": { "type": "boolean", "description": "Whether a secure cross-site session cookie is used" @@ -106,7 +111,8 @@ }, "default_privacy_level": { "type": "string", - "description": "Session replay default privacy level" + "description": "Session replay default privacy level", + "readOnly": false }, "use_excluded_activity_urls": { "type": "boolean", @@ -118,11 +124,13 @@ }, "track_views_manually": { "type": "boolean", - "description": "Whether the RUM views creation is handled manually" + "description": "Whether the RUM views creation is handled manually", + "readOnly": false }, "track_interactions": { "type": "boolean", - "description": "Whether user actions are tracked" + "description": "Whether user actions are tracked", + "readOnly": false }, "forward_errors_to_logs": { "type": "boolean", @@ -174,19 +182,23 @@ }, "track_background_events": { "type": "boolean", - "description": "Whether RUM events are tracked when the application is in Background" + "description": "Whether RUM events are tracked when the application is in Background", + "readOnly": false }, "mobile_vitals_update_period": { "type": "integer", - "description": "The period between each Mobile Vital sample (in milliseconds)" + "description": "The period between each Mobile Vital sample (in milliseconds)", + "readOnly": false }, "track_errors": { "type": "boolean", - "description": "Whether error monitoring & crash reporting is enabled for the source platform" + "description": "Whether error monitoring & crash reporting is enabled for the source platform", + "readOnly": false }, "track_network_requests": { "type": "boolean", - "description": "Whether automatic collection of network requests is enabled" + "description": "Whether automatic collection of network requests is enabled", + "readOnly": false }, "use_tracing": { "type": "boolean", @@ -194,27 +206,28 @@ }, "track_native_views": { "type": "boolean", - "description": "Whether native views are tracked (for cross platform SDKs)" + "description": "Whether native views are tracked (for cross platform SDKs)", + "readOnly": false }, "track_native_errors": { "type": "boolean", - "description": "Whether native error monitoring & crash reporting is enabled (for cross platform SDKs)" + "description": "Whether native error monitoring & crash reporting is enabled (for cross platform SDKs)", + "readOnly": false }, "track_native_long_tasks": { "type": "boolean", - "description": "Whether long task tracking is performed automatically" + "description": "Whether long task tracking is performed automatically", + "readOnly": false }, "track_cross_platform_long_tasks": { "type": "boolean", - "description": "Whether long task tracking is performed automatically for cross platform SDKs" - }, - "use_attach_to_existing": { - "type": "boolean", - "description": "Whether the cross-platform SDK was initialized on top of a pre-existing native SDK instance" + "description": "Whether long task tracking is performed automatically for cross platform SDKs", + "readOnly": false }, "use_first_party_hosts": { "type": "boolean", - "description": "Whether the client has provided a list of first party hosts" + "description": "Whether the client has provided a list of first party hosts", + "readOnly": false }, "initialization_type": { "type": "string", @@ -222,7 +235,8 @@ }, "track_flutter_performance": { "type": "boolean", - "description": "Whether Flutter build and raster time tracking is enabled" + "description": "Whether Flutter build and raster time tracking is enabled", + "readOnly": false }, "batch_size": { "type": "integer", diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/core/configuration/ConfigurationBuilderTest.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/core/configuration/ConfigurationBuilderTest.kt index bafe579939..de026749f3 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/core/configuration/ConfigurationBuilderTest.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/core/configuration/ConfigurationBuilderTest.kt @@ -776,7 +776,7 @@ internal class ConfigurationBuilderTest { val builder = testedBuilder _InternalProxy.setTelemetryConfigurationEventMapper(builder, eventMapper) val config = builder.build() - + // Then assertThat(config.coreConfig).isEqualTo(Configuration.DEFAULT_CORE_CONFIG) assertThat(config.logsConfig).isEqualTo(Configuration.DEFAULT_LOGS_CONFIG) diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/event/RumEventSerializerTest.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/event/RumEventSerializerTest.kt index 5ffcb37614..e611a7f0f3 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/event/RumEventSerializerTest.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/event/RumEventSerializerTest.kt @@ -685,9 +685,6 @@ internal class RumEventSerializerTest { configuration.trackCrossPlatformLongTasks!! ) } - if (configuration.useAttachToExisting != null) { - hasField("use_attach_to_existing", configuration.useAttachToExisting!!) - } if (configuration.useFirstPartyHosts != null) { hasField("use_first_party_hosts", configuration.useFirstPartyHosts!!) } diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/TelemetryConfigurationEventForgeryFactory.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/TelemetryConfigurationEventForgeryFactory.kt index 587c627837..afef6bb00c 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/TelemetryConfigurationEventForgeryFactory.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/TelemetryConfigurationEventForgeryFactory.kt @@ -57,6 +57,8 @@ internal class TelemetryConfigurationEventForgeryFactory : forge.aNullable { aBool() }, forge.aNullable { aBool() }, forge.aNullable { aBool() }, + forge.aNullable { aBool() }, + forge.aNullable { aBool() }, forge.aNullable { aString() }, forge.aNullable { aBool() }, forge.aNullable { aString() }, @@ -79,7 +81,6 @@ internal class TelemetryConfigurationEventForgeryFactory : forge.aNullable { aBool() }, forge.aNullable { aBool() }, forge.aNullable { aBool() }, - forge.aNullable { aBool() }, forge.aNullable { aString() }, forge.aNullable { aBool() }, forge.aNullable { aLong() },