Update enums to match RUM event schema

DataDog · Jan 13, 2025 · 00b9ef7 · 00b9ef7
1 parent 3adfe60
commit 00b9ef7
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 7 deletions.
diff --git a/dd-sdk-android-core/api/apiSurface b/dd-sdk-android-core/api/apiSurface
@@ -65,6 +65,8 @@ enum com.datadog.android.api.context.DeviceType
   - TABLET
   - TV
   - DESKTOP
+  - GAMING_CONSOLE
+  - BOT
   - OTHER
 data class com.datadog.android.api.context.NetworkInfo
   constructor(Connectivity = Connectivity.NETWORK_NOT_CONNECTED, kotlin.String? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.String? = null)

diff --git a/dd-sdk-android-core/api/dd-sdk-android-core.api b/dd-sdk-android-core/api/dd-sdk-android-core.api
@@ -195,7 +195,9 @@ public final class com/datadog/android/api/context/DeviceInfo {
 }
 
 public final class com/datadog/android/api/context/DeviceType : java/lang/Enum {
+	public static final field BOT Lcom/datadog/android/api/context/DeviceType;
 	public static final field DESKTOP Lcom/datadog/android/api/context/DeviceType;
+	public static final field GAMING_CONSOLE Lcom/datadog/android/api/context/DeviceType;
 	public static final field MOBILE Lcom/datadog/android/api/context/DeviceType;
 	public static final field OTHER Lcom/datadog/android/api/context/DeviceType;
 	public static final field TABLET Lcom/datadog/android/api/context/DeviceType;

diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/context/DeviceType.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/context/DeviceType.kt
@@ -14,5 +14,7 @@ enum class DeviceType {
     TABLET,
     TV,
     DESKTOP,
+    GAMING_CONSOLE,
+    BOT,
     OTHER
 }
diff --git a/features/dd-sdk-android-rum/api/apiSurface b/features/dd-sdk-android-rum/api/apiSurface
@@ -92,6 +92,8 @@ enum com.datadog.android.rum.RumErrorSource
   - LOGGER
   - AGENT
   - WEBVIEW
+  - CUSTOM
+  - REPORT
 interface com.datadog.android.rum.RumMonitor
   fun getCurrentSessionId((String?) -> Unit)
   fun startView(Any, String, Map<String, Any?> = emptyMap())

diff --git a/features/dd-sdk-android-rum/api/dd-sdk-android-rum.api b/features/dd-sdk-android-rum/api/dd-sdk-android-rum.api
@@ -129,8 +129,10 @@ public final class com/datadog/android/rum/RumConfiguration$Builder {
 public final class com/datadog/android/rum/RumErrorSource : java/lang/Enum {
 	public static final field AGENT Lcom/datadog/android/rum/RumErrorSource;
 	public static final field CONSOLE Lcom/datadog/android/rum/RumErrorSource;
+	public static final field CUSTOM Lcom/datadog/android/rum/RumErrorSource;
 	public static final field LOGGER Lcom/datadog/android/rum/RumErrorSource;
 	public static final field NETWORK Lcom/datadog/android/rum/RumErrorSource;
+	public static final field REPORT Lcom/datadog/android/rum/RumErrorSource;
 	public static final field SOURCE Lcom/datadog/android/rum/RumErrorSource;
 	public static final field WEBVIEW Lcom/datadog/android/rum/RumErrorSource;
 	public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/rum/RumErrorSource;

diff --git a/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/RumErrorSource.kt b/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/RumErrorSource.kt
@@ -27,5 +27,11 @@ enum class RumErrorSource {
     AGENT,
 
     /** Error originated in a WebView. */
-    WEBVIEW
+    WEBVIEW,
+
+    /** Custom error source. */
+    CUSTOM,
+
+    /** Error originated in a System report. */
+    REPORT
 }
diff --git a/...-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumEventExt.kt b/...-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumEventExt.kt
@@ -94,6 +94,8 @@ internal fun RumErrorSource.toSchemaSource(): ErrorEvent.ErrorSource {
         RumErrorSource.LOGGER -> ErrorEvent.ErrorSource.LOGGER
         RumErrorSource.AGENT -> ErrorEvent.ErrorSource.AGENT
         RumErrorSource.WEBVIEW -> ErrorEvent.ErrorSource.WEBVIEW
+        RumErrorSource.CUSTOM -> ErrorEvent.ErrorSource.CUSTOM
+        RumErrorSource.REPORT -> ErrorEvent.ErrorSource.REPORT
     }
 }
 
@@ -178,6 +180,7 @@ internal fun NetworkInfo.toResourceConnectivity(): ResourceEvent.Connectivity {
         NetworkInfo.Connectivity.NETWORK_5G,
         NetworkInfo.Connectivity.NETWORK_MOBILE_OTHER,
         NetworkInfo.Connectivity.NETWORK_CELLULAR -> listOf(ResourceEvent.Interface.CELLULAR)
+
         NetworkInfo.Connectivity.NETWORK_OTHER -> listOf(ResourceEvent.Interface.OTHER)
         NetworkInfo.Connectivity.NETWORK_NOT_CONNECTED -> emptyList()
     }
@@ -214,6 +217,7 @@ internal fun NetworkInfo.toErrorConnectivity(): ErrorEvent.Connectivity {
         NetworkInfo.Connectivity.NETWORK_5G,
         NetworkInfo.Connectivity.NETWORK_MOBILE_OTHER,
         NetworkInfo.Connectivity.NETWORK_CELLULAR -> listOf(ErrorEvent.Interface.CELLULAR)
+
         NetworkInfo.Connectivity.NETWORK_OTHER -> listOf(ErrorEvent.Interface.OTHER)
         NetworkInfo.Connectivity.NETWORK_NOT_CONNECTED -> emptyList()
     }
@@ -250,6 +254,7 @@ internal fun NetworkInfo.toLongTaskConnectivity(): LongTaskEvent.Connectivity {
         NetworkInfo.Connectivity.NETWORK_5G,
         NetworkInfo.Connectivity.NETWORK_MOBILE_OTHER,
         NetworkInfo.Connectivity.NETWORK_CELLULAR -> listOf(LongTaskEvent.Interface.CELLULAR)
+
         NetworkInfo.Connectivity.NETWORK_OTHER -> listOf(LongTaskEvent.Interface.OTHER)
         NetworkInfo.Connectivity.NETWORK_NOT_CONNECTED -> emptyList()
     }
@@ -286,6 +291,7 @@ internal fun NetworkInfo.toViewConnectivity(): ViewEvent.Connectivity {
         NetworkInfo.Connectivity.NETWORK_5G,
         NetworkInfo.Connectivity.NETWORK_MOBILE_OTHER,
         NetworkInfo.Connectivity.NETWORK_CELLULAR -> listOf(ViewEvent.Interface.CELLULAR)
+
         NetworkInfo.Connectivity.NETWORK_OTHER -> listOf(ViewEvent.Interface.OTHER)
         NetworkInfo.Connectivity.NETWORK_NOT_CONNECTED -> emptyList()
     }
@@ -322,6 +328,7 @@ internal fun NetworkInfo.toActionConnectivity(): ActionEvent.Connectivity {
         NetworkInfo.Connectivity.NETWORK_5G,
         NetworkInfo.Connectivity.NETWORK_MOBILE_OTHER,
         NetworkInfo.Connectivity.NETWORK_CELLULAR -> listOf(ActionEvent.Interface.CELLULAR)
+
         NetworkInfo.Connectivity.NETWORK_OTHER -> listOf(ActionEvent.Interface.OTHER)
         NetworkInfo.Connectivity.NETWORK_NOT_CONNECTED -> emptyList()
     }
@@ -355,7 +362,9 @@ internal fun DeviceType.toViewSchemaType(): ViewEvent.DeviceType {
         DeviceType.TABLET -> ViewEvent.DeviceType.TABLET
         DeviceType.TV -> ViewEvent.DeviceType.TV
         DeviceType.DESKTOP -> ViewEvent.DeviceType.DESKTOP
-        else -> ViewEvent.DeviceType.OTHER
+        DeviceType.GAMING_CONSOLE -> ViewEvent.DeviceType.GAMING_CONSOLE
+        DeviceType.BOT -> ViewEvent.DeviceType.BOT
+        DeviceType.OTHER -> ViewEvent.DeviceType.OTHER
     }
 }
 
@@ -365,7 +374,9 @@ internal fun DeviceType.toActionSchemaType(): ActionEvent.DeviceType {
         DeviceType.TABLET -> ActionEvent.DeviceType.TABLET
         DeviceType.TV -> ActionEvent.DeviceType.TV
         DeviceType.DESKTOP -> ActionEvent.DeviceType.DESKTOP
-        else -> ActionEvent.DeviceType.OTHER
+        DeviceType.GAMING_CONSOLE -> ActionEvent.DeviceType.GAMING_CONSOLE
+        DeviceType.BOT -> ActionEvent.DeviceType.BOT
+        DeviceType.OTHER -> ActionEvent.DeviceType.OTHER
     }
 }
 
