Merge pull request #2405 from embrace-io/combine-span-creator

Combine span creator with span start args

Author: fractalwrench

embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/injection/OpenTelemetryModuleImpl.kt

@@ -90,7 +90,6 @@ internal class OpenTelemetryModuleImpl(
 
     private val embraceSpanFactory: EmbraceSpanFactory by singleton {
         EmbraceSpanFactoryImpl(
-            tracer = otelSdkWrapper.sdkTracer,
             openTelemetryClock = openTelemetryClock,
             spanRepository = spanRepository,
             dataValidator = dataValidator,
@@ -105,7 +104,8 @@ internal class OpenTelemetryModuleImpl(
             telemetryService = initModule.telemetryService,
             spanRepository = spanRepository,
             spanSink = spanSink,
-            embraceSpanFactorySupplier = { embraceSpanFactory }
+            tracerSupplier = { otelSdkWrapper.sdkTracer },
+            embraceSpanFactorySupplier = { embraceSpanFactory },
         ).also {
             internalSpanStopCallback = it::spanStopCallback
         }
@@ -116,8 +116,10 @@ internal class OpenTelemetryModuleImpl(
             spanRepository = spanRepository,
             canStartNewSpan = currentSessionSpan::canStartNewSpan,
             initCallback = currentSessionSpan::initializeService,
-            dataValidator = dataValidator
-        ) { embraceSpanFactory }
+            dataValidator = dataValidator,
+            tracerSupplier = { otelSdkWrapper.sdkTracer },
+            embraceSpanFactorySupplier = { embraceSpanFactory },
+        )
     }
 
     override val embraceTracer: EmbraceTracer by singleton {

embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImpl.kt

@@ -12,6 +12,7 @@ import io.embrace.android.embracesdk.internal.otel.sdk.toEmbraceObjectName
 import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSdkSpan
 import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSpanData
 import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSpanFactory
+import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanStartArgs
 import io.embrace.android.embracesdk.internal.otel.spans.SpanRepository
 import io.embrace.android.embracesdk.internal.otel.spans.SpanSink
 import io.embrace.android.embracesdk.internal.otel.toOtelKotlin
@@ -22,6 +23,7 @@ import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.ErrorCode
 import io.embrace.opentelemetry.kotlin.Clock
 import io.embrace.opentelemetry.kotlin.ExperimentalApi
+import io.embrace.opentelemetry.kotlin.tracing.Tracer
 import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
@@ -33,6 +35,7 @@ internal class CurrentSessionSpanImpl(
     private val telemetryService: TelemetryService,
     private val spanRepository: SpanRepository,
     private val spanSink: SpanSink,
+    private val tracerSupplier: Provider<Tracer>,
     private val embraceSpanFactorySupplier: Provider<EmbraceSpanFactory>,
 ) : CurrentSessionSpan, SessionSpanWriter {
 
@@ -206,10 +209,13 @@ internal class CurrentSessionSpanImpl(
         internalTraceCount.set(0)
 
         return embraceSpanFactorySupplier().create(
-            name = "session",
-            type = EmbType.Ux.Session,
-            internal = true,
-            private = false,
+            OtelSpanStartArgs(
+                name = "session",
+                type = EmbType.Ux.Session,
+                internal = true,
+                private = false,
+                tracer = tracerSupplier()
+            )
         ).apply {
             start(startTimeMs = startTimeMs)
             setSystemAttribute(SessionIncubatingAttributes.SESSION_ID.key, Uuid.getEmbUuid())

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

@@ -10,6 +10,7 @@ import io.embrace.android.embracesdk.assertions.validateSystemLink
 import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.fakes.FakeEmbraceSdkSpan
 import io.embrace.android.embracesdk.fakes.FakeEmbraceSpanFactory
+import io.embrace.android.embracesdk.fakes.FakeTracer
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
 import io.embrace.android.embracesdk.internal.arch.destination.SpanAttributeData
 import io.embrace.android.embracesdk.internal.arch.schema.SchemaType
@@ -22,7 +23,7 @@ import io.embrace.android.embracesdk.internal.otel.schema.AppTerminationCause
 import io.embrace.android.embracesdk.internal.otel.schema.EmbType
 import io.embrace.android.embracesdk.internal.otel.schema.LinkType
 import io.embrace.android.embracesdk.internal.otel.sdk.id.OtelIds
-import io.embrace.android.embracesdk.internal.otel.sdk.otelSpanCreator
+import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanStartArgs
 import io.embrace.android.embracesdk.internal.otel.spans.SpanRepository
 import io.embrace.android.embracesdk.internal.otel.spans.SpanService
 import io.embrace.android.embracesdk.internal.otel.spans.SpanSink
@@ -153,35 +154,38 @@ internal class CurrentSessionSpanImplTests {
         repeat(MAX_NON_INTERNAL_SPANS_PER_SESSION) {
             assertNotNull(
                 spanService.createSpan(
-                    otelSpanCreator = tracer.otelSpanCreator(
+                    otelSpanStartArgs = OtelSpanStartArgs(
                         name = "external-span",
                         type = EmbType.Performance.Default,
-                        parent = null,
                         internal = false,
                         private = false,
+                        tracer = tracer,
+                        parentSpan = null,
                     )
                 )
             )
         }
         assertNull(
             spanService.createSpan(
-                otelSpanCreator = tracer.otelSpanCreator(
+                otelSpanStartArgs = OtelSpanStartArgs(
                     name = "external-span",
                     type = EmbType.Performance.Default,
-                    parent = null,
                     internal = false,
                     private = false,
+                    tracer = tracer,
+                    parentSpan = null,
                 )
             )
         )
         assertNotNull(
             spanService.createSpan(
-                otelSpanCreator = tracer.otelSpanCreator(
+                otelSpanStartArgs = OtelSpanStartArgs(
                     name = "internal-span",
                     type = EmbType.Performance.Default,
-                    parent = null,
                     internal = true,
                     private = false,
+                    tracer = tracer,
+                    parentSpan = null,
                 )
             )
         )
@@ -475,7 +479,8 @@ internal class CurrentSessionSpanImplTests {
             telemetryService = telemetryService,
             spanRepository = spanRepository,
             spanSink = spanSink,
-            embraceSpanFactorySupplier = { FakeEmbraceSpanFactory() }
+            embraceSpanFactorySupplier = { FakeEmbraceSpanFactory() },
+            tracerSupplier = { FakeTracer() }
         )
         assertFalse(sessionSpan.readySession())
     }

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/impl/EmbOtelJavaSpanBuilder.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.otel.impl
 
-import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanCreator
+import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanStartArgs
 import io.embrace.android.embracesdk.internal.otel.spans.SpanService
 import io.embrace.opentelemetry.kotlin.Clock
 import io.embrace.opentelemetry.kotlin.ExperimentalApi
@@ -15,13 +15,11 @@ import java.util.concurrent.TimeUnit
 
 @OptIn(ExperimentalApi::class)
 class EmbOtelJavaSpanBuilder(
-    private val otelSpanCreator: OtelSpanCreator,
+    private val otelSpanStartArgs: OtelSpanStartArgs,
     private val spanService: SpanService,
     private val clock: Clock,
 ) : OtelJavaSpanBuilder {
 
-    private val otelSpanStartArgs = otelSpanCreator.spanStartArgs
-
     override fun setParent(context: OtelJavaContext): OtelJavaSpanBuilder {
         otelSpanStartArgs.parentContext = context
         return this
@@ -61,7 +59,7 @@ class EmbOtelJavaSpanBuilder(
     }
 
     override fun startSpan(): OtelJavaSpan {
-        spanService.createSpan(otelSpanCreator)?.let { embraceSpan ->
+        spanService.createSpan(otelSpanStartArgs)?.let { embraceSpan ->
             if (embraceSpan.start()) {
                 return EmbOtelJavaSpan(
                     embraceSpan = embraceSpan,

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/impl/EmbOtelJavaTracer.kt

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.internal.otel.impl
 
 import io.embrace.android.embracesdk.internal.otel.schema.EmbType
-import io.embrace.android.embracesdk.internal.otel.sdk.otelSpanCreator
+import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanStartArgs
 import io.embrace.android.embracesdk.internal.otel.spans.SpanService
 import io.embrace.android.embracesdk.internal.otel.spans.getEmbraceSpan
 import io.embrace.opentelemetry.kotlin.Clock
@@ -20,12 +20,13 @@ class EmbOtelJavaTracer(
 
     override fun spanBuilder(spanName: String): OtelJavaSpanBuilder =
         EmbOtelJavaSpanBuilder(
-            otelSpanCreator = sdkTracer.otelSpanCreator(
+            otelSpanStartArgs = OtelSpanStartArgs(
                 name = spanName,
                 type = EmbType.Performance.Default,
-                private = false,
                 internal = false,
-                parent = OtelJavaContext.current().getEmbraceSpan(),
+                private = false,
+                tracer = sdkTracer,
+                parentSpan = OtelJavaContext.current().getEmbraceSpan(),
             ),
             spanService = spanService,
             clock = clock,

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/impl/EmbTracer.kt

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.internal.otel.impl
 
 import io.embrace.android.embracesdk.internal.otel.schema.EmbType
-import io.embrace.android.embracesdk.internal.otel.sdk.otelSpanCreator
+import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanStartArgs
 import io.embrace.android.embracesdk.internal.otel.spans.SpanService
 import io.embrace.android.embracesdk.internal.otel.spans.getEmbraceSpan
 import io.embrace.opentelemetry.kotlin.Clock
@@ -30,12 +30,13 @@ class EmbTracer(
         startTimestamp: Long?,
         action: SpanRelationships.() -> Unit,
     ): Span {
-        val spanCreator = impl.otelSpanCreator(
+        val spanCreator = OtelSpanStartArgs(
             name = name,
             type = EmbType.Performance.Default,
-            private = false,
             internal = false,
-            parent = OtelJavaContext.current().getEmbraceSpan(),
+            private = false,
+            tracer = impl,
+            parentSpan = OtelJavaContext.current().getEmbraceSpan(),
         )
 
         spanService.createSpan(spanCreator)?.let { embraceSpan ->

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

@@ -1,25 +1,9 @@
 package io.embrace.android.embracesdk.internal.otel.spans
 
-import io.embrace.android.embracesdk.internal.otel.schema.EmbType
-import io.embrace.android.embracesdk.spans.AutoTerminationMode
-import io.embrace.android.embracesdk.spans.EmbraceSpan
-
 /**
  * Creates instances of [EmbraceSdkSpan] for internal usage. Using this factory is preferred to invoking the constructor
  * because of the it requires several services that may not be easily available.
  */
 interface EmbraceSpanFactory {
-    fun create(
-        name: String,
-        type: EmbType,
-        internal: Boolean,
-        private: Boolean,
-        parent: EmbraceSpan? = null,
-        autoTerminationMode: AutoTerminationMode = AutoTerminationMode.NONE
-    ): EmbraceSdkSpan
-
-    fun create(
-        otelSpanCreator: OtelSpanCreator,
-        autoTerminationMode: AutoTerminationMode = AutoTerminationMode.NONE
-    ): EmbraceSdkSpan
+    fun create(otelSpanStartArgs: OtelSpanStartArgs): EmbraceSdkSpan
 }