Skip to content

Commit 7ff6870

Browse files
ambushworkambushwork
authored
Merge pull request #3336 from DataDog/yl/profiling/update-profile-event-schema
Update profile-event-schema.json
2 parents b2eeb2e + efd4d08 commit 7ff6870

3 files changed

Lines changed: 54 additions & 5 deletions

File tree

‎features/dd-sdk-android-profiling/api/apiSurface‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ data class com.datadog.android.profiling.ProfilingConfiguration
1717
companion object
1818
val DEFAULT: ProfilingConfiguration
1919
data class com.datadog.android.profiling.model.ProfileEvent
20-
constructor(Application, Session? = null, View? = null, LongTask? = null, Vital? = null, kotlin.collections.List<kotlin.String>, kotlin.String, kotlin.String, Family, Family, kotlin.Long, kotlin.String)
20+
constructor(Application, Session? = null, View? = null, LongTask? = null, Vital? = null, kotlin.collections.List<kotlin.String>, kotlin.String, kotlin.String, Family, Family, kotlin.Long, kotlin.String, Error? = null)
2121
fun toJson(): com.google.gson.JsonElement
2222
companion object
2323
fun fromJson(kotlin.String): ProfileEvent
@@ -52,6 +52,12 @@ data class com.datadog.android.profiling.model.ProfileEvent
5252
companion object
5353
fun fromJson(kotlin.String): Vital
5454
fun fromJsonObject(com.google.gson.JsonObject): Vital
55+
data class Error
56+
constructor(kotlin.collections.List<kotlin.String>)
57+
fun toJson(): com.google.gson.JsonElement
58+
companion object
59+
fun fromJson(kotlin.String): Error
60+
fun fromJsonObject(com.google.gson.JsonObject): Error
5561
enum Family
5662
constructor(kotlin.String)
5763
- ANDROID

‎features/dd-sdk-android-profiling/api/dd-sdk-android-profiling.api‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ public final class com/datadog/android/profiling/ProfilingConfiguration$Companio
4343

