Skip to content

Commit 7292ead

Browse files
[INLONG-11529][Agent] Add exception handling for audit SDK (#11530)
* [INLONG-11529][Agent] Add exception handling for audit SDK * [INLONG-11529][Agent] Delete useless code * [INLONG-11529][Agent] Print audit detail and return if args is invalid
1 parent 4f533e0 commit 7292ead

File tree

2 files changed

+17
-42
lines changed
  • inlong-agent
    • agent-common/src/main/java/org/apache/inlong/agent/metrics/audit
    • agent-plugins/src/main/java/org/apache/inlong/agent/plugin/task/file

2 files changed

+17
-42
lines changed

inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java

+17-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
import org.apache.inlong.audit.AuditOperator;
2323
import org.apache.inlong.audit.entity.AuditComponent;
2424

25+
import org.slf4j.Logger;
26+
import org.slf4j.LoggerFactory;
27+
2528
import java.util.HashSet;
2629

2730
import static org.apache.inlong.agent.constant.AgentConstants.AUDIT_ENABLE;
@@ -38,6 +41,8 @@
3841
*/
3942
public class AuditUtils {
4043

44+
private static final Logger LOGGER = LoggerFactory.getLogger(AuditUtils.class);
45+
public static final int AGENT_ISOLATE_KEY = 1;
4146
public static int AUDIT_ID_AGENT_READ_SUCCESS = 3;
4247
public static int AUDIT_ID_AGENT_SEND_SUCCESS = 4;
4348
public static int AUDIT_ID_AGENT_READ_FAILED = 524291;
@@ -90,8 +95,17 @@ public static void add(int auditID, String inlongGroupId, String inlongStreamId,
9095
if (!IS_AUDIT) {
9196
return;
9297
}
93-
AuditOperator.getInstance()
94-
.add(auditID, DEFAULT_AUDIT_TAG, inlongGroupId, inlongStreamId, logTime, count, size, version);
98+
if (inlongGroupId == null || inlongStreamId == null) {
99+
LOGGER.error("invalid args inlongGroupId: {}, inlongStreamId: {}", inlongGroupId, inlongStreamId);
100+
return;
101+
}
102+
try {
103+
AuditOperator.getInstance()
104+
.add(auditID, DEFAULT_AUDIT_TAG, inlongGroupId, inlongStreamId, logTime, count, size, version);
105+
} catch (Throwable e) {
106+
LOGGER.error("call audit add inlongGroupId: {}, inlongStreamId: {}, auditID {}, error", inlongGroupId,
107+
inlongStreamId, auditID, e);
108+
}
95109
}
96110

97111
public static void add(int auditID, String inlongGroupId, String inlongStreamId,
@@ -106,6 +120,6 @@ public static void send() {
106120
if (!IS_AUDIT) {
107121
return;
108122
}
109-
AuditOperator.getInstance().flush();
123+
AuditOperator.getInstance().flush(AGENT_ISOLATE_KEY);
110124
}
111125
}

inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/task/file/TaskType.java

-39
This file was deleted.

0 commit comments

Comments
 (0)