Skip to content

Commit 05e6542

Browse files
committed
RUM-9899: adding missing tests for new methods
1 parent 4a3c765 commit 05e6542

File tree

4 files changed

+31
-5
lines changed

4 files changed

+31
-5
lines changed

dd-sdk-android-internal/src/main/java/com/datadog/android/internal/utils/CastExt.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ package com.datadog.android.internal.utils
1717
* ```
1818
* now could be written as:
1919
* ```kotlin
20-
val writer = featuredSdkCore.getFeature(Feature.TRACING_FEATURE_NAME)
21-
?.unwrap<Feature>()
22-
?.tryCastTo<com.datadog.android.trace.InternalCoreWriterProvider>()
23-
?.getCoreTracerWriter()
20+
val writer = featuredSdkCore.getFeature(Feature.TRACING_FEATURE_NAME)
21+
?.unwrap<Feature>()
22+
?.tryCastTo<com.datadog.android.trace.InternalCoreWriterProvider>()
23+
?.getCoreTracerWriter()
2424
* ```
2525
*/
2626
inline fun <reified R> Any.tryCastTo(): R? {

features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/core/CoreSpanBuilderTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,15 @@ internal class CoreSpanBuilderTest : DDCoreSpecification() {
9292
val expectedResource = "fakeResource"
9393
val expectedService = "fakeService"
9494
val expectedType = "fakeType"
95+
val expectedOrigin = "fakeOrigin"
9596

9697
// When
9798
val thirdSpan = tracer
9899
.buildSpan(instrumentationName, expectedName)
99100
.withServiceName("foo")
100101
.withResourceName(expectedResource)
101102
.withServiceName(expectedService)
103+
.withOrigin(expectedOrigin)
102104
.withErrorFlag()
103105
.withSpanType(expectedType)
104106
.start()
@@ -110,6 +112,7 @@ internal class CoreSpanBuilderTest : DDCoreSpecification() {
110112
assertThat(context.errorFlag).isTrue
111113
assertThat(context.serviceName).isEqualTo(expectedService)
112114
assertThat(context.spanType).isEqualTo(expectedType)
115+
assertThat(context.origin).isEqualTo(expectedOrigin)
113116
}
114117

115118
@ParameterizedTest

features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/core/DDSpanTest.kt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import org.junit.jupiter.api.Test
3030
import org.junit.jupiter.params.ParameterizedTest
3131
import org.junit.jupiter.params.provider.Arguments
3232
import org.junit.jupiter.params.provider.MethodSource
33+
import org.mockito.kotlin.any
34+
import org.mockito.kotlin.doReturn
3335
import org.mockito.kotlin.mock
3436
import org.mockito.kotlin.times
3537
import org.mockito.kotlin.verify
@@ -510,6 +512,27 @@ internal class DDSpanTest : DDCoreSpecification() {
510512
assertThat(span.samplingPriority()).isEqualTo(PrioritySampling.UNSET.toInt())
511513
}
512514

515+
@Test
516+
fun `W drop T unregisterSpan is called`() {
517+
val mockTrace = mock<PendingTrace> {
518+
on { rootSpan } doReturn mock()
519+
}
520+
521+
val mockContext = mock<DDSpanContext> {
522+
on { traceId } doReturn mock<DDTraceId>()
523+
on { trace } doReturn mockTrace
524+
}
525+
526+
val span = tracer
527+
.buildSpan(instrumentationName, "testSpan")
528+
.asChildOf(mockContext)
529+
.start() as DDSpan
530+
531+
span.drop()
532+
533+
verify(mockTrace).unregisterSpan(any())
534+
}
535+
513536
@Test
514537
fun `error priorities should be respected`() {
515538
// Given

integrations/dd-sdk-android-okhttp/src/main/kotlin/com/datadog/android/okhttp/trace/TracingInterceptor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ internal constructor(
853853
private const val AGENT_PSR_ATTRIBUTE = "_dd.agent_psr"
854854
private const val WRITER_PROVIDER_INTERFACE_NOT_IMPLEMENTED_ERROR_MESSAGE =
855855
"The Tracing feature is not implementing the InternalCoreWriterProvider interface." +
856-
" No tracing data will be sent."
856+
" No tracing data will be sent."
857857

858858
private val DEFAULT_LOCAL_TRACER_FACTORY: (SdkCore, Set<TracingHeaderType>) -> AgentTracer.TracerAPI =
859859
{ sdkCore, tracingHeaderTypes: Set<TracingHeaderType> ->

0 commit comments

Comments
 (0)