Skip to content

Remove unused OTel java function #2316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fractalwrench merged 1 commit into from
Jul 8, 2025
Merged

Remove unused OTel java function #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions ...android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/TracerExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanCreator
import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanStartArgs
import io.embrace.android.embracesdk.spans.AutoTerminationMode
import io.embrace.android.embracesdk.spans.EmbraceSpan
import io.embrace.opentelemetry.kotlin.Clock
import io.embrace.opentelemetry.kotlin.ExperimentalApi
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTracer
import io.embrace.opentelemetry.kotlin.k2j.tracing.TracerAdapter
import io.embrace.opentelemetry.kotlin.tracing.Tracer

/**
Expand All @@ -33,27 +30,3 @@ fun Tracer.otelSpanCreator(
),
tracer = this
)

/**
* Creates a new [OtelSpanCreator] that marks the resulting span as private if [internal] is true
*/
@OptIn(ExperimentalApi::class)
fun OtelJavaTracer.otelSpanCreator(
name: String,
type: EmbType,
internal: Boolean,
private: Boolean,
clock: Clock,
parent: EmbraceSpan? = null,
autoTerminationMode: AutoTerminationMode = AutoTerminationMode.NONE,
): OtelSpanCreator = OtelSpanCreator(
OtelSpanStartArgs(
name = name,
type = type,
internal = internal,
private = private,
autoTerminationMode = autoTerminationMode,
parentSpan = parent,
),
tracer = TracerAdapter(this, clock)
)
16 changes: 6 additions & 10 deletions .../src/test/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSpanImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ import io.embrace.android.embracesdk.internal.serialization.PlatformSerializer
import io.embrace.android.embracesdk.internal.utils.truncatedStacktraceText
import io.embrace.android.embracesdk.spans.ErrorCode
import io.embrace.opentelemetry.kotlin.ExperimentalApi
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaOpenTelemetrySdk
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSdkTracerProvider
import io.embrace.opentelemetry.kotlin.k2j.ClockAdapter
import io.embrace.opentelemetry.kotlin.k2j.tracing.TracerAdapter
import io.embrace.opentelemetry.kotlin.OpenTelemetryInstance
import io.embrace.opentelemetry.kotlin.kotlinApi
import io.opentelemetry.semconv.ExceptionAttributes
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
Expand All @@ -57,9 +55,9 @@ internal class EmbraceSpanImplTest {
private lateinit var embraceSpanFactory: EmbraceSpanFactory
private var updateNotified: Boolean = false
private var stoppedSpanId: String? = null
private val tracer = OtelJavaOpenTelemetrySdk.builder()
.setTracerProvider(OtelJavaSdkTracerProvider.builder().build()).build()
.getTracer(EmbraceSpanImplTest::class.java.name)
private val tracer = OpenTelemetryInstance.kotlinApi().tracerProvider.getTracer(
"test-tracer"
)

@Before
fun setup() {
Expand All @@ -68,7 +66,7 @@ internal class EmbraceSpanImplTest {
spanRepository = SpanRepository().apply { setSpanUpdateNotifier { updateNotified = true } }
serializer = TestPlatformSerializer()
embraceSpanFactory = EmbraceSpanFactoryImpl(
tracer = TracerAdapter(tracer, ClockAdapter(otelClock)),
tracer = tracer,
openTelemetryClock = otelClock,
spanRepository = spanRepository,
stopCallback = ::stopCallback,
Expand All @@ -80,7 +78,6 @@ internal class EmbraceSpanImplTest {
type = EmbType.Performance.Default,
internal = false,
private = false,
clock = ClockAdapter(otelClock),
)
)
fakeClock.tick(100)
Expand Down Expand Up @@ -547,7 +544,6 @@ internal class EmbraceSpanImplTest {
type = EmbType.System.LowPower,
internal = true,
private = true,
clock = ClockAdapter(FakeOtelJavaClock(fakeClock))
)

private fun EmbraceSdkSpan.assertSnapshot(
Expand Down