Merge pull request #2328 from embrace-io/refactor-mapping-function

Alter mapping function location

Author: fractalwrench

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelExt.kt

@@ -6,14 +6,14 @@ import io.embrace.android.embracesdk.internal.otel.attrs.EmbraceAttributeKey
 import io.embrace.android.embracesdk.internal.otel.attrs.asOtelAttributeKey
 import io.embrace.android.embracesdk.internal.otel.payload.toEmbracePayload
 import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSpanData
-import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSpanData.Companion.fromEventData
 import io.embrace.android.embracesdk.internal.otel.toOtelKotlin
 import io.embrace.android.embracesdk.internal.payload.Attribute
 import io.embrace.android.embracesdk.internal.payload.Link
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaAttributes
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaAttributesBuilder
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaEventData
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaLinkData
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaLogRecordBuilder
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpan
@@ -78,11 +78,19 @@ fun OtelJavaSpanData.toEmbraceSpanData(): EmbraceSpanData = EmbraceSpanData(
     startTimeNanos = startEpochNanos,
     endTimeNanos = endEpochNanos,
     status = status.statusCode.toOtelKotlin(),
-    events = fromEventData(eventDataList = events),
+    events = events?.mapNotNull { it.toEmbracePayload() } ?: emptyList(),
     attributes = attributes.toStringMap(),
     links = links.map { it.toEmbracePayload() }
 )
 
+private fun OtelJavaEventData.toEmbracePayload(): EmbraceSpanEvent? {
+    return EmbraceSpanEvent.create(
+        name = name,
+        timestampMs = epochNanos.nanosToMillis(),
+        attributes = attributes.toStringMap(),
+    )
+}
+
 @OptIn(ExperimentalApi::class)
 fun ReadableSpan.toEmbracePayload(): EmbraceSpanData = EmbraceSpanData(
     traceId = spanContext.traceId,

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSpanData.kt

@@ -1,10 +1,7 @@
 package io.embrace.android.embracesdk.internal.otel.spans
 
-import io.embrace.android.embracesdk.internal.clock.nanosToMillis
-import io.embrace.android.embracesdk.internal.otel.sdk.toStringMap
 import io.embrace.android.embracesdk.internal.payload.Link
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
-import io.embrace.opentelemetry.kotlin.aliases.OtelJavaEventData
 import io.embrace.opentelemetry.kotlin.tracing.StatusCode
 
 /**
@@ -30,22 +27,4 @@ data class EmbraceSpanData(
     val attributes: Map<String, String> = emptyMap(),
 
     val links: List<Link> = emptyList(),
-) {
-
-    companion object {
-        fun fromEventData(eventDataList: List<OtelJavaEventData>?): List<EmbraceSpanEvent> {
-            val events = mutableListOf<EmbraceSpanEvent>()
-            eventDataList?.forEach { eventData ->
-                val event = EmbraceSpanEvent.create(
-                    name = eventData.name,
-                    timestampMs = eventData.epochNanos.nanosToMillis(),
-                    attributes = eventData.attributes.toStringMap(),
-                )
-                if (event != null) {
-                    events.add(event)
-                }
-            }
-            return events
-        }
-    }
-}
+)