Skip to content

Commit d6bebdd

Browse files
satweensatween
committed
RUM-9899: Reverting tracing and logging schema - moving device and os to meta, reverting _dd object back to log
1 parent b39beea commit d6bebdd

File tree

12 files changed

+211
-126
lines changed

12 files changed

+211
-126
lines changed

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ data class com.datadog.android.log.LogsConfiguration
3535
fun setEventMapper(com.datadog.android.event.EventMapper<com.datadog.android.log.model.LogEvent>): Builder
3636
fun build(): LogsConfiguration
3737
data class com.datadog.android.log.model.LogEvent
38-
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())
38+
constructor(LogEventDevice, Os, 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())
3939
fun toJson(): com.google.gson.JsonElement
4040
companion object
4141
fun fromJson(kotlin.String): LogEvent
4242
fun fromJsonObject(com.google.gson.JsonObject): LogEvent
43-
data class Device
43+
data class LogEventDevice
4444
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)
4545
fun toJson(): com.google.gson.JsonElement
4646
companion object
47-
fun fromJson(kotlin.String): Device
48-
fun fromJsonObject(com.google.gson.JsonObject): Device
47+
fun fromJson(kotlin.String): LogEventDevice
48+
fun fromJsonObject(com.google.gson.JsonObject): LogEventDevice
4949
data class Os
5050
constructor(kotlin.String, kotlin.String, kotlin.String? = null, kotlin.String)
5151
fun toJson(): com.google.gson.JsonElement
@@ -58,6 +58,12 @@ data class com.datadog.android.log.model.LogEvent
5858
companion object
5959
fun fromJson(kotlin.String): Logger
6060
fun fromJsonObject(com.google.gson.JsonObject): Logger
61+
data class Dd
62+
constructor(DdDevice)
63+
fun toJson(): com.google.gson.JsonElement
64+
companion object
65+
fun fromJson(kotlin.String): Dd
66+
fun fromJsonObject(com.google.gson.JsonObject): Dd
6167
data class Usr
6268
constructor(kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
6369
fun toJson(): com.google.gson.JsonElement
@@ -82,6 +88,12 @@ data class com.datadog.android.log.model.LogEvent
8288
companion object
8389
fun fromJson(kotlin.String): Error
8490
fun fromJsonObject(com.google.gson.JsonObject): Error
91+
data class DdDevice
92+
constructor(kotlin.String)
93+
fun toJson(): com.google.gson.JsonElement
94+
companion object
95+
fun fromJson(kotlin.String): DdDevice
96+
fun fromJsonObject(com.google.gson.JsonObject): DdDevice
8597
data class Client
8698
constructor(SimCarrier? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String)
8799
fun toJson(): com.google.gson.JsonElement

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

Lines changed: 87 additions & 45 deletions
Large diffs are not rendered by default.

‎features/dd-sdk-android-logs/src/main/json/log/log-schema.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,31 @@
6666
],
6767
"readOnly": true
6868
},
69+
"_dd": {
70+
"type": "object",
71+
"description": "Datadog internal information",
72+
"properties": {
73+
"device": {
74+
"type": "object",
75+
"description": "Information about the device that produced this log.",
76+
"properties": {
77+
"architecture": {
78+
"type": "string",
79+
"description": "The CPU architecture of the device",
80+
"readOnly": true
81+
}
82+
},
83+
"required": [
84+
"architecture"
85+
],
86+
"readOnly": true
87+
}
88+
},
89+
"required": [
90+
"device"
91+
],
92+
"readOnly": true
93+
},
6994
"usr": {
7095
"type": "object",
7196
"description": "User properties",
@@ -239,6 +264,7 @@
239264
"date",
240265
"service",
241266
"logger",
267+
"_dd",
242268
"ddtags",
243269
"device",
244270
"os"

‎features/dd-sdk-android-logs/src/main/kotlin/com/datadog/android/log/internal/domain/DatadogLogGenerator.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,11 @@ internal class DatadogLogGenerator(
194194
buildId = datadogContext.appBuildId,
195195
error = error,
196196
logger = loggerInfo,
197+
dd = LogEvent.Dd(
198+
device = LogEvent.DdDevice(
199+
architecture = deviceInfo.architecture
200+
)
201+
),
197202
usr = usr,
198203
account = account,
199204
network = network,
@@ -210,7 +215,7 @@ internal class DatadogLogGenerator(
210215
versionMajor = deviceInfo.osMajorVersion
211216
)
212217

213-
private fun resolveDeviceInfo(deviceInfo: DeviceInfo) = LogEvent.Device(
218+
private fun resolveDeviceInfo(deviceInfo: DeviceInfo) = LogEvent.LogEventDevice(
214219
type = resolveDeviceType(deviceInfo.deviceType),
215220
name = deviceInfo.deviceName,
216221
model = deviceInfo.deviceModel,

‎features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/utils/forge/LogEventForgeryFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ internal class LogEventForgeryFactory : ForgeryFactory<LogEvent> {
8787
version = forge.aStringMatching("[0-9]\\.[0-9]\\.[0-9]"),
8888
threadName = forge.aNullable { forge.anAlphabeticalString() }
8989
),
90-
device = LogEvent.Device(
90+
device = LogEvent.LogEventDevice(
9191
type = resolveDeviceType(deviceInfo.deviceType),
9292
name = deviceInfo.deviceName,
9393
model = deviceInfo.deviceModel,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ object com.datadog.android.trace.api.DatadogTracingConstants
3030
const val PROPAGATION_STYLE_EXTRACT: String
3131
const val PROPAGATION_STYLE_INJECT: String
3232
const val SERVICE_NAME: String
33+
const val SDK_V2_COMPATIBILITY_FLAG: String
3334
const val URL_AS_RESOURCE_NAME: String
3435
const val TAGS: String
3536
object LogAttributes

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,25 @@ object com.datadog.android.trace.internal.DatadogTracingToolkit
3030
var propagationHelper: DatadogPropagationHelper
3131
fun setTracingSamplingPriorityIfNecessary(com.datadog.android.trace.api.span.DatadogSpanContext)
3232
fun setTraceId128BitGenerationEnabled(com.datadog.android.trace.api.tracer.DatadogTracerBuilder): com.datadog.android.trace.api.tracer.DatadogTracerBuilder
33+
fun setSdkV2Compatible(com.datadog.android.trace.api.tracer.DatadogTracerBuilder): com.datadog.android.trace.api.tracer.DatadogTracerBuilder
3334
object com.datadog.android.trace.internal.SpanAttributes
3435
const val DATADOG_INITIAL_CONTEXT: String
3536
fun <T> android.database.sqlite.SQLiteDatabase.transactionTraced(String, Boolean = true, com.datadog.android.trace.api.span.DatadogSpan.(android.database.sqlite.SQLiteDatabase) -> T): T
3637
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)
38+
constructor(kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.String, kotlin.Long, kotlin.Long, kotlin.Long = 0L, Metrics, Meta)
3839
val type: kotlin.String
3940
fun toJson(): com.google.gson.JsonElement
4041
companion object
4142
fun fromJson(kotlin.String): SpanEvent
4243
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
5544
data class Metrics
5645
constructor(kotlin.Long? = null, kotlin.collections.Map<kotlin.String, kotlin.Number> = mapOf())
5746
fun toJson(): com.google.gson.JsonElement
5847
companion object
5948
fun fromJson(kotlin.String): Metrics
6049
fun fromJsonObject(com.google.gson.JsonObject): Metrics
6150
data class Meta
62-
constructor(kotlin.String, Dd, Span, Tracer, Usr, Account? = null, Network? = null, kotlin.collections.Map<kotlin.String, kotlin.String> = mapOf())
51+
constructor(kotlin.String, Dd, Span, Tracer, Usr, Account? = null, Network? = null, Device, Os, kotlin.collections.Map<kotlin.String, kotlin.String> = mapOf())
6352
fun toJson(): com.google.gson.JsonElement
6453
companion object
6554
fun fromJson(kotlin.String): Meta
@@ -100,6 +89,18 @@ data class com.datadog.android.trace.model.SpanEvent
10089
companion object
10190
fun fromJson(kotlin.String): Network
10291
fun fromJsonObject(com.google.gson.JsonObject): Network
92+
data class Device
93+
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)
94+
fun toJson(): com.google.gson.JsonElement
95+
companion object
96+
fun fromJson(kotlin.String): Device
97+
fun fromJsonObject(com.google.gson.JsonObject): Device
98+
data class Os
99+
constructor(kotlin.String, kotlin.String, kotlin.String? = null, kotlin.String)
100+
fun toJson(): com.google.gson.JsonElement
101+
companion object
102+
fun fromJson(kotlin.String): Os
103+
fun fromJsonObject(com.google.gson.JsonObject): Os
103104
data class Application
104105
constructor(kotlin.String? = null)
105106
fun toJson(): com.google.gson.JsonElement

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

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

7979
public final class com/datadog/android/trace/model/SpanEvent {
8080
public static final field Companion Lcom/datadog/android/trace/model/SpanEvent$Companion;
81-
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
82-
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
83-
public final fun component1 ()Lcom/datadog/android/trace/model/SpanEvent$Device;
84-
public final fun component10 ()J
85-
public final fun component11 ()J
86-
public final fun component12 ()Lcom/datadog/android/trace/model/SpanEvent$Metrics;
87-
public final fun component13 ()Lcom/datadog/android/trace/model/SpanEvent$Meta;
88-
public final fun component2 ()Lcom/datadog/android/trace/model/SpanEvent$Os;
81+
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
82+
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
83+
public final fun component1 ()Ljava/lang/String;
84+
public final fun component10 ()Lcom/datadog/android/trace/model/SpanEvent$Metrics;
85+
public final fun component11 ()Lcom/datadog/android/trace/model/SpanEvent$Meta;
86+
public final fun component2 ()Ljava/lang/String;
8987
public final fun component3 ()Ljava/lang/String;
9088
public final fun component4 ()Ljava/lang/String;
9189
public final fun component5 ()Ljava/lang/String;
9290
public final fun component6 ()Ljava/lang/String;
93-
public final fun component7 ()Ljava/lang/String;
94-
public final fun component8 ()Ljava/lang/String;
91+
public final fun component7 ()J
92+
public final fun component8 ()J
9593
public final fun component9 ()J
96-
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;
97-
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;
94+
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;
95+
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;
9896
public fun equals (Ljava/lang/Object;)Z
9997
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/trace/model/SpanEvent;
10098
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/trace/model/SpanEvent;
101-
public final fun getDevice ()Lcom/datadog/android/trace/model/SpanEvent$Device;
10299
public final fun getDuration ()J
103100
public final fun getError ()J
104101
public final fun getMeta ()Lcom/datadog/android/trace/model/SpanEvent$Meta;
105102
public final fun getMetrics ()Lcom/datadog/android/trace/model/SpanEvent$Metrics;
106103
public final fun getName ()Ljava/lang/String;
107-
public final fun getOs ()Lcom/datadog/android/trace/model/SpanEvent$Os;
108104
public final fun getParentId ()Ljava/lang/String;
109105
public final fun getResource ()Ljava/lang/String;
110106
public final fun getService ()Ljava/lang/String;
@@ -274,25 +270,29 @@ public final class com/datadog/android/trace/model/SpanEvent$Device$Companion {
274270

275271
public final class com/datadog/android/trace/model/SpanEvent$Meta {
276272
public static final field Companion Lcom/datadog/android/trace/model/SpanEvent$Meta$Companion;
277-
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
278-
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
273+
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
274+
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
279275
public final fun component1 ()Ljava/lang/String;
276+
public final fun component10 ()Ljava/util/Map;
280277
public final fun component2 ()Lcom/datadog/android/trace/model/SpanEvent$Dd;
281278
public final fun component3 ()Lcom/datadog/android/trace/model/SpanEvent$Span;
282279
public final fun component4 ()Lcom/datadog/android/trace/model/SpanEvent$Tracer;
283280
public final fun component5 ()Lcom/datadog/android/trace/model/SpanEvent$Usr;
284281
public final fun component6 ()Lcom/datadog/android/trace/model/SpanEvent$Account;
285282
public final fun component7 ()Lcom/datadog/android/trace/model/SpanEvent$Network;
286-
public final fun component8 ()Ljava/util/Map;
287-
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;
288-
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;
283+
public final fun component8 ()Lcom/datadog/android/trace/model/SpanEvent$Device;
284+
public final fun component9 ()Lcom/datadog/android/trace/model/SpanEvent$Os;
285+
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;
286+
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;
289287
public fun equals (Ljava/lang/Object;)Z
290288
public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/trace/model/SpanEvent$Meta;
291289
public static final fun fromJsonObject (Lcom/google/gson/JsonObject;)Lcom/datadog/android/trace/model/SpanEvent$Meta;
292290
public final fun getAccount ()Lcom/datadog/android/trace/model/SpanEvent$Account;
293291
public final fun getAdditionalProperties ()Ljava/util/Map;
294292
public final fun getDd ()Lcom/datadog/android/trace/model/SpanEvent$Dd;
293+
public final fun getDevice ()Lcom/datadog/android/trace/model/SpanEvent$Device;
295294
public final fun getNetwork ()Lcom/datadog/android/trace/model/SpanEvent$Network;
295+
public final fun getOs ()Lcom/datadog/android/trace/model/SpanEvent$Os;
296296
public final fun getSpan ()Lcom/datadog/android/trace/model/SpanEvent$Span;
297297
public final fun getTracer ()Lcom/datadog/android/trace/model/SpanEvent$Tracer;
298298
public final fun getUsr ()Lcom/datadog/android/trace/model/SpanEvent$Usr;

0 commit comments

Comments
 (0)