Skip to content

IAST Monitoring : New algorithm for sampling with sample rate proportion to request rate #394

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

Open
wants to merge 2 commits into
base: feature/event-sampling
Choose a base branch
from
Open

IAST Monitoring : New algorithm for sampling with sample rate proportion to request rate #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4948014
Implement Request Rate-Based Processing Algorithm
lovesh-ap Jan 22, 2025
c82c339
Merge branch 'refs/heads/feature/event-sampling' into feature/poc-mon…
lovesh-ap Jan 22, 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
13 changes: 6 additions & 7 deletions ...rc/main/java/com/newrelic/agent/security/intcodeagent/iast/monitoring/IastMonitoring.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ public static void resetEventSampler() {
}

IastMonitoring.getInstance().incrementSamplerCycle();
IastMonitoring.getInstance().setRemainingHarvestRequests(0);
IastMonitoring.getInstance().getHarvestedTraceId().clear();
logger.log( LogLevel.FINEST, String.format("IAST Monitoring: Sampling of Data started for sampling cycle %s", IastMonitoring.getInstance().getSamplerCycle()), IastMonitoring.class.getName());
}
Expand All @@ -133,11 +132,11 @@ public static void collectSampleIfHarvested() {
AgentConfig.getInstance().getAgentMode().getIastScan().getMonitoringMode().getHarvesting().set(false);
NewRelicSecurity.getAgent().getSecurityMetaData().removeCustomAttribute("HARVEST");
IastMonitoring.getInstance().incrementRequestHarvested();
int remaining = IastMonitoring.getInstance().decrementRemainingHarvestRequests();
if(remaining <= 0){
IastMonitoring.getInstance().setHarvestActive(false);
logger.log(LogLevel.FINEST, "IAST Monitoring: Harvesting Completed", IastMonitoring.class.getName());
}
// int remaining = IastMonitoring.getInstance().decrementRemainingHarvestRequests();
// if(remaining <= 0){
// IastMonitoring.getInstance().setHarvestActive(false);
// logger.log(LogLevel.FINEST, "IAST Monitoring: Harvesting Completed", IastMonitoring.class.getName());
// }
logger.log( LogLevel.FINEST, String.format("IAST Monitoring: %s:%s Sample collected", IastMonitoring.getInstance().getHarvestCycleCount(), IastMonitoring.getInstance().getRequestHarvested()), IastMonitoring.class.getName());
}
}
Expand All @@ -153,7 +152,7 @@ public static boolean eventQuotaReached(String traceId) {

public static boolean shouldProcessInterception() {
if(AgentConfig.getInstance().getAgentMode().getIastScan().getMonitoring()) {
return IastMonitoring.getInstance().getHarvestActive() && NewRelicSecurity.getAgent().getSecurityMetaData().customAttributeContainsKey("HARVEST") && NewRelicSecurity.getAgent().getSecurityMetaData().getCustomAttribute("HARVEST", Boolean.class);
return NewRelicSecurity.getAgent().getSecurityMetaData().customAttributeContainsKey("HARVEST") && NewRelicSecurity.getAgent().getSecurityMetaData().getCustomAttribute("HARVEST", Boolean.class);
} else {
return true;
}
Expand Down
2 changes: 2 additions & 0 deletions ...nt/src/main/java/com/newrelic/agent/security/intcodeagent/schedulers/SchedulerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.newrelic.agent.security.AgentConfig;
import com.newrelic.agent.security.intcodeagent.filelogging.LogFileHelper;
import com.newrelic.agent.security.intcodeagent.iast.monitoring.IastMonitoring;
import com.newrelic.agent.security.intcodeagent.logging.IAgentConstants;
import com.newrelic.agent.security.util.IUtilConstants;
import com.newrelic.api.agent.NewRelic;
Expand Down Expand Up @@ -113,6 +114,7 @@ public void scheduleSampling(Runnable runnable, long initialDelay, long delay, T
}

public void shutdownSampling() {
IastMonitoring.getInstance().setHarvestActive(false);
if(scheduledFutureMap.containsKey("sampling")){
ScheduledFuture<?> future = scheduledFutureMap.get("sampling");
future.cancel(false);
Expand Down
2 changes: 0 additions & 2 deletions ...rity-agent/src/main/java/com/newrelic/agent/security/intcodeagent/websocket/WSClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.newrelic.agent.security.AgentInfo;
import com.newrelic.agent.security.instrumentator.dispatcher.DispatcherPool;
import com.newrelic.agent.security.instrumentator.httpclient.RestRequestThreadPool;
import com.newrelic.agent.security.instrumentator.utils.AgentUtils;
import com.newrelic.agent.security.instrumentator.utils.INRSettingsKey;
import com.newrelic.agent.security.intcodeagent.controlcommand.ControlCommandProcessor;
import com.newrelic.agent.security.intcodeagent.controlcommand.ControlCommandProcessorThreadPool;
Expand All @@ -16,7 +15,6 @@
import com.newrelic.api.agent.security.utils.SecurityConnection;
import com.newrelic.api.agent.security.utils.logging.LogLevel;
import com.newrelic.agent.security.intcodeagent.logging.IAgentConstants;
import com.newrelic.agent.security.intcodeagent.utils.CommonUtils;
import com.newrelic.agent.security.util.IUtilConstants;
import com.newrelic.api.agent.NewRelic;
import com.newrelic.api.agent.security.instrumentation.helpers.GrpcClientRequestReplayHelper;
Expand Down
2 changes: 1 addition & 1 deletion newrelic-security-agent/src/main/java/com/newrelic/api/agent/security/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ private void startSecurityServices() {
SchedulerHelper.getInstance().scheduleApplicationRuntimeErrorPosting(RuntimeErrorReporter.getInstance()::reportApplicationRuntimeError,
30 , 30, TimeUnit.SECONDS);
SchedulerHelper.getInstance().scheduleDailyLogRollover(LogFileHelper::performDailyRollover);
SchedulerHelper.getInstance().scheduleSampling(IastMonitoring::sampleData, 0, 5, TimeUnit.SECONDS);
// SchedulerHelper.getInstance().scheduleSampling(IastMonitoring::sampleData, 0, 5, TimeUnit.SECONDS);
SchedulerHelper.getInstance().scheduleResetEventSampler(IastMonitoring::resetEventSampler, 0,
AgentConfig.getInstance().getAgentMode().getIastScan().getMonitoringMode().getEventQuotaTimeDuration(), TimeUnit.MINUTES);
logger.logInit(
Expand Down
Loading