Skip to content

Commit 8babf49

Browse files
committed
RUM-9899: fix test compilation - avoiding legacy code usage checks for now
1 parent 1dd6f0e commit 8babf49

File tree

8 files changed

+9
-15
lines changed

8 files changed

+9
-15
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ internal constructor(
305305
val parentContext = extractParentContext(tracer, request)
306306
val url = request.url.toString()
307307

308+
@Suppress("DEPRECATION")
308309
val span = tracer.buildSpan(SPAN_NAME)
309310
.withOrigin(traceOrigin)
310311
.asChildOf(parentContext)

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/internal/utils/SpanSamplingIdProviderTest.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ internal class SpanSamplingIdProviderTest {
9090
}
9191

9292
@Test
93-
fun `M return 0u W provideId() {no rum session, invalid traceId}`(
94-
@StringForgery(regex = "([g-z][\\w\\d])+") fakeString: String
95-
) {
93+
fun `M return 0u W provideId() {no rum session, invalid traceId}`() {
9694
// Given
9795
val expectedId: ULong = 0u
9896
whenever(mockSpanContext.traceId) doReturn DDTraceId.ZERO

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorContextInjectionSampledTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6+
@file:Suppress("DEPRECATION")
67

78
package com.datadog.android.okhttp.trace
89

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorNonDdTracerNotSendingSpanTest.kt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6+
@file:Suppress("DEPRECATION")
67

78
package com.datadog.android.okhttp.trace
89

@@ -1004,17 +1005,6 @@ internal open class TracingInterceptorNonDdTracerNotSendingSpanTest {
10041005
forge: Forge,
10051006
@IntForgery(min = 200, max = 300) statusCode: Int
10061007
) {
1007-
// val localSpan: Span = forge.newSpanMock(mockSpanContext)
1008-
// val localSpanBuilder: SpanBuilder = forge.newSpanBuilderMock(localSpan, mockSpanContext)
1009-
// whenever(mockResolver.isFirstPartyUrl(fakeUrl.toHttpUrl())).thenReturn(true)
1010-
// whenever(mockLocalTracer.buildSpan(TracingInterceptor.SPAN_NAME)).thenReturn(localSpanBuilder)
1011-
// whenever(mockTraceSampler.sample(localSpan)).thenReturn(true)
1012-
// val testedInterceptorNoGlobal = instantiateTestedInterceptor(
1013-
// fakeLocalHosts,
1014-
// localTracerFactory = { _, _ -> mockLocalTracer },
1015-
// globalTracerProvider = { null }
1016-
// )
1017-
10181008
val localSpan: Span = forge.newSpanMock(mockSpanContext)
10191009
val localSpanBuilder: SpanBuilder = forge.newSpanBuilderMock(localSpan, mockSpanContext)
10201010
whenever(mockLocalTracer.buildSpan(TracingInterceptor.SPAN_NAME)).thenReturn(localSpanBuilder)

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorNonDdTracerTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6+
@file:Suppress("DEPRECATION")
67

78
package com.datadog.android.okhttp.trace
89

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorNotSendingSpanTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6+
@file:Suppress("DEPRECATION")
67

78
package com.datadog.android.okhttp.trace
89

@@ -1076,7 +1077,6 @@ internal open class TracingInterceptorNotSendingSpanTest {
10761077
)
10771078

10781079
stubChain(mockChain, statusCode)
1079-
// whenever(mockLocalTracer.buildSpan(TracingInterceptor.SPAN_NAME)) doReturn localSpanBuilder
10801080
val response1 = testedInterceptor.intercept(mockChain)
10811081
val expectedResponse1 = fakeResponse
10821082

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6+
@file:Suppress("DEPRECATION")
67

78
package com.datadog.android.okhttp.trace
89

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorTestsExt.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6+
@file:Suppress("DEPRECATION")
7+
68
package com.datadog.android.okhttp.trace
79

810
import com.datadog.android.core.sampling.Sampler

0 commit comments

Comments
 (0)