8000 chore(core): Remove custom scope manager support · DataDog/dd-trace-java@a2125e2 · GitHub
[go: up one dir, main page]
Skip to content

Commit a2125e2

Browse files
PerfectSlayerPerfectSlayer
committed
chore(core): Remove custom scope manager support
1 parent d6d6049 commit a2125e2

File tree

3 files changed

+5
-41
lines changed

3 files changed

+5
-41
lines changed

‎dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import datadog.trace.bootstrap.instrumentation.api.AgentHistogram;
5252
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
5353
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
54-
import datadog.trace.bootstrap.instrumentation.api.AgentScopeManager;
5554
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
5655
import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
5756
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
@@ -165,7 +164,7 @@ public static CoreTracerBuilder builder() {
165164
/** Sampler defines the sampling policy in order to reduce the number of traces for instance */
166165
final Sampler initialSampler;
167166
/** Scope manager is in charge of managing the scopes from which spans are created */
168-
final AgentScopeManager scopeManager;
167+
final ContinuableScopeManager scopeManager;
169168

170169
final MetricsAggregator metricsAggregator;
171170

@@ -295,7 +294,7 @@ public static class CoreTracerBuilder {
295294
private SingleSpanSampler singleSpanSampler;
296295
private HttpCodec.Injector injector;
297296
private HttpCodec.Extractor extractor;
298-
private AgentScopeManager scopeManager;
297+
private ContinuableScopeManager scopeManager;
299298
private Map<String, ?> localRootSpanTags;
300299
private Map<String, ?> defaultSpanTags;
301300
private Map<String, String> serviceNameMappings;
@@ -356,11 +355,6 @@ public CoreTracerBuilder extractor(HttpCodec.Extractor extractor) {
356355
return this;
357356
}
358357

359-
public CoreTracerBuilder scopeManager(AgentScopeManager scopeManager) {
360-
this.scopeManager = scopeManager;
361-
return this;
362-
}
363-
364358
public CoreTracerBuilder localRootSpanTags(Map<String, ?> localRootSpanTags) {
365359
this.localRootSpanTags = tryMakeImmutableMap(localRootSpanTags);
366360
return this;
@@ -1103,9 +1097,7 @@ public DataStreamsCheckpointer getDataStreamsCheckpointer() {
11031097

11041098
@Override
11051099
public void addScopeListener(final ScopeListener listener) {
1106-
if (scopeManager instanceof ContinuableScopeManager) {
1107-
((ContinuableScopeManager) scopeManager).addScopeListener(listener);
1108-
}
1100+
this.scopeManager.addScopeListener(listener);
11091101
}
11101102

11111103
@Override

‎dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
import datadog.trace.api.scopemanager.ExtendedScopeListener;
1212
import datadog.trace.api.scopemanager.ScopeListener;
1313
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
14-
import datadog.trace.bootstrap.instrumentation.api.AgentScopeManager;
1514
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1615
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
1716
import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
1817
import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
1918
import datadog.trace.bootstrap.instrumentation.api.ScopeSource;
2019
import datadog.trace.bootstrap.instrumentation.api.ScopeState;
20+
import datadog.trace.bootstrap.instrumentation.api.ScopeStateAware;
2121
import datadog.trace.core.monitor.HealthMetrics;
2222
import datadog.trace.relocate.api.RatelimitedLogger;
2323
import datadog.trace.util.AgentTaskScheduler;
@@ -37,7 +37,7 @@
3737
* from being reported even if all related spans are finished. It also delegates to other
3838
* ScopeInterceptors to provide additional functionality.
3939
*/
40-
public final class ContinuableScopeManager implements AgentScopeManager {
40+
public final class ContinuableScopeManager implements ScopeStateAware {
4141
static final Logger log = LoggerFactory.getLogger(ContinuableScopeManager.class);
4242
static final RatelimitedLogger ratelimitedLog = new RatelimitedLogger(log, 1, MINUTES);
4343
static final long iterationKeepAlive =
@@ -81,18 +81,15 @@ public ContinuableScopeManager(
8181
this.profilingContextIntegration = profilingContextIntegration;
8282
}
8383

84-
@Override
8584
public AgentScope activate(final AgentSpan span, final ScopeSource source) {
8685
return activate(span, source.id(), false, /* ignored */ false);
8786
}
8887

89-
@Override
9088
public AgentScope activate(
9189
final AgentSpan span, final ScopeSource source, boolean isAsyncPropagating) {
9290
return activate(span, source.id(), true, isAsyncPropagating);
9391
}
9492

95-
@Override
9693
public AgentScope.Continuation captureSpan(final AgentSpan span) {
9794
AbstractContinuation continuation =
9895
new SingleContinuation(this, span, ScopeSource.INSTRUMENTATION.id());
@@ -170,7 +167,6 @@ ContinuableScope continueSpan(
170167
return scope;
171168
}
172169

173-
@Override
174170
public void closePrevious(final boolean finishSpan) {
175171
ScopeStack scopeStack = scopeStack();
176172

@@ -189,7 +185,6 @@ public void closePrevious(final boolean finishSpan) {
189185
}
190186
}
191187

192-
@Override
193188
public AgentScope activateNext(final AgentSpan span) {
194189
ScopeStack scopeStack = scopeStack();
195190

@@ -220,12 +215,10 @@ public AgentScope activateNext(final AgentSpan span) {
220215
return scope;
221216
}
222217

223-
@Override
224218
public AgentScope active() {
225219
return scopeStack().active();
226220
}
227221

228-
@Override
229222
public AgentSpan activeSpan() {
230223
final ContinuableScope active = scopeStack().active();
231224
return active == null ? null : active.span;

‎internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScopeManager.java

Lines changed: 3AD0 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0