@@ -375,7 +386,9 @@ internal fun DeviceType.toLongTaskSchemaType(): LongTaskEvent.DeviceType {
         DeviceType.TABLET -> LongTaskEvent.DeviceType.TABLET
         DeviceType.TV -> LongTaskEvent.DeviceType.TV
         DeviceType.DESKTOP -> LongTaskEvent.DeviceType.DESKTOP
-        else -> LongTaskEvent.DeviceType.OTHER
+        DeviceType.GAMING_CONSOLE -> LongTaskEvent.DeviceType.GAMING_CONSOLE
+        DeviceType.BOT -> LongTaskEvent.DeviceType.BOT
+        DeviceType.OTHER -> LongTaskEvent.DeviceType.OTHER
     }
 }
 
@@ -385,7 +398,9 @@ internal fun DeviceType.toResourceSchemaType(): ResourceEvent.DeviceType {
         DeviceType.TABLET -> ResourceEvent.DeviceType.TABLET
         DeviceType.TV -> ResourceEvent.DeviceType.TV
         DeviceType.DESKTOP -> ResourceEvent.DeviceType.DESKTOP
-        else -> ResourceEvent.DeviceType.OTHER
+        DeviceType.GAMING_CONSOLE -> ResourceEvent.DeviceType.GAMING_CONSOLE
+        DeviceType.BOT -> ResourceEvent.DeviceType.BOT
+        DeviceType.OTHER -> ResourceEvent.DeviceType.OTHER
     }
 }
 
