Delete EmbraceAttributes.Type and consolidate on EmbType

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImpl.kt

@@ -3,6 +3,7 @@ package io.embrace.android.embracesdk.internal.spans
 import io.embrace.android.embracesdk.arch.destination.SessionSpanWriter
 import io.embrace.android.embracesdk.arch.destination.SpanAttributeData
 import io.embrace.android.embracesdk.arch.destination.SpanEventData
+import io.embrace.android.embracesdk.arch.schema.EmbType
 import io.embrace.android.embracesdk.internal.clock.nanosToMillis
 import io.embrace.android.embracesdk.internal.utils.Provider
 import io.embrace.android.embracesdk.spans.EmbraceSpan
@@ -110,7 +111,7 @@ internal class CurrentSessionSpanImpl(
  val spanBuilder = createEmbraceSpanBuilder(
  tracer = tracerSupplier(),
  name = "session",
- type = EmbraceAttributes.Type.SESSION
+ type = EmbType.Ux.Session
  )
  .setNoParent()
  .setStartTimestamp(startTimeMs, TimeUnit.MILLISECONDS)

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceExtensions.kt

@@ -1,5 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
+import io.embrace.android.embracesdk.arch.schema.TelemetryType
 import io.embrace.android.embracesdk.internal.spans.EmbraceAttributes.Attribute
 import io.embrace.android.embracesdk.internal.utils.Provider
 import io.embrace.android.embracesdk.spans.EmbraceSpan
@@ -68,7 +69,7 @@ internal fun Tracer.embraceSpanBuilder(name: String, internal: Boolean): SpanBui
 internal fun createEmbraceSpanBuilder(
  tracer: Tracer,
  name: String,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean = true
 ): SpanBuilder = tracer.embraceSpanBuilder(name, internal).setType(type)
 
@@ -78,15 +79,15 @@ internal fun createEmbraceSpanBuilder(
 internal fun createRootSpanBuilder(
  tracer: Tracer,
  name: String,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean
 ): SpanBuilder = createEmbraceSpanBuilder(tracer = tracer, name = name, type = type, internal = internal).setNoParent()
 
 /**
  * Sets and returns the [EmbraceAttributes.Type] attribute for the given [SpanBuilder]
  */
-internal fun SpanBuilder.setType(value: EmbraceAttributes.Type): SpanBuilder {
- setAttribute(value.keyName(), value.typeName)
+internal fun SpanBuilder.setType(value: TelemetryType): SpanBuilder {
+ setAttribute(value.attributeName(), value.description)
  return this
 }
 
@@ -233,25 +234,6 @@ internal fun String.toEmbraceUsageAttributeName(): String = EMBRACE_USAGE_ATTRIB
  * in the Embrace world. Each enum defines the attribute name used in the [Span] and specifies the set of valid values it can be set to.
  */
 internal object EmbraceAttributes {
-
- /**
- * Attribute to categorize a [Span] and give it a distinct semantic meaning. Spans of each [Type] may be treated differently by the
- * backend and can be expected to contain a set of attributes to further flesh out the given semantic meanings.
- */
- internal enum class Type(val typeName: String) : Attribute {
- /**
- * Spans that model an Embrace session or background activity.
- */
- SESSION("ux.session"),
-
- /**
- * A [Span] created by an SDK user to measure the performance of an operation
- */
- PERFORMANCE("performance");
-
- override val canonicalName = "type"
- }
-
  /**
  * The reason for the termination of a process span
  */

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanService.kt

@@ -1,5 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
+import io.embrace.android.embracesdk.arch.schema.TelemetryType
 import io.embrace.android.embracesdk.internal.utils.Provider
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
@@ -42,13 +43,13 @@ internal class EmbraceSpanService(
 
  override fun initialized(): Boolean = currentDelegate is SpanServiceImpl
 
- override fun createSpan(name: String, parent: EmbraceSpan?, type: EmbraceAttributes.Type, internal: Boolean): EmbraceSpan? =
+ override fun createSpan(name: String, parent: EmbraceSpan?, type: TelemetryType, internal: Boolean): EmbraceSpan? =
  currentDelegate.createSpan(name = name, parent = parent, type = type, internal = internal)
 
  override fun <T> recordSpan(
  name: String,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean,
  attributes: Map<String, String>,
  events: List<EmbraceSpanEvent>,
@@ -68,7 +69,7 @@ internal class EmbraceSpanService(
  startTimeMs: Long,
  endTimeMs: Long,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean,
  attributes: Map<String, String>,
  events: List<EmbraceSpanEvent>,

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/SpanService.kt

@@ -1,5 +1,7 @@
 package io.embrace.android.embracesdk.internal.spans
 
+import io.embrace.android.embracesdk.arch.schema.EmbType
+import io.embrace.android.embracesdk.arch.schema.TelemetryType
 import io.embrace.android.embracesdk.internal.Initializable
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
@@ -16,7 +18,7 @@ internal interface SpanService : Initializable {
  fun createSpan(
  name: String,
  parent: EmbraceSpan? = null,
- type: EmbraceAttributes.Type = EmbraceAttributes.Type.PERFORMANCE,
+ type: TelemetryType = EmbType.Performance,
  internal: Boolean = true
  ): EmbraceSpan?
 
@@ -27,7 +29,7 @@ internal interface SpanService : Initializable {
  name: String,
  parent: EmbraceSpan? = null,
  startTimeMs: Long? = null,
- type: EmbraceAttributes.Type = EmbraceAttributes.Type.PERFORMANCE,
+ type: TelemetryType = EmbType.Performance,
  internal: Boolean = true
  ): EmbraceSpan? {
  createSpan(
@@ -51,7 +53,7 @@ internal interface SpanService : Initializable {
  fun <T> recordSpan(
  name: String,
  parent: EmbraceSpan? = null,
- type: EmbraceAttributes.Type = EmbraceAttributes.Type.PERFORMANCE,
+ type: TelemetryType = EmbType.Performance,
  internal: Boolean = true,
  attributes: Map<String, String> = emptyMap(),
  events: List<EmbraceSpanEvent> = emptyList(),
@@ -67,7 +69,7 @@ internal interface SpanService : Initializable {
  startTimeMs: Long,
  endTimeMs: Long,
  parent: EmbraceSpan? = null,
- type: EmbraceAttributes.Type = EmbraceAttributes.Type.PERFORMANCE,
+ type: TelemetryType = EmbType.Performance,
  internal: Boolean = true,
  attributes: Map<String, String> = emptyMap(),
  events: List<EmbraceSpanEvent> = emptyList(),

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/SpanServiceImpl.kt

@@ -1,5 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
+import io.embrace.android.embracesdk.arch.schema.TelemetryType
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.android.embracesdk.spans.ErrorCode
@@ -27,7 +28,7 @@ internal class SpanServiceImpl(
 
  override fun initialized(): Boolean = initialized.get()
 
- override fun createSpan(name: String, parent: EmbraceSpan?, type: EmbraceAttributes.Type, internal: Boolean): EmbraceSpan? {
+ override fun createSpan(name: String, parent: EmbraceSpan?, type: TelemetryType, internal: Boolean): EmbraceSpan? {
  return if (EmbraceSpanImpl.inputsValid(name) && currentSessionSpan.canStartNewSpan(parent, internal)) {
  EmbraceSpanImpl(
  spanBuilder = createRootSpanBuilder(tracer = tracer, name = name, type = type, internal = internal),
@@ -42,7 +43,7 @@ internal class SpanServiceImpl(
  override fun <T> recordSpan(
  name: String,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean,
  attributes: Map<String, String>,
  events: List<EmbraceSpanEvent>,
@@ -62,7 +63,7 @@ internal class SpanServiceImpl(
  startTimeMs: Long,
  endTimeMs: Long,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean,
  attributes: Map<String, String>,
  events: List<EmbraceSpanEvent>,

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/UninitializedSdkSpanService.kt

@@ -1,6 +1,7 @@
 package io.embrace.android.embracesdk.internal.spans
 
 import io.embrace.android.embracesdk.annotation.InternalApi
+import io.embrace.android.embracesdk.arch.schema.TelemetryType
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.android.embracesdk.spans.ErrorCode
@@ -21,12 +22,12 @@ internal class UninitializedSdkSpanService : SpanService {
 
  override fun initialized(): Boolean = true
 
- override fun createSpan(name: String, parent: EmbraceSpan?, type: EmbraceAttributes.Type, internal: Boolean): EmbraceSpan? = null
+ override fun createSpan(name: String, parent: EmbraceSpan?, type: TelemetryType, internal: Boolean): EmbraceSpan? = null
 
  override fun <T> recordSpan(
  name: String,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean,
  attributes: Map<String, String>,
  events: List<EmbraceSpanEvent>,
@@ -38,7 +39,7 @@ internal class UninitializedSdkSpanService : SpanService {
  startTimeMs: Long,
  endTimeMs: Long,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean,
  attributes: Map<String, String>,
  events: List<EmbraceSpanEvent>,
@@ -116,7 +117,7 @@ internal class UninitializedSdkSpanService : SpanService {
  val startTimeMs: Long,
  val endTimeMs: Long,
  val parent: EmbraceSpan?,
- val type: EmbraceAttributes.Type,
+ val type: TelemetryType,
  val internal: Boolean,
  val attributes: Map<String, String>,
  val events: List<EmbraceSpanEvent>,

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crumbs/FragmentBreadcrumbDataSourceTest.kt

@@ -1,9 +1,9 @@
 package io.embrace.android.embracesdk.capture.crumbs
 
+import io.embrace.android.embracesdk.arch.schema.EmbType
 import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.fakes.FakeConfigService
 import io.embrace.android.embracesdk.fakes.FakeSpanService
-import io.embrace.android.embracesdk.internal.spans.EmbraceAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -35,7 +35,7 @@ internal class FragmentBreadcrumbDataSourceTest {
 
  val span = spanService.createdSpans.single()
  assertEquals("view-breadcrumb", span.name)
- assertEquals(EmbraceAttributes.Type.PERFORMANCE, span.type)
+ assertEquals(EmbType.Performance, span.type)
  assertTrue(span.isRecording)
  assertEquals(
  mapOf(
@@ -54,7 +54,7 @@ internal class FragmentBreadcrumbDataSourceTest {
 
  val span = spanService.createdSpans.single()
  assertEquals("view-breadcrumb", span.name)
- assertEquals(EmbraceAttributes.Type.PERFORMANCE, span.type)
+ assertEquals(EmbType.Performance, span.type)
  assertFalse(span.isRecording)
  assertEquals(
  mapOf(

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/startup/StartupServiceImplTest.kt

@@ -1,5 +1,6 @@
 package io.embrace.android.embracesdk.capture.startup
 
+import io.embrace.android.embracesdk.arch.schema.EmbType
 import io.embrace.android.embracesdk.concurrency.BlockableExecutorService
 import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
@@ -50,8 +51,8 @@ internal class StartupServiceImplTest {
  assertEquals(startTimeMillis, startTimeNanos.nanosToMillis())
  assertEquals(endTimeMillis, endTimeNanos.nanosToMillis())
  assertEquals(
- io.embrace.android.embracesdk.internal.spans.EmbraceAttributes.Type.PERFORMANCE.typeName,
- attributes[io.embrace.android.embracesdk.internal.spans.EmbraceAttributes.Type.PERFORMANCE.keyName()]
+ EmbType.Performance.description,
+ attributes[EmbType.Performance.attributeName()]
  )
  assertTrue(isPrivate())
  assertEquals(StatusCode.OK, status)

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeEmbraceSpan.kt

@@ -1,16 +1,17 @@
 package io.embrace.android.embracesdk.fakes
 
 import io.embrace.android.embracesdk.arch.destination.SpanEventData
+import io.embrace.android.embracesdk.arch.schema.EmbType
 import io.embrace.android.embracesdk.arch.schema.SchemaType
-import io.embrace.android.embracesdk.internal.spans.EmbraceAttributes
+import io.embrace.android.embracesdk.arch.schema.TelemetryType
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.ErrorCode
 import io.opentelemetry.sdk.trace.IdGenerator
 
 internal class FakeEmbraceSpan(
  override val parent: EmbraceSpan?,
  val name: String? = null,
- val type: EmbraceAttributes.Type = EmbraceAttributes.Type.PERFORMANCE,
+ val type: TelemetryType = EmbType.Performance,
  val internal: Boolean = true
 ) : EmbraceSpan {
 

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeSpanService.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.fakes
 
-import io.embrace.android.embracesdk.internal.spans.EmbraceAttributes
+import io.embrace.android.embracesdk.arch.schema.TelemetryType
 import io.embrace.android.embracesdk.internal.spans.SpanService
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
@@ -18,7 +18,7 @@ internal class FakeSpanService : SpanService {
  override fun createSpan(
  name: String,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean
  ): EmbraceSpan = FakeEmbraceSpan(null, name, type, internal).apply {
  createdSpans.add(this)
@@ -27,7 +27,7 @@ internal class FakeSpanService : SpanService {
  override fun <T> recordSpan(
  name: String,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean,
  attributes: Map<String, String>,
  events: List<EmbraceSpanEvent>,
@@ -41,7 +41,7 @@ internal class FakeSpanService : SpanService {
  startTimeMs: Long,
  endTimeMs: Long,
  parent: EmbraceSpan?,
- type: EmbraceAttributes.Type,
+ type: TelemetryType,
  internal: Boolean,
  attributes: Map<String, String>,
  events: List<EmbraceSpanEvent>,

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImplTests.kt

@@ -2,6 +2,7 @@ package io.embrace.android.embracesdk.internal.spans
 
 import io.embrace.android.embracesdk.arch.destination.SpanAttributeData
 import io.embrace.android.embracesdk.arch.destination.SpanEventData
+import io.embrace.android.embracesdk.arch.schema.EmbType
 import io.embrace.android.embracesdk.arch.schema.SchemaType
 import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
@@ -140,10 +141,7 @@ internal class CurrentSessionSpanImplTests {
  val lastFlushedSpan = flushedSpans[0]
  with(lastFlushedSpan) {
  assertEquals("emb-session", name)
- assertEquals(
- EmbraceAttributes.Type.SESSION.typeName,
- attributes[EmbraceAttributes.Type.SESSION.keyName()]
- )
+ assertEquals(EmbType.Ux.Session.description, attributes[EmbType.Ux.Session.attributeName()])
  assertEquals(StatusCode.OK, status)
  assertFalse(isKey())
  assertEquals(it.name, attributes[it.keyName()])

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanServiceTest.kt

@@ -1,5 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
+import io.embrace.android.embracesdk.arch.schema.EmbType
 import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
 import io.embrace.android.embracesdk.internal.clock.nanosToMillis
@@ -58,7 +59,7 @@ internal class EmbraceSpanServiceTest {
  val expectedName = "test-span"
  val expectedStartTimeMs = clock.now()
  val expectedEndTimeMs = expectedStartTimeMs + 100L
- val expectedType = EmbraceAttributes.Type.PERFORMANCE
+ val expectedType = EmbType.Performance
  val expectedAttributes = mapOf(
  Pair("attribute1", "value1"),
  Pair("attribute2", "value2")
@@ -86,7 +87,10 @@ internal class EmbraceSpanServiceTest {
  assertEquals(name, name)
  assertEquals(expectedStartTimeMs, startTimeNanos.nanosToMillis())
  assertEquals(expectedEndTimeMs, endTimeNanos.nanosToMillis())
- assertEquals(expectedType.typeName, attributes[EmbraceAttributes.Type.PERFORMANCE.keyName()])
+ assertEquals(
+ EmbType.Performance.description,
+ attributes[EmbType.Performance.attributeName()]
+ )
  expectedAttributes.forEach {
  assertEquals(it.value, attributes[it.key])
  }

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/EmbraceTracerTest.kt

@@ -1,5 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
+import io.embrace.android.embracesdk.arch.schema.EmbType
 import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
 import io.embrace.android.embracesdk.fixtures.TOO_LONG_SPAN_NAME
@@ -315,8 +316,8 @@ internal class EmbraceTracerTest {
  val currentSpan = currentSpans[0]
  assertEquals(name, currentSpan.name)
  assertEquals(
- EmbraceAttributes.Type.PERFORMANCE.typeName,
- currentSpan.attributes[EmbraceAttributes.Type.PERFORMANCE.keyName()]
+ EmbType.Performance.description,
+ currentSpan.attributes[EmbType.Performance.attributeName()]
  )
  assertEquals(if (traceRoot) "true" else null, currentSpan.attributes["emb.key"])
  assertEquals(errorCode?.name, currentSpan.attributes[errorCode?.keyName()])