Skip to content

Commit 4a77e9a

Browse files
committed
RUM-9899: fixing detekt
1 parent 41bf3c5 commit 4a77e9a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

detekt_custom.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,7 @@ datadog:
753753
- "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.android.api.SdkCore?, com.datadog.android.api.SdkCore?)"
754754
- "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI?, com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI?)"
755755
- "java.util.concurrent.atomic.AtomicReference.compareAndSet(io.opentracing.Tracer?, io.opentracing.Tracer?)"
756+
- "java.util.concurrent.atomic.AtomicReference.compareAndSet(UNKNOWN, UNKNOWN)"
756757
- "java.util.concurrent.atomic.AtomicReference.constructor()"
757758
- "java.util.concurrent.atomic.AtomicReference.constructor(android.app.Application.ActivityLifecycleCallbacks?)"
758759
- "java.util.concurrent.atomic.AtomicReference.constructor(com.datadog.android.api.SdkCore?)"
@@ -770,6 +771,7 @@ datadog:
770771
- "java.util.concurrent.atomic.AtomicReference.set(io.opentracing.Tracer?)"
771772
- "java.util.concurrent.atomic.AtomicReference.set(kotlin.Nothing?)"
772773
- "java.util.concurrent.atomic.AtomicReference.set(kotlin.String?)"
774+
- "java.util.concurrent.atomic.AtomicReference.set(UNKNOWN)"
773775
- "java.util.concurrent.locks.ReadWriteLock.readLock()"
774776
- "java.util.concurrent.locks.ReadWriteLock.writeLock()"
775777
- "java.util.concurrent.locks.ReentrantReadWriteLock.constructor()"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,14 +467,14 @@ internal constructor(
467467
val spanId = span.context().spanId.toString()
468468
requestBuilder.addHeader(
469469
W3C_TRACEPARENT_KEY,
470-
@Suppress("UnsafeThirdPartyFunctionCall") // Format string is static
470+
@Suppress("UnsafeThirdPartyFunctionCall", "InvalidStringFormat") // Format string is static
471471
W3C_TRACEPARENT_DROP_SAMPLING_DECISION.format(
472472
traceId.padStart(length = W3C_TRACE_ID_LENGTH, padChar = '0'),
473473
spanId.padStart(length = W3C_PARENT_ID_LENGTH, padChar = '0')
474474
)
475475
)
476476
// TODO RUM-2121 3rd party vendor information will be erased
477-
@Suppress("UnsafeThirdPartyFunctionCall") // Format string is static
477+
@Suppress("UnsafeThirdPartyFunctionCall", "InvalidStringFormat") // Format string is static
478478
var traceStateHeader = W3C_TRACESTATE_DROP_SAMPLING_DECISION
479479
.format(spanId.padStart(length = W3C_PARENT_ID_LENGTH, padChar = '0'))
480480
if (traceOrigin != null) {

0 commit comments

Comments
 (0)