@@ -395,7 +410,9 @@ internal fun DeviceType.toErrorSchemaType(): ErrorEvent.DeviceType {
         DeviceType.TABLET -> ErrorEvent.DeviceType.TABLET
         DeviceType.TV -> ErrorEvent.DeviceType.TV
         DeviceType.DESKTOP -> ErrorEvent.DeviceType.DESKTOP
-        else -> ErrorEvent.DeviceType.OTHER
+        DeviceType.GAMING_CONSOLE -> ErrorEvent.DeviceType.GAMING_CONSOLE
+        DeviceType.BOT -> ErrorEvent.DeviceType.BOT
+        DeviceType.OTHER -> ErrorEvent.DeviceType.OTHER
     }
 }
 

diff --git a/...ce/src/main/kotlin/com/datadog/android/trace/internal/domain/event/BaseSpanEventMapper.kt b/...ce/src/main/kotlin/com/datadog/android/trace/internal/domain/event/BaseSpanEventMapper.kt
@@ -68,7 +68,9 @@ internal abstract class BaseSpanEventMapper<T> : ContextAwareMapper<T, SpanEvent
             DeviceType.TABLET -> SpanEvent.Type.TABLET
             DeviceType.TV -> SpanEvent.Type.TV
             DeviceType.DESKTOP -> SpanEvent.Type.DESKTOP
-            else -> SpanEvent.Type.OTHER
+            DeviceType.GAMING_CONSOLE -> SpanEvent.Type.GAMING_CONSOLE
+            DeviceType.BOT -> SpanEvent.Type.BOT
+            DeviceType.OTHER -> SpanEvent.Type.OTHER
         }
     }
 }
diff --git a/...dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/assertj/SpanEventAssert.kt b/...dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/assertj/SpanEventAssert.kt
@@ -334,6 +334,8 @@ internal class SpanEventAssert(actual: SpanEvent) :
             DeviceType.DESKTOP -> SpanEvent.Type.DESKTOP
             DeviceType.TV -> SpanEvent.Type.TV
             DeviceType.OTHER -> SpanEvent.Type.OTHER
+            DeviceType.GAMING_CONSOLE -> SpanEvent.Type.GAMING_CONSOLE
+            DeviceType.BOT -> SpanEvent.Type.BOT
         }
         assertThat(actual.meta.device.type)
             .overridingErrorMessage(

diff --git a/...le-fit/rum/src/test/kotlin/com/datadog/android/rum/integration/tests/elmyr/RumEventExt.kt b/...le-fit/rum/src/test/kotlin/com/datadog/android/rum/integration/tests/elmyr/RumEventExt.kt
@@ -93,6 +93,8 @@ internal fun RumErrorSource.toSchemaSource(): ErrorEvent.ErrorSource {
         RumErrorSource.LOGGER -> ErrorEvent.ErrorSource.LOGGER
         RumErrorSource.AGENT -> ErrorEvent.ErrorSource.AGENT
         RumErrorSource.WEBVIEW -> ErrorEvent.ErrorSource.WEBVIEW
+        RumErrorSource.CUSTOM -> ErrorEvent.ErrorSource.CUSTOM
+        RumErrorSource.REPORT -> ErrorEvent.ErrorSource.REPORT
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,8 @@ enum com.datadog.android.api.context.DeviceType @@
       - TABLET
       - TV
       - DESKTOP
+      - GAMING_CONSOLE
+      - BOT
       - OTHER
     data class com.datadog.android.api.context.NetworkInfo
       constructor(Connectivity = Connectivity.NETWORK_NOT_CONNECTED, kotlin.String? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.String? = null)
@@ Expand Down @@