Skip to content

Commit 44f1e9a

Browse files
satweensatween
committed
RUM-10930: dogfood experiment - reverting attributes schema
1 parent 2c6ccbb commit 44f1e9a

File tree

6 files changed

+197
-158
lines changed

6 files changed

+197
-158
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,20 @@ object com.datadog.android.trace.internal.SpanAttributes
3434
const val DATADOG_INITIAL_CONTEXT: String
3535
fun <T> android.database.sqlite.SQLiteDatabase.transactionTraced(String, Boolean = true, com.datadog.android.trace.api.span.DatadogSpan.(android.database.sqlite.SQLiteDatabase) -> T): T
3636
data class com.datadog.android.trace.model.SpanEvent
37-
constructor(Device, Os, kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.Long, kotlin.Long, kotlin.Long = 0L, Metrics, Meta)
37+
constructor(kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.Long, kotlin.Long, kotlin.Long = 0L, Metrics, Meta)
3838
val type: kotlin.String
3939
fun toJson(): com.google.gson.JsonElement
4040
companion object
4141
fun fromJson(kotlin.String): SpanEvent
4242
fun fromJsonObject(com.google.gson.JsonObject): SpanEvent
43-
data class Device
44-
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)
45-
fun toJson(): com.google.gson.JsonElement
46-
companion object
47-
fun fromJson(kotlin.String): Device
48-
fun fromJsonObject(com.google.gson.JsonObject): Device
49-
data class Os
50-
constructor(kotlin.String, kotlin.String, kotlin.String? = null, kotlin.String)
51-
fun toJson(): com.google.gson.JsonElement
52-
companion object
53-
fun fromJson(kotlin.String): Os
54-
fun fromJsonObject(com.google.gson.JsonObject): Os
5543
data class Metrics
5644
constructor(kotlin.Long? = null, kotlin.collections.Map<kotlin.String, kotlin.Number> = mapOf())
5745
fun toJson(): com.google.gson.JsonElement
5846
companion object
5947
fun fromJson(kotlin.String): Metrics
6048
fun fromJsonObject(com.google.gson.JsonObject): Metrics
6149
data class Meta
62-
constructor(kotlin.String, Dd, Span, Tracer, Usr, Account? = null, Network? = null, kotlin.collections.Map<kotlin.String, kotlin.String> = mapOf())
50+
constructor(kotlin.String, Dd, Span, Tracer, Usr, Account? = null, Network? = null, Device, Os, kotlin.collections.Map<kotlin.String, kotlin.String> = mapOf())
6351
fun toJson(): com.google.gson.JsonElement
6452
companion object
6553
fun fromJson(kotlin.String): Meta
@@ -100,6 +88,18 @@ data class com.datadog.android.trace.model.SpanEvent
10088
companion object
10189
fun fromJson(kotlin.String): Network
10290
fun fromJsonObject(com.google.gson.JsonObject): Network
91+
data class Device
92+
constructor(Type, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null)
93+
fun toJson(): com.google.gson.JsonElement
94+
companion object
95+
fun fromJson(kotlin.String): Device
96+
fun fromJsonObject(com.google.gson.JsonObject): Device
97+
data class Os
98+
constructor(kotlin.String, kotlin.String, kotlin.String? = null, kotlin.String)
99+
fun toJson(): com.google.gson.JsonElement
100+
companion object
101+
fun fromJson(kotlin.String): Os
102+
fun fromJsonObject(com.google.gson.JsonObject): Os
103103
data class Application
104104
constructor(kotlin.String? = null)
105105
fun toJson(): com.google.gson.JsonElement

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

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -77,33 +77,29 @@ public final class com/datadog/android/trace/internal/SpanAttributes {
7777

7878
public final class com/datadog/android/trace/model/SpanEvent {
7979
public static final field Companion Lcom/datadog/android/trace/model/SpanEvent$Companion;
80-
public fun <init> (Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Os;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJLcom/datadog/android/trace/model/SpanEvent$Metrics;Lcom/datadog/android/trace/model/SpanEvent$Meta;)V
81-
public synthetic fun <init> (Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Os;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJLcom/datadog/android/trace/model/SpanEvent$Metrics;Lcom/datadog/android/trace/model/SpanEvent$Meta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
82-
public final fun component1 ()Lcom/datadog/android/trace/model/SpanEvent$Device;
83-
public final fun component10 ()J
84-
public final fun component11 ()J
85-
public final fun component12 ()Lcom/datadog/android/trace/model/SpanEvent$Metrics;
86-
public final fun component13 ()Lcom/datadog/android/trace/model/SpanEvent$Meta;
87-
public final fun component2 ()Lcom/datadog/android/trace/model/SpanEvent$Os;
80+
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJLcom/datadog/android/trace/model/SpanEvent$Metrics;Lcom/datadog/android/trace/model/SpanEvent$Meta;)V
81+
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJLcom/datadog/android/trace/model/SpanEvent$Metrics;Lcom/datadog/android/trace/model/SpanEvent$Meta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
82+
public final fun component1 ()Ljava/lang/String;
83+
public final fun component10 ()Lcom/datadog/android/trace/model/SpanEvent$Metrics;
84+
public final fun component11 ()Lcom/datadog/android/trace/model/SpanEvent$Meta;
85+
public final fun component2 ()Ljava/lang/String;
8886
public final fun component3 ()Ljava/lang/String;
8987
public final fun component4 ()Ljava/lang/String;
9088
public final fun component5 ()Ljava/lang/String;
9189
public final fun component6 ()Ljava/lang/String;
92-
public final fun component7 ()Ljava/lang/String;
93-
public final fun component8 ()Ljava/lang/String;
90+
public final fun component7 ()J
91+
public final fun component8 ()J
9492
public final fun component9 ()J
95-
public final fun copy (Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Os;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJLcom/datadog/android/trace/model/SpanEvent$Metrics;Lcom/datadog/android/trace/model/SpanEvent$Meta;)Lcom/datadog/android/trace/model/SpanEvent;
96-
public static synthetic fun copy$default (Lcom/datadog/android/trace/model/SpanEvent;Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Os;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJLcom/datadog/android/trace/model/SpanEvent$Metrics;Lcom/datadog/android/trace/model/SpanEvent$Meta;ILjava/lang/Object;)Lcom/datadog/android/trace/model/SpanEvent;
93+
public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJLcom/datadog/android/trace/model/SpanEvent$Metrics;Lcom/datadog/android/trace/model/SpanEvent$Meta;)Lcom/datadog/android/trace/model/SpanEvent;
94+
public static synthetic fun copy$default (Lcom/datadog/android/trace/model/SpanEvent;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJLcom/datadog/android/trace/model/SpanEvent$Metrics;Lcom/datadog/android/trace/model/SpanEvent$Meta;ILjava/lang/Object;)Lcom/datadog/android/trace/model/SpanEvent;
9795
public fun equals (Ljava/lang/Object;)Z
9896
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/trace/model/SpanEvent;
9997
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/trace/model/SpanEvent;
100-
public final fun getDevice ()Lcom/datadog/android/trace/model/SpanEvent$Device;
10198
public final fun getDuration ()J
10299
public final fun getError ()J
103100
public final fun getMeta ()Lcom/datadog/android/trace/model/SpanEvent$Meta;
104101
public final fun getMetrics ()Lcom/datadog/android/trace/model/SpanEvent$Metrics;
105102
public final fun getName ()Ljava/lang/String;
106-
public final fun getOs ()Lcom/datadog/android/trace/model/SpanEvent$Os;
107103
public final fun getParentId ()Ljava/lang/String;
108104
public final fun getResource ()Ljava/lang/String;
109105
public final fun getService ()Ljava/lang/String;
@@ -231,35 +227,22 @@ public final class com/datadog/android/trace/model/SpanEvent$Dd$Companion {
231227

232228
public final class com/datadog/android/trace/model/SpanEvent$Device {
233229
public static final field Companion Lcom/datadog/android/trace/model/SpanEvent$Device$Companion;
234-
public fun <init> ()V
235-
public fun <init> (Lcom/datadog/android/trace/model/SpanEvent$Type;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/Number;Ljava/lang/Boolean;Ljava/lang/Number;)V
236-
public synthetic fun <init> (Lcom/datadog/android/trace/model/SpanEvent$Type;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/Number;Ljava/lang/Boolean;Ljava/lang/Number;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
230+
public fun <init> (Lcom/datadog/android/trace/model/SpanEvent$Type;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
231+
public synthetic fun <init> (Lcom/datadog/android/trace/model/SpanEvent$Type;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
237232
public final fun component1 ()Lcom/datadog/android/trace/model/SpanEvent$Type;
238-
public final fun component10 ()Ljava/lang/Boolean;
239-
public final fun component11 ()Ljava/lang/Number;
240233
public final fun component2 ()Ljava/lang/String;
241234
public final fun component3 ()Ljava/lang/String;
242235
public final fun component4 ()Ljava/lang/String;
243236
public final fun component5 ()Ljava/lang/String;
244-
public final fun component6 ()Ljava/lang/String;
245-
public final fun component7 ()Ljava/util/List;
246-
public final fun component8 ()Ljava/lang/String;
247-
public final fun component9 ()Ljava/lang/Number;
248-
public final fun copy (Lcom/datadog/android/trace/model/SpanEvent$Type;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/Number;Ljava/lang/Boolean;Ljava/lang/Number;)Lcom/datadog/android/trace/model/SpanEvent$Device;
249-
public static synthetic fun copy$default (Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Type;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/Number;Ljava/lang/Boolean;Ljava/lang/Number;ILjava/lang/Object;)Lcom/datadog/android/trace/model/SpanEvent$Device;
237+
public final fun copy (Lcom/datadog/android/trace/model/SpanEvent$Type;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/datadog/android/trace/model/SpanEvent$Device;
238+
public static synthetic fun copy$default (Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Type;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/datadog/android/trace/model/SpanEvent$Device;
250239
public fun equals (Ljava/lang/Object;)Z
251240
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/trace/model/SpanEvent$Device;
252241
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/trace/model/SpanEvent$Device;
253242
public final fun getArchitecture ()Ljava/lang/String;
254-
public final fun getBatteryLevel ()Ljava/lang/Number;
255243
public final fun getBrand ()Ljava/lang/String;
256-
public final fun getBrightnessLevel ()Ljava/lang/Number;
257-
public final fun getLocale ()Ljava/lang/String;
258-
public final fun getLocales ()Ljava/util/List;
259244
public final fun getModel ()Ljava/lang/String;
260245
public final fun getName ()Ljava/lang/String;
261-
public final fun getPowerSavingMode ()Ljava/lang/Boolean;
262-
public final fun getTimeZone ()Ljava/lang/String;
263246
public final fun getType ()Lcom/datadog/android/trace/model/SpanEvent$Type;
264247
public fun hashCode ()I
265248
public final fun toJson ()Lcom/google/gson/JsonElement;
@@ -273,25 +256,29 @@ public final class com/datadog/android/trace/model/SpanEvent$Device$Companion {
273256

274257
public final class com/datadog/android/trace/model/SpanEvent$Meta {
275258
public static final field Companion Lcom/datadog/android/trace/model/SpanEvent$Meta$Companion;
276-
public fun <init> (Ljava/lang/String;Lcom/datadog/android/trace/model/SpanEvent$Dd;Lcom/datadog/android/trace/model/SpanEvent$Span;Lcom/datadog/android/trace/model/SpanEvent$Tracer;Lcom/datadog/android/trace/model/SpanEvent$Usr;Lcom/datadog/android/trace/model/SpanEvent$Account;Lcom/datadog/android/trace/model/SpanEvent$Network;Ljava/util/Map;)V
277-
public synthetic fun <init> (Ljava/lang/String;Lcom/datadog/android/trace/model/SpanEvent$Dd;Lcom/datadog/android/trace/model/SpanEvent$Span;Lcom/datadog/android/trace/model/SpanEvent$Tracer;Lcom/datadog/android/trace/model/SpanEvent$Usr;Lcom/datadog/android/trace/model/SpanEvent$Account;Lcom/datadog/android/trace/model/SpanEvent$Network;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
259+
public fun <init> (Ljava/lang/String;Lcom/datadog/android/trace/model/SpanEvent$Dd;Lcom/datadog/android/trace/model/SpanEvent$Span;Lcom/datadog/android/trace/model/SpanEvent$Tracer;Lcom/datadog/android/trace/model/SpanEvent$Usr;Lcom/datadog/android/trace/model/SpanEvent$Account;Lcom/datadog/android/trace/model/SpanEvent$Network;Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Os;Ljava/util/Map;)V
260+
public synthetic fun <init> (Ljava/lang/String;Lcom/datadog/android/trace/model/SpanEvent$Dd;Lcom/datadog/android/trace/model/SpanEvent$Span;Lcom/datadog/android/trace/model/SpanEvent$Tracer;Lcom/datadog/android/trace/model/SpanEvent$Usr;Lcom/datadog/android/trace/model/SpanEvent$Account;Lcom/datadog/android/trace/model/SpanEvent$Network;Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Os;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
278261
public final fun component1 ()Ljava/lang/String;
262+
public final fun component10 ()Ljava/util/Map;
279263
public final fun component2 ()Lcom/datadog/android/trace/model/SpanEvent$Dd;
280264
public final fun component3 ()Lcom/datadog/android/trace/model/SpanEvent$Span;
281265
public final fun component4 ()Lcom/datadog/android/trace/model/SpanEvent$Tracer;
282266
public final fun component5 ()Lcom/datadog/android/trace/model/SpanEvent$Usr;
283267
public final fun component6 ()Lcom/datadog/android/trace/model/SpanEvent$Account;
284268
public final fun component7 ()Lcom/datadog/android/trace/model/SpanEvent$Network;
285-
public final fun component8 ()Ljava/util/Map;
286-
public final fun copy (Ljava/lang/String;Lcom/datadog/android/trace/model/SpanEvent$Dd;Lcom/datadog/android/trace/model/SpanEvent$Span;Lcom/datadog/android/trace/model/SpanEvent$Tracer;Lcom/datadog/android/trace/model/SpanEvent$Usr;Lcom/datadog/android/trace/model/SpanEvent$Account;Lcom/datadog/android/trace/model/SpanEvent$Network;Ljava/util/Map;)Lcom/datadog/android/trace/model/SpanEvent$Meta;
287-
public static synthetic fun copy$default (Lcom/datadog/android/trace/model/SpanEvent$Meta;Ljava/lang/String;Lcom/datadog/android/trace/model/SpanEvent$Dd;Lcom/datadog/android/trace/model/SpanEvent$Span;Lcom/datadog/android/trace/model/SpanEvent$Tracer;Lcom/datadog/android/trace/model/SpanEvent$Usr;Lcom/datadog/android/trace/model/SpanEvent$Account;Lcom/datadog/android/trace/model/SpanEvent$Network;Ljava/util/Map;ILjava/lang/Object;)Lcom/datadog/android/trace/model/SpanEvent$Meta;
269+
public final fun component8 ()Lcom/datadog/android/trace/model/SpanEvent$Device;
270+
public final fun component9 ()Lcom/datadog/android/trace/model/SpanEvent$Os;
271+
public final fun copy (Ljava/lang/String;Lcom/datadog/android/trace/model/SpanEvent$Dd;Lcom/datadog/android/trace/model/SpanEvent$Span;Lcom/datadog/android/trace/model/SpanEvent$Tracer;Lcom/datadog/android/trace/model/SpanEvent$Usr;Lcom/datadog/android/trace/model/SpanEvent$Account;Lcom/datadog/android/trace/model/SpanEvent$Network;Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Os;Ljava/util/Map;)Lcom/datadog/android/trace/model/SpanEvent$Meta;
272+
public static synthetic fun copy$default (Lcom/datadog/android/trace/model/SpanEvent$Meta;Ljava/lang/String;Lcom/datadog/android/trace/model/SpanEvent$Dd;Lcom/datadog/android/trace/model/SpanEvent$Span;Lcom/datadog/android/trace/model/SpanEvent$Tracer;Lcom/datadog/android/trace/model/SpanEvent$Usr;Lcom/datadog/android/trace/model/SpanEvent$Account;Lcom/datadog/android/trace/model/SpanEvent$Network;Lcom/datadog/android/trace/model/SpanEvent$Device;Lcom/datadog/android/trace/model/SpanEvent$Os;Ljava/util/Map;ILjava/lang/Object;)Lcom/datadog/android/trace/model/SpanEvent$Meta;
288273
public fun equals (Ljava/lang/Object;)Z
289274
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/trace/model/SpanEvent$Meta;
290275
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/trace/model/SpanEvent$Meta;
291276
public final fun getAccount ()Lcom/datadog/android/trace/model/SpanEvent$Account;
292277
public final fun getAdditionalProperties ()Ljava/util/Map;
293278
public final fun getDd ()Lcom/datadog/android/trace/model/SpanEvent$Dd;
279+
public final fun getDevice ()Lcom/datadog/android/trace/model/SpanEvent$Device;
294280
public final fun getNetwork ()Lcom/datadog/android/trace/model/SpanEvent$Network;
281+
public final fun getOs ()Lcom/datadog/android/trace/model/SpanEvent$Os;
295282
public final fun getSpan ()Lcom/datadog/android/trace/model/SpanEvent$Span;
296283
public final fun getTracer ()Lcom/datadog/android/trace/model/SpanEvent$Tracer;
297284
public final fun getUsr ()Lcom/datadog/android/trace/model/SpanEvent$Usr;

0 commit comments

Comments
 (0)