4444
public final class com/datadog/android/profiling/model/ProfileEvent {
4545
public static final field Companion Lcom/datadog/android/profiling/model/ProfileEvent$Companion;
46-
public fun <init> (Lcom/datadog/android/profiling/model/ProfileEvent$Application;Lcom/datadog/android/profiling/model/ProfileEvent$Session;Lcom/datadog/android/profiling/model/ProfileEvent$View;Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;Lcom/datadog/android/profiling/model/ProfileEvent$Vital;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Family;Lcom/datadog/android/profiling/model/ProfileEvent$Family;JLjava/lang/String;)V
47-
public synthetic fun <init> (Lcom/datadog/android/profiling/model/ProfileEvent$Application;Lcom/datadog/android/profiling/model/ProfileEvent$Session;Lcom/datadog/android/profiling/model/ProfileEvent$View;Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;Lcom/datadog/android/profiling/model/ProfileEvent$Vital;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Family;Lcom/datadog/android/profiling/model/ProfileEvent$Family;JLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
46+
public fun <init> (Lcom/datadog/android/profiling/model/ProfileEvent$Application;Lcom/datadog/android/profiling/model/ProfileEvent$Session;Lcom/datadog/android/profiling/model/ProfileEvent$View;Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;Lcom/datadog/android/profiling/model/ProfileEvent$Vital;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Family;Lcom/datadog/android/profiling/model/ProfileEvent$Family;JLjava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Error;)V
47+
public synthetic fun <init> (Lcom/datadog/android/profiling/model/ProfileEvent$Application;Lcom/datadog/android/profiling/model/ProfileEvent$Session;Lcom/datadog/android/profiling/model/ProfileEvent$View;Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;Lcom/datadog/android/profiling/model/ProfileEvent$Vital;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Family;Lcom/datadog/android/profiling/model/ProfileEvent$Family;JLjava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Error;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
4848
public final fun component1 ()Lcom/datadog/android/profiling/model/ProfileEvent$Application;
4949
public final fun component10 ()Lcom/datadog/android/profiling/model/ProfileEvent$Family;
5050
public final fun component11 ()J
5151
public final fun component12 ()Ljava/lang/String;
52+
public final fun component13 ()Lcom/datadog/android/profiling/model/ProfileEvent$Error;
5253
public final fun component2 ()Lcom/datadog/android/profiling/model/ProfileEvent$Session;
5354
public final fun component3 ()Lcom/datadog/android/profiling/model/ProfileEvent$View;
5455
public final fun component4 ()Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;
@@ -57,14 +58,15 @@ public final class com/datadog/android/profiling/model/ProfileEvent {
5758
public final fun component7 ()Ljava/lang/String;
5859
public final fun component8 ()Ljava/lang/String;
5960
public final fun component9 ()Lcom/datadog/android/profiling/model/ProfileEvent$Family;
60-
public final fun copy (Lcom/datadog/android/profiling/model/ProfileEvent$Application;Lcom/datadog/android/profiling/model/ProfileEvent$Session;Lcom/datadog/android/profiling/model/ProfileEvent$View;Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;Lcom/datadog/android/profiling/model/ProfileEvent$Vital;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Family;Lcom/datadog/android/profiling/model/ProfileEvent$Family;JLjava/lang/String;)Lcom/datadog/android/profiling/model/ProfileEvent;
61-
public static synthetic fun copy$default (Lcom/datadog/android/profiling/model/ProfileEvent;Lcom/datadog/android/profiling/model/ProfileEvent$Application;Lcom/datadog/android/profiling/model/ProfileEvent$Session;Lcom/datadog/android/profiling/model/ProfileEvent$View;Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;Lcom/datadog/android/profiling/model/ProfileEvent$Vital;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Family;Lcom/datadog/android/profiling/model/ProfileEvent$Family;JLjava/lang/String;ILjava/lang/Object;)Lcom/datadog/android/profiling/model/ProfileEvent;
61+
public final fun copy (Lcom/datadog/android/profiling/model/ProfileEvent$Application;Lcom/datadog/android/profiling/model/ProfileEvent$Session;Lcom/datadog/android/profiling/model/ProfileEvent$View;Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;Lcom/datadog/android/profiling/model/ProfileEvent$Vital;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Family;Lcom/datadog/android/profiling/model/ProfileEvent$Family;JLjava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Error;)Lcom/datadog/android/profiling/model/ProfileEvent;
62+
public static synthetic fun copy$default (Lcom/datadog/android/profiling/model/ProfileEvent;Lcom/datadog/android/profiling/model/ProfileEvent$Application;Lcom/datadog/android/profiling/model/ProfileEvent$Session;Lcom/datadog/android/profiling/model/ProfileEvent$View;Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;Lcom/datadog/android/profiling/model/ProfileEvent$Vital;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Family;Lcom/datadog/android/profiling/model/ProfileEvent$Family;JLjava/lang/String;Lcom/datadog/android/profiling/model/ProfileEvent$Error;ILjava/lang/Object;)Lcom/datadog/android/profiling/model/ProfileEvent;
6263
public fun equals (Ljava/lang/Object;)Z
6364
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/profiling/model/ProfileEvent;
6465
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/profiling/model/ProfileEvent;
6566
public final fun getApplication ()Lcom/datadog/android/profiling/model/ProfileEvent$Application;
6667
public final fun getAttachments ()Ljava/util/List;
6768
public final fun getEnd ()Ljava/lang/String;
69+
public final fun getError ()Lcom/datadog/android/profiling/model/ProfileEvent$Error;
6870
public final fun getFamily ()Lcom/datadog/android/profiling/model/ProfileEvent$Family;
6971
public final fun getLongTask ()Lcom/datadog/android/profiling/model/ProfileEvent$LongTask;
7072
public final fun getRuntime ()Lcom/datadog/android/profiling/model/ProfileEvent$Family;
@@ -104,6 +106,26 @@ public final class com/datadog/android/profiling/model/ProfileEvent$Companion {
104106
public final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/profiling/model/ProfileEvent;
105107
}
106108

109+
public final class com/datadog/android/profiling/model/ProfileEvent$Error {
110+
public static final field Companion Lcom/datadog/android/profiling/model/ProfileEvent$Error$Companion;
111+
public fun <init> (Ljava/util/List;)V
112+
public final fun component1 ()Ljava/util/List;
113+
public final fun copy (Ljava/util/List;)Lcom/datadog/android/profiling/model/ProfileEvent$Error;
114+
public static synthetic fun copy$default (Lcom/datadog/android/profiling/model/ProfileEvent$Error;Ljava/util/List;ILjava/lang/Object;)Lcom/datadog/android/profiling/model/ProfileEvent$Error;
115+
public fun equals (Ljava/lang/Object;)Z
116+
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/profiling/model/ProfileEvent$Error;
117+
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/profiling/model/ProfileEvent$Error;
118+
public final fun getId ()Ljava/util/List;
119+
public fun hashCode ()I
120+
public final fun toJson ()Lcom/google/gson/JsonElement;
121+
public fun toString ()Ljava/lang/String;
122+
}
123+
124+
public final class com/datadog/android/profiling/model/ProfileEvent$Error$Companion {
125+
public final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/profiling/model/ProfileEvent$Error;
126+
public final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/profiling/model/ProfileEvent$Error;
127+
}
128+
107129
public final class com/datadog/android/profiling/model/ProfileEvent$Family : java/lang/Enum {
108130
public static final field ANDROID Lcom/datadog/android/profiling/model/ProfileEvent$Family;
109131
public static final field CHROME Lcom/datadog/android/profiling/model/ProfileEvent$Family;

‎features/dd-sdk-android-profiling/src/main/json/profiling/mobile/profile-event-schema.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,27 @@
66
"allOf": [
77
{
88
"$ref": "../_common-schema.json"
9+
},
10+
{
11+
"type": "object",
12+
"properties": {
13+
"error": {
14+
"type": "object",
15+
"description": "Error properties.",
16+
"required": ["id"],
17+
"properties": {
18+
"id": {
19+
"type": "array",
20+
"items": {
21+
"type": "string"
22+
},
23+
"description": "Array of error IDs.",
24+
"readOnly": true
25+
}
26+
},
27+
"readOnly": true
28+
}
29+
}
930
}
1031
]
1132
}

0 commit comments

Comments
 (0)