Skip to content

Commit 95f2490

Browse files
authored
IAST doesn't directly make any remote calls, so never delay starting it (#8294)
1 parent 396fc20 commit 95f2490

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@ public InstallDatadogTracerCallback(
531531

532532
installDatadogTracer(initTelemetry, scoClass, sco);
533533
maybeInstallLogsIntake(scoClass, sco);
534+
maybeStartIast(instrumentation);
534535
}
535536

536537
@Override
@@ -545,7 +546,6 @@ public void execute() {
545546
}
546547

547548
maybeStartAppSec(scoClass, sco);
548-
maybeStartIast(instrumentation, scoClass, sco);
549549
maybeStartCiVisibility(instrumentation, scoClass, sco);
550550
// start debugger before remote config to subscribe to it before starting to poll
551551
maybeStartDebugger(instrumentation, scoClass, sco);
@@ -847,14 +847,14 @@ private static boolean isSupportedAppSecArch() {
847847
return true;
848848
}
849849

850-
private static void maybeStartIast(Instrumentation instrumentation, Class<?> scoClass, Object o) {
850+
private static void maybeStartIast(Instrumentation instrumentation) {
851851
if (iastEnabled || !iastFullyDisabled) {
852852

853853
StaticEventLogger.begin("IAST");
854854

855855
try {
856856
SubscriptionService ss = AgentTracer.get().getSubscriptionService(RequestContextSlot.IAST);
857-
startIast(instrumentation, ss, scoClass, o);
857+
startIast(instrumentation, ss);
858858
} catch (Exception e) {
859859
log.error("Error starting IAST subsystem", e);
860860
}
@@ -863,8 +863,7 @@ private static void maybeStartIast(Instrumentation instrumentation, Class<?> sco
863863
}
864864
}
865865

866-
private static void startIast(
867-
Instrumentation instrumentation, SubscriptionService ss, Class<?> scoClass, Object sco) {
866+
private static void startIast(Instrumentation instrumentation, SubscriptionService ss) {
868867
try {
869868
final Class<?> appSecSysClass = AGENT_CLASSLOADER.loadClass("com.datadog.iast.IastSystem");
870869
final Method iastInstallerMethod =

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastSystemTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class IastSystemTest extends DDSpecification {
136136
InstrumentationBridge.clearIastModules()
137137

138138
when:
139-
Agent.maybeStartIast(null, null, null)
139+
Agent.maybeStartIast(null)
140140

141141
then:
142142
InstrumentationBridge.iastModules.each {

0 commit comments

Comments
 (0)