Skip to content

Commit 28c7230

Browse files
committed
RUM-9899: fix configuration
1 parent c80626e commit 28c7230

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

detekt_custom.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,7 @@ datadog:
751751
- "java.util.concurrent.atomic.AtomicLong.set(kotlin.Long)"
752752
- "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.trace.core.CoreTracer?, com.datadog.trace.core.CoreTracer?)"
753753
- "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.android.api.SdkCore?, com.datadog.android.api.SdkCore?)"
754+
- "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI?, com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI?)"
754755
- "java.util.concurrent.atomic.AtomicReference.compareAndSet(io.opentracing.Tracer?, io.opentracing.Tracer?)"
755756
- "java.util.concurrent.atomic.AtomicReference.constructor()"
756757
- "java.util.concurrent.atomic.AtomicReference.constructor(android.app.Application.ActivityLifecycleCallbacks?)"
@@ -764,6 +765,7 @@ datadog:
764765
- "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.api.SdkCore?)"
765766
- "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.api.feature.FeatureEventReceiver?)"
766767
- "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.rum.internal.domain.RumContext?)"
768+
- "java.util.concurrent.atomic.AtomicReference.set(com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI?)"
767769
- "java.util.concurrent.atomic.AtomicReference.set(com.datadog.trace.core.CoreTracer?)"
768770
- "java.util.concurrent.atomic.AtomicReference.set(io.opentracing.Tracer?)"
769771
- "java.util.concurrent.atomic.AtomicReference.set(kotlin.Nothing?)"

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/core/PendingTrace.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ void registerSpan(final DDSpan span) {
225225

226226
public void unregisterSpan(final DDSpan span){
227227
PENDING_REFERENCE_COUNT.decrementAndGet(this);
228+
ROOT_SPAN.compareAndSet(this, span, null);
228229
if (pendingTraceBuffer.longRunningSpansEnabled()){
229230
spans.remove(span);
230231
}

0 commit comments

Comments
 (0)