Skip to content

Commit cdb915c

Browse files
committed
RUM-9899: getting rid from deprecated & unused code (Tracer.java)
1 parent e7adaf2 commit cdb915c

File tree

4 files changed

+2
-28
lines changed

4 files changed

+2
-28
lines changed

features/dd-sdk-android-trace-internal/api/dd-sdk-android-trace-internal.api

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,11 +1251,6 @@ public final class com/datadog/trace/api/TracePropagationStyle : java/lang/Enum
12511251
public static fun values ()[Lcom/datadog/trace/api/TracePropagationStyle;
12521252
}
12531253

1254-
public abstract interface class com/datadog/trace/api/Tracer {
1255-
public abstract fun getSpanId ()Ljava/lang/String;
1256-
public abstract fun getTraceId ()Ljava/lang/String;
1257-
}
1258-
12591254
public class com/datadog/trace/api/WellKnownTags {
12601255
public fun <init> (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
12611256
public fun getEnv ()Lcom/datadog/trace/bootstrap/instrumentation/api/UTF8BytesString;
@@ -2595,7 +2590,7 @@ public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/
25952590
public abstract fun withTag (Ljava/lang/String;Z)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentTracer$SpanBuilder;
25962591
}
25972592

2598-
public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/AgentTracer$TracerAPI : com/datadog/trace/api/EndpointCheckpointer, com/datadog/trace/api/Tracer, com/datadog/trace/bootstrap/instrumentation/api/ScopeStateAware {
2593+
public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/AgentTracer$TracerAPI : com/datadog/trace/api/EndpointCheckpointer, com/datadog/trace/bootstrap/instrumentation/api/ScopeStateAware {
25992594
public abstract fun activateSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
26002595
public abstract fun activateSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;Z)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
26012596
public abstract fun activeSpan ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/api/Tracer.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ public class AgentTracer {
3030
// Not intended to be constructed.
3131
private AgentTracer() {}
3232

33-
public interface TracerAPI
34-
extends com.datadog.trace.api.Tracer,
35-
EndpointCheckpointer,
36-
ScopeStateAware {
33+
public interface TracerAPI extends EndpointCheckpointer, ScopeStateAware {
3734

3835
/**
3936
* Create and start a new span.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import static com.datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
66
import static com.datadog.trace.util.CollectionUtils.tryMakeImmutableMap;
77
import static java.util.concurrent.TimeUnit.MILLISECONDS;
8-
import static java.util.concurrent.TimeUnit.MINUTES;
98
import static java.util.concurrent.TimeUnit.NANOSECONDS;
109
import static java.util.concurrent.TimeUnit.SECONDS;
1110

@@ -18,7 +17,6 @@
1817
import com.datadog.trace.api.DDSpanId;
1918
import com.datadog.trace.api.DDTraceId;
2019
import com.datadog.trace.api.DynamicConfig;
21-
import com.datadog.trace.api.EndpointCheckpointer;
2220
import com.datadog.trace.api.EndpointCheckpointerHolder;
2321
import com.datadog.trace.api.EndpointTracker;
2422
import com.datadog.trace.api.IdGenerationStrategy;
@@ -63,7 +61,6 @@
6361
import com.datadog.trace.logger.LoggerFactory;
6462
import com.datadog.trace.monitor.NoOpRecording;
6563
import com.datadog.trace.monitor.Recording;
66-
import com.datadog.trace.relocate.api.RatelimitedLogger;
6764

6865
import java.io.IOException;
6966
import java.lang.ref.WeakReference;
@@ -683,12 +680,10 @@ private List<DDSpan> interceptCompleteTrace(List<DDSpan> trace) {
683680
return trace;
684681
}
685682

686-
@Override
687683
public String getTraceId() {
688684
return getTraceId(activeSpan());
689685
}
690686

691-
@Override
692687
public String getSpanId() {
693688
return getSpanId(activeSpan());
694689
}

0 commit comments

Comments
 (0)