diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/DomainCount.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/DomainCount.kt index f20576cd7a..6c8a5b4e3f 100644 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/DomainCount.kt +++ b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/DomainCount.kt @@ -1,12 +1,9 @@ package io.embrace.android.embracesdk.internal.payload -import com.squareup.moshi.JsonClass - /** * Included in the payload when the network request capture limit has been exceeded for a * particular domain. Specifies the limit, and the total count. */ -@JsonClass(generateAdapter = true) data class DomainCount( /** The total count of network calls for the given domain. */ val requestCount: Int, diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/ExceptionErrorInfo.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/ExceptionErrorInfo.kt deleted file mode 100644 index 5a6000e8ab..0000000000 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/ExceptionErrorInfo.kt +++ /dev/null @@ -1,20 +0,0 @@ -package io.embrace.android.embracesdk.internal.payload - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * @param timestamp The timestamp in milliseconds of when an error happened. Previous name: s.e.rep.ts - * @param exceptions A list of exceptions. Previous name: s.e.rep.ex - */ -@JsonClass(generateAdapter = true) -data class ExceptionErrorInfo( - - /* The timestamp in milliseconds of when an error happened. Previous name: s.e.rep.ts */ - @Json(name = "timestamp") - val timestamp: Long? = null, - - /* A list of exceptions. Previous name: s.e.rep.ex */ - @Json(name = "exceptions") - val exceptions: List? = null -) diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/ExceptionInfo.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/ExceptionInfo.kt deleted file mode 100644 index 2038239728..0000000000 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/ExceptionInfo.kt +++ /dev/null @@ -1,28 +0,0 @@ -package io.embrace.android.embracesdk.internal.payload - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Describes a Java exception. - * - * @param name The name of the class causing an error. Previous name: s.e.rep.ex.n - * @param message The error message, if any. Previous name: s.e.rep.ex.m - * @param stacktrace String representation of each line in the stack trace. Previous name: s.e.rep.ex.tt - */ -@JsonClass(generateAdapter = true) -data class ExceptionInfo( - - /* The name of the class causing an error. Previous name: s.e.rep.ex.n */ - @Json(name = "name") - val name: String? = null, - - /* The error message, if any. Previous name: s.e.rep.ex.m */ - @Json(name = "message") - val message: String? = null, - - /* String representation of each line in the stack trace. Previous name: s.e.rep.ex.tt */ - @Json(name = "stacktrace") - val stacktrace: List? = null - -) diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/InternalError.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/InternalError.kt deleted file mode 100644 index 8d60afa414..0000000000 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/InternalError.kt +++ /dev/null @@ -1,23 +0,0 @@ -package io.embrace.android.embracesdk.internal.payload - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Describes an Exception Error with a count of occurrences and a list of exceptions (causes). - * - * @param count The number of internal error that occurred within Embrace. Previous name: s.e.c - * @param errors A list of causes of the internal error. Previous name: s.e.rep - */ -@JsonClass(generateAdapter = true) -data class InternalError( - - /* The number of internal error that occurred within Embrace. Previous name: s.e.c */ - @Json(name = "count") - val count: Int? = null, - - /* A list of causes of the internal error. Previous name: s.e.rep */ - @Json(name = "errors") - val errors: List? = null - -) diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/LegacyExceptionInfo.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/LegacyExceptionInfo.kt index d586a82c4d..536cb262fc 100644 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/LegacyExceptionInfo.kt +++ b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/LegacyExceptionInfo.kt @@ -35,10 +35,6 @@ class LegacyExceptionInfo( @Json(name = "length") val originalLength: Int? = lines.size.takeIf { it > STACK_FRAME_LIMIT } - fun toNewPayload(): ExceptionInfo { - return ExceptionInfo(name, message, lines) - } - companion object { /** diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkCallV2.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkCallV2.kt deleted file mode 100644 index 9375b3fc39..0000000000 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkCallV2.kt +++ /dev/null @@ -1,56 +0,0 @@ -package io.embrace.android.embracesdk.internal.payload - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -@JsonClass(generateAdapter = true) -data class NetworkCallV2( - - /** The URL being requested. */ - @Json(name = "url") - val url: String? = null, - - /** The HTTP method the network request corresponds to. */ - @Json(name = "x") - val httpMethod: String? = null, - - /** The HTTP response code. */ - @Json(name = "rc") - val responseCode: Int? = null, - - /** The number of bytes sent during the network request. */ - @Json(name = "bo") - val bytesSent: Long = 0, - - /** The number of bytes received during the network request. */ - @Json(name = "bi") - val bytesReceived: Long = 0, - - /** The start time of the request. */ - @Json(name = "st") - val startTime: Long = 0, - - /** The end time of the request. */ - @Json(name = "et") - val endTime: Long = 0, - - /** The duration of the network request. */ - @Json(name = "dur") - val duration: Long = 0, - - /** The trace ID that can be used to trace a particular request. */ - @Json(name = "t") - val traceId: String? = null, - - /** If an exception was thrown, the name of the class which caused the exception. */ - @Json(name = "ed") - val errorType: String? = null, - - /** If an exception was thrown, the exception message. */ - @Json(name = "de") - val errorMessage: String? = null, - - /** A Traceparent that is W3C compliant to be used to create a span for the this network request */ - @Json(name = "w3c_traceparent") - val w3cTraceparent: String? = null -) diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkRequests.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkRequests.kt deleted file mode 100644 index 4a19e57628..0000000000 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkRequests.kt +++ /dev/null @@ -1,9 +0,0 @@ -package io.embrace.android.embracesdk.internal.payload - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -@JsonClass(generateAdapter = true) -data class NetworkRequests( - @Json(name = "v2") val networkSessionV2: NetworkSessionV2? -) diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkSessionV2.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkSessionV2.kt deleted file mode 100644 index 88b591c22f..0000000000 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NetworkSessionV2.kt +++ /dev/null @@ -1,12 +0,0 @@ -package io.embrace.android.embracesdk.internal.payload - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -@JsonClass(generateAdapter = true) -data class NetworkSessionV2( - /** The list of network requests captured as part of the session. */ - @Json(name = "r") val requests: List, - /** Counts of network requests per domain, only for domains exceeding the capture limit. */ - @Json(name = "c") val requestCounts: Map -) diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/TapBreadcrumb.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/TapBreadcrumb.kt index 8c65e45765..445be25269 100644 --- a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/TapBreadcrumb.kt +++ b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/TapBreadcrumb.kt @@ -2,51 +2,11 @@ package io.embrace.android.embracesdk.internal.payload import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import io.embrace.android.embracesdk.internal.capture.crumbs.Breadcrumb -import io.embrace.android.embracesdk.internal.payload.TapBreadcrumb.TapBreadcrumbType /** * Breadcrumbs that represent tap events. */ -@JsonClass(generateAdapter = true) -class TapBreadcrumb( - point: Pair? = null, - - /** - * Name of the tapped element. - */ - @Json(name = "tt") val tappedElementName: String?, - - /** - * The timestamp at which the event occurred. - */ - @Json(name = "ts") - internal val timestamp: Long, - - /** - * Type of TapBreadcrumb that categorizes the kind interaction, based on - * [TapBreadcrumbType] types. - */ - @Json(name = "t") val type: TapBreadcrumbType? -) : Breadcrumb { - - /** - * Screen position (coordinates) of the tapped element. - */ - @Json(name = "tl") - var location: String? = null - - init { - location = if (point != null) { - val first = point.first?.toInt()?.toFloat() ?: 0.0f - val second = point.second?.toInt()?.toFloat() ?: 0.0f - first.toInt().toString() + "," + second.toInt() - } else { - "0,0" - } - } - - override fun getStartTime(): Long = timestamp +class TapBreadcrumb { @JsonClass(generateAdapter = false) enum class TapBreadcrumbType(val value: String) {