Skip to content

Commit 8032aba

Browse files
satweensatween
committed
RUM-9899: getting rid from deprecated & unused code
1 parent 3aad947 commit 8032aba

File tree

7 files changed

+8
-261
lines changed

7 files changed

+8
-261
lines changed

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

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,10 +1139,6 @@ public abstract interface class com/datadog/trace/api/EndpointTracker {
11391139
public abstract fun endpointWritten (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)V
11401140
}
11411141

1142-
public class com/datadog/trace/api/EventTracker {
1143-
public static final field NO_EVENT_TRACKER Lcom/datadog/trace/api/EventTracker;
1144-
}
1145-
11461142
public final class com/datadog/trace/api/Functions {
11471143
public static final field UTF8_ENCODE Lcom/datadog/android/trace/internal/compat/function/Function;
11481144
}
@@ -1154,14 +1150,6 @@ public final class com/datadog/trace/api/Functions$LowerCase : com/datadog/andro
11541150
public fun apply (Ljava/lang/String;)Ljava/lang/String;
11551151
}
11561152

1157-
public class com/datadog/trace/api/GlobalTracer {
1158-
public fun <init> ()V
1159-
public static fun forceRegister (Lcom/datadog/trace/api/Tracer;)V
1160-
public static fun get ()Lcom/datadog/trace/api/Tracer;
1161-
public static fun getEventTracker ()Lcom/datadog/trace/api/EventTracker;
1162-
public static fun registerIfAbsent (Lcom/datadog/trace/api/Tracer;)V
1163-
}
1164-
11651153
public abstract class com/datadog/trace/api/IdGenerationStrategy {
11661154
protected final field traceId128BitGenerationEnabled Z
11671155
public static fun fromName (Ljava/lang/String;)Lcom/datadog/trace/api/IdGenerationStrategy;
@@ -1831,10 +1819,6 @@ public abstract interface class com/datadog/trace/api/interceptor/MutableSpan {
18311819
public abstract fun setTag (Ljava/lang/String;Z)Lcom/datadog/trace/api/interceptor/MutableSpan;
18321820
}
18331821

1834-
public abstract interface class com/datadog/trace/api/internal/InternalTracer {
1835-
public abstract fun flush ()V
1836-
}
1837-
18381822
public abstract interface class com/datadog/trace/api/internal/TraceSegment {
18391823
public abstract fun effectivelyBlocked ()V
18401824
public abstract fun setDataCurrent (Ljava/lang/String;Ljava/lang/Object;)V
@@ -2684,27 +2668,18 @@ public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/
26842668
public abstract fun withTag (Ljava/lang/String;Z)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentTracer$SpanBuilder;
26852669
}
26862670

2687-
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/api/internal/InternalTracer, com/datadog/trace/bootstrap/instrumentation/api/ScopeStateAware {
2688-
public abstract fun activateNext (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
2671+
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 {
26892672
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;
26902673
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;
2691-
public abstract fun activeScope ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
26922674
public abstract fun activeSpan ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
26932675
public abstract fun addScopeListener (Lcom/datadog/trace/api/scopemanager/ScopeListener;)V
26942676
public fun buildSpan (Ljava/lang/CharSequence;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentTracer$SpanBuilder;
26952677
public abstract fun buildSpan (Ljava/lang/String;Ljava/lang/CharSequence;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentTracer$SpanBuilder;
2696-
public abstract fun captureSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope$Continuation;
26972678
public abstract fun captureTraceConfig ()Lcom/datadog/trace/api/TraceConfig;
26982679
public abstract fun close ()V
2699-
public abstract fun closePrevious (Z)V
2700-
public abstract fun getProfilingContext ()Lcom/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration;
27012680
public abstract fun getSpanId (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Ljava/lang/String;
2702-
public abstract fun getTimer ()Lcom/datadog/trace/api/profiling/Timer;
27032681
public abstract fun getTraceId (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Ljava/lang/String;
2704-
public abstract fun noopSpan ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
27052682
public abstract fun propagate ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentPropagation;
2706-
public abstract fun registerCheckpointer (Lcom/datadog/trace/api/EndpointCheckpointer;)V
2707-
public abstract fun registerTimer (Lcom/datadog/trace/api/profiling/Timer;)V
27082683
public abstract fun startSpan (Ljava/lang/String;Ljava/lang/CharSequence;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
27092684
public abstract fun startSpan (Ljava/lang/String;Ljava/lang/CharSequence;J)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
27102685
public abstract fun startSpan (Ljava/lang/String;Ljava/lang/CharSequence;Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan$Context;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
@@ -3446,37 +3421,28 @@ public abstract interface class com/datadog/trace/core/CoreSpan {
34463421
}
34473422

34483423
public class com/datadog/trace/core/CoreTracer : com/datadog/trace/bootstrap/instrumentation/api/AgentTracer$TracerAPI {
3449-
public fun activateNext (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
34503424
public fun activateSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
34513425
public fun activateSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
34523426
public fun activateSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;Z)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
3453-
public fun activeScope ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
34543427
public fun activeSpan ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
34553428
public fun addScopeListener (Lcom/datadog/trace/api/scopemanager/ScopeListener;)V
34563429
public synthetic fun buildSpan (Ljava/lang/String;Ljava/lang/CharSequence;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentTracer$SpanBuilder;
34573430
public fun buildSpan (Ljava/lang/String;Ljava/lang/CharSequence;)Lcom/datadog/trace/core/CoreTracer$CoreSpanBuilder;
3458-
public fun captureSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope$Continuation;
34593431
public synthetic fun captureTraceConfig ()Lcom/datadog/trace/api/TraceConfig;
34603432
public fun captureTraceConfig ()Lcom/datadog/trace/core/CoreTracer$ConfigSnapshot;
34613433
public fun close ()V
3462-
public fun closePrevious (Z)V
34633434
protected fun finalize ()V
34643435
public fun flush ()V
34653436
public fun getPartialFlushMinSpans ()I
3466-
public fun getProfilingContext ()Lcom/datadog/trace/bootstrap/instrumentation/api/ProfilingContextIntegration;
34673437
public fun getSpanId ()Ljava/lang/String;
34683438
public fun getSpanId (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Ljava/lang/String;
34693439
public fun getTagInterceptor ()Lcom/datadog/trace/core/taginterceptor/TagInterceptor;
3470-
public fun getTimer ()Lcom/datadog/trace/api/profiling/Timer;
34713440
public fun getTraceId ()Ljava/lang/String;
34723441
public fun getTraceId (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Ljava/lang/String;
34733442
public fun newScopeState ()Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeState;
3474-
public fun noopSpan ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
34753443
public fun onRootSpanFinished (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/api/EndpointTracker;)V
34763444
public fun onRootSpanStarted (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/api/EndpointTracker;
34773445
public fun propagate ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentPropagation;
3478-
public fun registerCheckpointer (Lcom/datadog/trace/api/EndpointCheckpointer;)V
3479-
public fun registerTimer (Lcom/datadog/trace/api/profiling/Timer;)V
34803446
public fun startSpan (Ljava/lang/String;Ljava/lang/CharSequence;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
34813447
public fun startSpan (Ljava/lang/String;Ljava/lang/CharSequence;J)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
34823448
public fun startSpan (Ljava/lang/String;Ljava/lang/CharSequence;Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan$Context;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;

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

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

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

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

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

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

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

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99
import com.datadog.trace.api.DDTraceId;
1010
import com.datadog.trace.api.EndpointCheckpointer;
1111
import com.datadog.trace.api.TraceConfig;
12-
import com.datadog.trace.api.TracePropagationStyle;
1312
import com.datadog.trace.api.gateway.Flow;
1413
import com.datadog.trace.api.gateway.RequestContext;
1514
import com.datadog.trace.api.gateway.RequestContextSlot;
16-
import com.datadog.trace.api.internal.InternalTracer;
17-
import com.datadog.trace.api.profiling.Timer;
1815
import com.datadog.trace.api.sampling.PrioritySampling;
1916
import com.datadog.trace.api.sampling.SamplingRule;
2017
import com.datadog.trace.api.scopemanager.ScopeListener;
@@ -34,7 +31,9 @@ public class AgentTracer {
3431
private AgentTracer() {}
3532

3633
public interface TracerAPI
37-
extends com.datadog.trace.api.Tracer, InternalTracer, EndpointCheckpointer, ScopeStateAware {
34+
extends com.datadog.trace.api.Tracer,
35+
EndpointCheckpointer,
36+
ScopeStateAware {
3837

3938
/**
4039
* Create and start a new span.
@@ -84,22 +83,11 @@ AgentSpan startSpan(
8483
AgentScope activateSpan(AgentSpan span, ScopeSource source);
8584

8685
AgentScope activateSpan(AgentSpan span, ScopeSource source, boolean isAsyncPropagating);
87-
88-
AgentScope.Continuation captureSpan(AgentSpan span);
89-
90-
void closePrevious(boolean finishSpan);
91-
92-
AgentScope activateNext(AgentSpan span);
93-
9486
@Nullable
9587
AgentSpan activeSpan();
9688

97-
AgentScope activeScope();
98-
9989
AgentPropagation propagate();
10090

101-
AgentSpan noopSpan();
102-
10391
/** Deprecated. Use {@link #buildSpan(String, CharSequence)} instead. */
10492
@Deprecated
10593
default SpanBuilder buildSpan(CharSequence spanName) {
@@ -117,24 +105,12 @@ default SpanBuilder buildSpan(CharSequence spanName) {
117105
*/
118106
void addScopeListener(ScopeListener listener);
119107

120-
/**
121-
* Registers the checkpointer
122-
*
123-
* @param checkpointer
124-
*/
125-
void registerCheckpointer(EndpointCheckpointer checkpointer);
126-
127-
void registerTimer(Timer timer);
128-
129-
Timer getTimer();
130108

131109
String getTraceId(AgentSpan span);
132110

133111
String getSpanId(AgentSpan span);
134112

135113
TraceConfig captureTraceConfig();
136-
137-
ProfilingContextIntegration getProfilingContext();
138114
}
139115

140116
public interface SpanBuilder {
@@ -510,25 +486,6 @@ public boolean isAsyncPropagating() {
510486
}
511487
}
512488

513-
static class NoopAgentPropagation implements AgentPropagation {
514-
static final NoopAgentPropagation INSTANCE = new NoopAgentPropagation();
515-
516-
@Override
517-
public <C> void inject(final AgentSpan span, final C carrier, final Setter<C> setter) {}
518-
519-
@Override
520-
public <C> void inject(final Context context, final C carrier, final Setter<C> setter) {}
521-
522-
@Override
523-
public <C> void inject(
524-
AgentSpan span, C carrier, Setter<C> setter, TracePropagationStyle style) {}
525-
526-
@Override
527-
public <C> Context.Extracted extract(final C carrier, final ContextVisitor<C> getter) {
528-
return NoopContext.INSTANCE;
529-
}
530-
}
531-
532489
static class NoopContinuation implements AgentScope.Continuation {
533490
static final NoopContinuation INSTANCE = new NoopContinuation();
534491

0 commit comments

Comments
 (0)