Skip to content

IAST doesn't actively make remote calls, so never delay starting it #8294

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
merged 1 commit into from
Jan 28, 2025
Merged

IAST doesn't actively make remote calls, so never delay starting it #8294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ public InstallDatadogTracerCallback(

installDatadogTracer(initTelemetry, scoClass, sco);
maybeInstallLogsIntake(scoClass, sco);
maybeStartIast(instrumentation);
}

@Override
Expand All @@ -545,7 +546,6 @@ public void execute() {
}

maybeStartAppSec(scoClass, sco);
maybeStartIast(instrumentation, scoClass, sco);
maybeStartCiVisibility(instrumentation, scoClass, sco);
// start debugger before remote config to subscribe to it before starting to poll
maybeStartDebugger(instrumentation, scoClass, sco);
Expand Down Expand Up @@ -847,14 +847,14 @@ private static boolean isSupportedAppSecArch() {
return true;
}

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

StaticEventLogger.begin("IAST");

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

private static void startIast(
Instrumentation instrumentation, SubscriptionService ss, Class<?> scoClass, Object sco) {
private static void startIast(Instrumentation instrumentation, SubscriptionService ss) {
try {
final Class<?> appSecSysClass = AGENT_CLASSLOADER.loadClass("com.datadog.iast.IastSystem");
final Method iastInstallerMethod =
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastSystemTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class IastSystemTest extends DDSpecification {
InstrumentationBridge.clearIastModules()

when:
Agent.maybeStartIast(null, null, null)
Agent.maybeStartIast(null)

then:
InstrumentationBridge.iastModules.each {
Expand Down
Loading