Skip to content

Remove custom scope manager support #8164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PerfectSlayer merged 2 commits into from
Jan 8, 2025
Merged

Remove custom scope manager support #8164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6d6049
chore(ot): Remove custom scope manager support
PerfectSlayer Jan 8, 2025
a2125e2
chore(core): Remove custom scope manager support
PerfectSlayer Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,6 @@ public CoreTracer build() {
singleSpanSampler,
injector,
extractor,
scopeManager,
localRootSpanTags,
defaultSpanTags,
serviceNameMappings,
Expand Down Expand Up @@ -529,7 +528,6 @@ private CoreTracer(
final SingleSpanSampler singleSpanSampler,
final HttpCodec.Injector injector,
final HttpCodec.Extractor extractor,
final AgentScopeManager scopeManager,
final Map<String, ?> localRootSpanTags,
final Map<String, ?> defaultSpanTags,
final Map<String, String> serviceNameMappings,
Expand Down Expand Up @@ -632,16 +630,13 @@ private CoreTracer(
: Monitoring.DISABLED;

traceWriteTimer = performanceMonitoring.newThreadLocalTimer("trace.write");
if (scopeManager == null) {
this.scopeManager =
new ContinuableScopeManager(
config.getScopeDepthLimit(),
config.isScopeStrictMode(),
profilingContextIntegration,
healthMetrics);
} else {
this.scopeManager = scopeManager;
}

scopeManager =
new ContinuableScopeManager(
config.getScopeDepthLimit(),
config.isScopeStrictMode(),
profilingContextIntegration,
healthMetrics);

externalAgentLauncher = new ExternalAgentLauncher(config);

Expand Down
268 changes: 0 additions & 268 deletions dd-trace-ot/src/main/java/datadog/opentracing/CustomScopeManagerWrapper.java
View file
Open in desktop

This file was deleted.

16 changes: 2 additions & 14 deletions dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ public static class DDTracerBuilder {
private Sampler sampler;
private HttpCodec.Injector injector;
private HttpCodec.Extractor extractor;
private ScopeManager scopeManager;
private Map<String, String> localRootSpanTags;
private Map<String, String> defaultSpanTags;
private Map<String, String> serviceNameMappings;
Expand Down Expand Up @@ -125,9 +124,7 @@ public DDTracerBuilder extractor(HttpCodec.Extractor extractor) {

@Deprecated
public DDTracerBuilder scopeManager(ScopeManager scopeManager) {
log.warn(
"Custom ScopeManagers are deprecated and will be removed in a future release of dd-trace-ot");
this.scopeManager = scopeManager;
log.warn("Custom ScopeManagers are not supported");
return this;
}

Expand Down Expand Up @@ -178,7 +175,6 @@ public DDTracer build() {
sampler,
injector,
extractor,
scopeManager,
localRootSpanTags,
defaultSpanTags,
serviceNameMappings,
Expand Down Expand Up @@ -323,7 +319,6 @@ private DDTracer(
final Sampler sampler,
final HttpCodec.Injector injector,
final HttpCodec.Extractor extractor,
final ScopeManager scopeManager,
final Map<String, String> localRootSpanTags,
final Map<String, String> defaultSpanTags,
final Map<String, String> serviceNameMappings,
Expand Down Expand Up @@ -376,11 +371,6 @@ private DDTracer(
builder = builder.extractor(extractor);
}

if (scopeManager != null) {
this.scopeManager = scopeManager;
builder = builder.scopeManager(new CustomScopeManagerWrapper(scopeManager, converter));
}

if (localRootSpanTags != null) {
builder = builder.localRootSpanTags(localRootSpanTags);
}
Expand Down Expand Up @@ -410,9 +400,7 @@ private DDTracer(
// FIXME [API] There's an unfortunate cycle between OTScopeManager and CoreTracer where they
// depend on each other so CoreTracer
// Perhaps api can change so that CoreTracer doesn't need to implement scope methods directly
if (scopeManager == null) {
this.scopeManager = new OTScopeManager(tracer, converter);
}
this.scopeManager = new OTScopeManager(tracer, converter);

if ((config != null && config.isLogsInjectionEnabled())
|| (config == null && Config.get().isLogsInjectionEnabled())) {
Expand Down
Loading
Loading