This is an automated email from the ASF dual-hosted git repository.
shanwb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new c360c2a2 refactor: optimize log parsing null value judgment logic
using String… (#609)
c360c2a2 is described below
commit c360c2a2d50196328452630a9bec58cb08bacfb2
Author: wtt <[email protected]>
AuthorDate: Thu Oct 23 16:04:26 2025 +0800
refactor: optimize log parsing null value judgment logic using String…
(#609)
* refactor: optimize log parsing null value judgment logic using StringUtils
* refactor: upgrade log-agent module version to 2.2.10-SNAPSHOT
---
ozhera-log/log-agent/pom.xml | 2 +-
.../apache/ozhera/log/agent/channel/ChannelServiceImpl.java | 2 +-
.../java/org/apache/ozhera/log/parse/CustomLogParser.java | 12 +++++-------
.../main/java/org/apache/ozhera/log/parse/JsonLogParser.java | 2 +-
.../java/org/apache/ozhera/log/parse/PlaceholderParser.java | 5 +++++
.../main/java/org/apache/ozhera/log/parse/RawLogParser.java | 4 ++++
.../java/org/apache/ozhera/log/parse/RegexLogParser.java | 2 +-
.../java/org/apache/ozhera/log/parse/SeparatorLogParser.java | 5 +----
8 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/ozhera-log/log-agent/pom.xml b/ozhera-log/log-agent/pom.xml
index 5b974e5d..617f62b4 100644
--- a/ozhera-log/log-agent/pom.xml
+++ b/ozhera-log/log-agent/pom.xml
@@ -28,7 +28,7 @@ http://www.apache.org/licenses/LICENSE-2.0
<modelVersion>4.0.0</modelVersion>
<artifactId>log-agent</artifactId>
- <version>2.2.9-SNAPSHOT</version>
+ <version>2.2.10-SNAPSHOT</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
diff --git
a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/ChannelServiceImpl.java
b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/ChannelServiceImpl.java
index 7efdf610..67318f71 100644
---
a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/ChannelServiceImpl.java
+++
b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/ChannelServiceImpl.java
@@ -234,7 +234,7 @@ public class ChannelServiceImpl extends
AbstractChannelService {
private void startCollectFile(Long channelId, Input input, List<String>
patterns) {
for (int i = 0; i < patterns.size(); i++) {
log.info("startCollectFile,total file:{},start:{},remain:{}",
patterns.size(), i + 1, patterns.size() - (i + 1));
- readFile(input.getPatternCode(), getTailPodIp(patterns.get(i)),
channelId);
+ readFile(input.getPatternCode(), patterns.get(i), channelId);
InodeFileComparator.addFile(patterns.get(i));
}
lastLineRemainSendSchedule(input.getPatternCode());
diff --git
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/CustomLogParser.java
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/CustomLogParser.java
index 6352e404..e9aee49f 100644
---
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/CustomLogParser.java
+++
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/CustomLogParser.java
@@ -61,18 +61,16 @@ public class CustomLogParser extends AbstractLogParser {
@Override
public Map<String, Object> doParseSimple(String logData, Long
collectStamp) {
Map<String, Object> ret = new HashMap<>();
- String originData = logData;
- if (logData == null) {
- return null;
+ if (StringUtils.isBlank(logData)) {
+ return ret;
}
try {
if (!isParsePattern) {
parsePatter(parserData.getParseScript());
}
- if (logData.length() == 0) {
+ if (logData.isEmpty()) {
return ret;
}
- String originLog = logData;
if (StringUtils.isBlank(keyValueList) &&
CollectionUtil.isEmpty(logPerComments)) {
ret.put(ES_KEY_MAP_MESSAGE, logData);
return ret;
@@ -87,10 +85,10 @@ public class CustomLogParser extends AbstractLogParser {
ret.put(logPerComments.get(i), StringUtils.isNotEmpty(value) ?
value.trim() : value);
}
if
(ret.values().stream().map(String::valueOf).anyMatch(StringUtils::isEmpty)) {
- ret.put(ES_KEY_MAP_LOG_SOURCE, originLog);
+ ret.put(ES_KEY_MAP_LOG_SOURCE, logData);
}
} catch (Exception e) {
- ret.put(ES_KEY_MAP_LOG_SOURCE, originData);
+ ret.put(ES_KEY_MAP_LOG_SOURCE, logData);
}
validTimestamp(ret, collectStamp);
return ret;
diff --git
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/JsonLogParser.java
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/JsonLogParser.java
index 74b0943f..3b33da00 100644
---
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/JsonLogParser.java
+++
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/JsonLogParser.java
@@ -55,7 +55,7 @@ public class JsonLogParser extends AbstractLogParser {
@Override
public Map<String, Object> doParseSimple(String logData, Long
collectStamp) {
Map<String, Object> ret = new HashMap<>();
- if (logData == null || logData.length() == 0) {
+ if (StringUtils.isBlank(logData)) {
return ret;
}
try {
diff --git
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/PlaceholderParser.java
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/PlaceholderParser.java
index a76dd2ab..86f213be 100644
---
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/PlaceholderParser.java
+++
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/PlaceholderParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.ozhera.log.parse;
+import org.apache.commons.lang3.StringUtils;
+
import java.util.*;
/**
@@ -93,6 +95,9 @@ public class PlaceholderParser extends AbstractLogParser {
public Map<String, Object> parse(String logLine) {
Map<String, Object> result = new LinkedHashMap<>();
+ if (StringUtils.isBlank(logLine)) {
+ return result;
+ }
String remaining = logLine;
int fieldIndex = 0;
diff --git
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/RawLogParser.java
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/RawLogParser.java
index 8a43bf41..3706bb04 100644
---
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/RawLogParser.java
+++
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/RawLogParser.java
@@ -20,6 +20,7 @@ package org.apache.ozhera.log.parse;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.List;
@@ -48,6 +49,9 @@ public class RawLogParser extends AbstractLogParser {
@Override
public Map<String, Object> doParseSimple(String logData, Long
collectStamp) {
Map<String, Object> ret = new HashMap<>();
+ if (StringUtils.isBlank(logData)) {
+ return ret;
+ }
ret.put(ES_KEY_MAP_MESSAGE, logData);
if (null != collectStamp) {
ret.put(esKeyMap_timestamp, collectStamp);
diff --git
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/RegexLogParser.java
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/RegexLogParser.java
index 8173d439..7922c2b3 100644
---
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/RegexLogParser.java
+++
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/RegexLogParser.java
@@ -54,7 +54,7 @@ public class RegexLogParser extends AbstractLogParser {
@Override
public Map<String, Object> doParseSimple(String logData, Long
collectStamp) {
Map<String, Object> ret = new HashMap<>();
- if (logData == null || logData.isEmpty()) {
+ if (StringUtils.isBlank(logData)) {
return ret;
}
try {
diff --git
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/SeparatorLogParser.java
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/SeparatorLogParser.java
index 0a630f96..938331b9 100644
---
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/SeparatorLogParser.java
+++
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/SeparatorLogParser.java
@@ -49,10 +49,7 @@ public class SeparatorLogParser extends AbstractLogParser {
@Override
public Map<String, Object> doParseSimple(String logData, Long
collectStamp) {
Map<String, Object> ret = new HashMap<>();
- if (logData == null) {
- return ret;
- }
- if (logData.isEmpty()) {
+ if (StringUtils.isBlank(logData)) {
return ret;
}
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
