Skip to content

Commit ae3f76a

Browse files
committed
RUM-9902 - post review fixes
1 parent a90662e commit ae3f76a

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,14 +436,14 @@ internal class TelemetryEventHandler(
436436
}
437437

438438
private fun isGlobalTracerRegistered(): Boolean {
439-
// We don't reference io.opentracing from RUM directly, so using reflection for this.
440-
// Would be nice to add the test with the flavor which is has no io.opentracing and test
439+
// We don't reference com.datadog.android.trace from RUM directly, so using reflection for this.
440+
// Would be nice to add the test with the flavor which is has no com.datadog.android.trace and test
441441
// for obfuscation enabled case.
442442
return try {
443443
val globalDatadogTracer =
444444
Class.forName("com.datadog.android.trace.GlobalDatadogTracer")
445445
return try {
446-
val holderInstance = globalDatadogTracer.getField("INSTANCE").get(null)
446+
val holderInstance = globalDatadogTracer.getDeclaredField("INSTANCE").get(null)
447447
globalDatadogTracer.getDeclaredMethod("getOrNull").invoke(holderInstance) != null
448448
} catch (@Suppress("TooGenericExceptionCaught") t: Throwable) {
449449
sdkCore.internalLogger.log(

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/span/DatadogSpan.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ interface DatadogSpan {
7474
/**
7575
* Retrieves the context associated with this Datadog span.
7676
*
77-
* @return The DatadogSpanContext containing trace and span-specific information such as identifiers, sampling priority, and tags.
77+
* @return The [DatadogSpanContext] containing trace and span-specific information such as identifiers, sampling priority, and tags.
7878
*/
7979
fun context(): DatadogSpanContext
8080

reliability/single-fit/okhttp/src/test/kotlin/com/datadog/android/okhttp/HeadBasedSamplingTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ class HeadBasedSamplingTest {
8080
}
8181

8282
private fun Request.Builder.parentSpan(span: DatadogSpan): Request.Builder {
83-
@Suppress("UnsafeThirdPartyFunctionCall") // Span can't be null
8483
tag(DatadogSpan::class.java, span)
8584
return this
8685
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright 2016-Present Datadog, Inc.
55
*/
66

7-
package com.datadog.android.trace.integration.opentracing
7+
package com.datadog.android.trace.integration.api
88

99
import com.datadog.android.trace.api.span.DatadogSpan
1010
import com.datadog.android.trace.internal.DatadogTracingToolkit
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright 2016-Present Datadog, Inc.
55
*/
66

7-
package com.datadog.android.trace.integration.opentracing
7+
package com.datadog.android.trace.integration.api
88

99
import com.datadog.android.api.feature.Feature
1010
import com.datadog.android.api.feature.StorageBackedFeature
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright 2016-Present Datadog, Inc.
55
*/
66

7-
package com.datadog.android.trace.integration.opentracing
7+
package com.datadog.android.trace.integration.api
88

99
import com.datadog.android.api.feature.Feature
1010
import com.datadog.android.core.stub.StubSDKCore

reliability/single-fit/trace/src/test/kotlin/com/datadog/android/trace/integration/otel/OtelTraceConfigurationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class OtelTraceConfigurationTest {
5050
stubSdkCore = StubSDKCore(forge)
5151
}
5252

53-
@Test
53+
@RepeatedTest(10)
5454
fun `M send span without network info W setNetworkInfoEnabled(false) + buildSpan() + start() + finish()`(
5555
@StringForgery fakeInstrumentationName: String,
5656
@StringForgery fakeOperation: String

0 commit comments

Comments
 (0)