Skip to content

Commit 5e03fd1

Browse files
committed
fix for mismatch values of event sender submitted and completed.
invoke reset of droppedEvents
1 parent c9454f1 commit 5e03fd1

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

newrelic-security-agent/src/main/java/com/newrelic/agent/security/intcodeagent/models/javaagent/EventStats.java

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public void reset(){
3636
this.iastEvents.reset();
3737
this.dispatcher.reset();
3838
this.exitEvents.reset();
39+
this.droppedDueTo.reset();
3940
}
4041

4142
public String toString() {

newrelic-security-agent/src/main/java/com/newrelic/agent/security/intcodeagent/websocket/EventSendPool.java

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.newrelic.agent.security.intcodeagent.websocket;
22

33
import com.newrelic.agent.security.AgentInfo;
4+
import com.newrelic.agent.security.instrumentator.dispatcher.Dispatcher;
45
import com.newrelic.agent.security.instrumentator.httpclient.RestRequestThreadPool;
56
import com.newrelic.agent.security.intcodeagent.executor.CustomFutureTask;
67
import com.newrelic.agent.security.intcodeagent.executor.CustomThreadPoolExecutor;
@@ -44,11 +45,21 @@ private EventSendPool() {
4445
@Override
4546
protected void afterExecute(Runnable r, Throwable t) {
4647
try {
47-
if (t != null) {
48-
AgentInfo.getInstance().getJaHealthCheck().getEventStats().getEventSender().incrementError();
49-
} else {
50-
AgentInfo.getInstance().getJaHealthCheck().getEventStats().getEventSender().incrementCompleted();
48+
if (r instanceof CustomFutureTask<?> && ((CustomFutureTask<?>) r).getTask() instanceof EventSender) {
49+
EventSender task = (EventSender) ((CustomFutureTask<?>) r).get();
50+
if(task.getEvent() instanceof JavaAgentEventBean){
51+
if (t != null) {
52+
AgentInfo.getInstance().getJaHealthCheck().getEventStats().getEventSender().incrementError();
53+
} else {
54+
AgentInfo.getInstance().getJaHealthCheck().getEventStats().getEventSender().incrementCompleted();
55+
}
56+
}
5157
}
58+
// if (t != null) {
59+
// AgentInfo.getInstance().getJaHealthCheck().getEventStats().getEventSender().incrementError();
60+
// } else {
61+
// AgentInfo.getInstance().getJaHealthCheck().getEventStats().getEventSender().incrementCompleted();
62+
// }
5263
} catch (Throwable ignored){}
5364
super.afterExecute(r, t);
5465
}

newrelic-security-agent/src/main/java/com/newrelic/api/agent/security/Agent.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,15 @@ public void registerOperation(AbstractOperation operation) {
298298
logger.log(LogLevel.FINEST, DROPPING_EVENT_AS_IT_WAS_GENERATED_BY_K_2_INTERNAL_API_CALL +
299299
JsonConverter.toJSON(operation),
300300
Agent.class.getName());
301-
AgentInfo.getInstance().getJaHealthCheck().getEventStats().getDroppedDueTo().getCsecInternalEvent();
301+
AgentInfo.getInstance().getJaHealthCheck().getEventStats().getDroppedDueTo().incrementCsecInternalEvent();
302302
return;
303303
}
304304

305305
if(!NewRelic.getAgent().getConfig().getValue(IUtilConstants.NR_SECURITY_HOME_APP, false) && checkIfNRGeneratedEvent(operation)) {
306306
logger.log(LogLevel.FINEST, DROPPING_EVENT_AS_IT_WAS_GENERATED_BY_K_2_INTERNAL_API_CALL +
307307
JsonConverter.toJSON(operation),
308308
Agent.class.getName());
309-
AgentInfo.getInstance().getJaHealthCheck().getEventStats().getDroppedDueTo().getNrInternalEvent();
309+
AgentInfo.getInstance().getJaHealthCheck().getEventStats().getDroppedDueTo().incrementNrInternalEvent();
310310
return;
311311
}
312312

0 commit comments

Comments
 (0)