Skip to content

Commit 6ba5062

Browse files
committed
Remove legacy field injection code
1 parent df71563 commit 6ba5062

21 files changed

+7
-1777
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/FieldBackedContextStoreAppliedMarker.java

-9
This file was deleted.

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static net.bytebuddy.matcher.ElementMatchers.none;
99

1010
import datadog.trace.agent.tooling.context.FieldBackedContextProvider;
11-
import datadog.trace.agent.tooling.context.FieldBackedProvider;
1211
import datadog.trace.api.Config;
1312
import datadog.trace.bootstrap.FieldBackedContextAccessor;
1413
import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
@@ -77,11 +76,7 @@ public static ResettableClassFileTransformer installBytebuddyAgent(
7776
final AgentBuilder.Listener... listeners) {
7877
INSTRUMENTATION = inst;
7978

80-
if (Config.get().isLegacyContextFieldInjection()) {
81-
FieldBackedProvider.resetContextMatchers();
82-
} else {
83-
FieldBackedContextProvider.resetContextMatchers();
84-
}
79+
FieldBackedContextProvider.resetContextMatchers();
8580

8681
AgentBuilder.Ignored ignoredAgentBuilder =
8782
new AgentBuilder.Default()

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import datadog.trace.agent.tooling.bytebuddy.DDTransformers;
1212
import datadog.trace.agent.tooling.bytebuddy.ExceptionHandlers;
1313
import datadog.trace.agent.tooling.context.FieldBackedContextProvider;
14-
import datadog.trace.agent.tooling.context.FieldBackedProvider;
1514
import datadog.trace.agent.tooling.context.InstrumentationContextProvider;
1615
import datadog.trace.agent.tooling.context.NoopContextProvider;
1716
import datadog.trace.agent.tooling.muzzle.Reference;
@@ -128,11 +127,7 @@ private void lazyInit() {
128127
}
129128
}
130129
if (!contextStores.isEmpty()) {
131-
if (Config.get().isLegacyContextFieldInjection()) {
132-
contextProvider = new FieldBackedProvider(this, contextStores);
133-
} else {
134-
contextProvider = new FieldBackedContextProvider(this, contextStores);
135-
}
130+
contextProvider = new FieldBackedContextProvider(this, contextStores);
136131
} else {
137132
contextProvider = NoopContextProvider.INSTANCE;
138133
}

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/ContextStoreImplementationTemplate.java

-112
This file was deleted.

0 commit comments

Comments
 (0)