Merge pull request #2794 from DataDog/tvaleev/feature/RUM-10316-aligning_device_and_os

RUM-10316: using common-schema for common object generation

Author: satween

features/dd-sdk-android-logs/api/apiSurface

@@ -35,23 +35,29 @@ data class com.datadog.android.log.LogsConfiguration
     fun setEventMapper(com.datadog.android.event.EventMapper<com.datadog.android.log.model.LogEvent>): Builder
     fun build(): LogsConfiguration
 data class com.datadog.android.log.model.LogEvent
-  constructor(Status, kotlin.String, kotlin.String, kotlin.String, Logger, Dd, Usr? = null, Account? = null, Network? = null, Error? = null, kotlin.String? = null, kotlin.String, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
+  constructor(Device, Os, Status, kotlin.String, kotlin.String, kotlin.String, Logger, Usr? = null, Account? = null, Network? = null, Error? = null, kotlin.String? = null, kotlin.String, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
   fun toJson(): com.google.gson.JsonElement
   companion object 
     fun fromJson(kotlin.String): LogEvent
     fun fromJsonObject(com.google.gson.JsonObject): LogEvent
+  data class Device
+    constructor(Type? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.collections.List<kotlin.String>? = null, kotlin.String? = null, kotlin.Number? = null, kotlin.Boolean? = null, kotlin.Number? = null)
+    fun toJson(): com.google.gson.JsonElement
+    companion object 
+      fun fromJson(kotlin.String): Device
+      fun fromJsonObject(com.google.gson.JsonObject): Device
+  data class Os
+    constructor(kotlin.String, kotlin.String, kotlin.String? = null, kotlin.String)
+    fun toJson(): com.google.gson.JsonElement
+    companion object 
+      fun fromJson(kotlin.String): Os
+      fun fromJsonObject(com.google.gson.JsonObject): Os
   data class Logger
     constructor(kotlin.String, kotlin.String? = null, kotlin.String)
     fun toJson(): com.google.gson.JsonElement
     companion object 
       fun fromJson(kotlin.String): Logger
       fun fromJsonObject(com.google.gson.JsonObject): Logger
-  data class Dd
-    constructor(Device)
-    fun toJson(): com.google.gson.JsonElement
-    companion object 
-      fun fromJson(kotlin.String): Dd
-      fun fromJsonObject(com.google.gson.JsonObject): Dd
   data class Usr
     constructor(kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
     fun toJson(): com.google.gson.JsonElement
@@ -76,12 +82,6 @@ data class com.datadog.android.log.model.LogEvent
     companion object 
       fun fromJson(kotlin.String): Error
       fun fromJsonObject(com.google.gson.JsonObject): Error
-  data class Device
-    constructor(kotlin.String)
-    fun toJson(): com.google.gson.JsonElement
-    companion object 
-      fun fromJson(kotlin.String): Device
-      fun fromJsonObject(com.google.gson.JsonObject): Device
   data class Client
     constructor(SimCarrier? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String)
     fun toJson(): com.google.gson.JsonElement
@@ -112,3 +112,15 @@ data class com.datadog.android.log.model.LogEvent
     fun toJson(): com.google.gson.JsonElement
     companion object 
       fun fromJson(kotlin.String): Status
+  enum Type
+    constructor(kotlin.String)
+    - MOBILE
+    - DESKTOP
+    - TABLET
+    - TV
+    - GAMING_CONSOLE
+    - BOT
+    - OTHER
+    fun toJson(): com.google.gson.JsonElement
+    companion object 
+      fun fromJson(kotlin.String): Type

features/dd-sdk-android-logs/api/dd-sdk-android-logs.api

@@ -79,7 +79,7 @@ unMock {
 }
 
 apply(from = "generate_log_models.gradle.kts")
-
+apply(from = "clone_common_schema.gradle.kts")
 kotlinConfig(jvmBytecodeTarget = JvmTarget.JVM_11)
 androidLibraryConfig()
 junitConfig()

features/dd-sdk-android-logs/build.gradle.kts

@@ -0,0 +1,32 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+import com.datadog.gradle.plugin.gitclone.GitCloneDependenciesTask
+
+tasks.register<GitCloneDependenciesTask>("cloneCommonSchema") {
+    extension.apply {
+        clone(
+            "https://github.com/DataDog/rum-events-format.git",
+            "schemas/rum",
+            destinationFolder = "src/main/json/log",
+            excludedPrefixes = listOf(
+                "_action-child-schema.json",
+                "_perf-metric-schema.json",
+                "_profiling-internal-context-schema.json",
+                "_rect-schema.json",
+                "_view-accessibility-schema.json",
+                "_view-container-schema.json",
+                "_view-performance-schema.json",
+                "action-schema.json",
+                "error-schema.json",
+                "long_task-schema.json",
+                "resource-schema.json",
+                "view-schema.json",
+                "vital-schema.json"
+            ),
+            ref = "master"
+        )
+    }
+}

features/dd-sdk-android-logs/clone_common_schema.gradle.kts

@@ -14,6 +14,9 @@ tasks.register(
     com.datadog.gradle.plugin.jsonschema.GenerateJsonSchemaTask::class.java
 ) {
     inputDirPath = "src/main/json/log"
+    ignoredFiles = arrayOf(
+        "_common-schema.json"
+    )
     targetPackageName = "com.datadog.android.log.model"
 }