docs: request for updating Images in contributing documentation

ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/channel/ChannelServiceImpl.java

@@ -399,6 +399,7 @@ private void readFile(String patternCode, String ip, String filePath, Long chann
                     log.info("thread {} {}", Thread.currentThread().isVirtual(), Thread.currentThread());
                     logFile.readLine();
                 } catch (Exception e) {
+                    logFile.setExceptionFinish();
                     log.error("logFile read line err,channelId:{},localIp:{},file:{},patternCode:{}", channelId, usedIp, fileProgressMap, patternCode, e);
                 }
             });
@@ -565,7 +566,7 @@ public void reOpen(String filePath) {
             ILogFile logFile = logFileMap.get(filePath);
             String tailPodIp = getTailPodIp(filePath);
             String ip = StringUtils.isBlank(tailPodIp) ? NetUtil.getLocalIp() : tailPodIp;
-            if (null == logFile) {
+            if (null == logFile || logFile.getExceptionFinish()) {
                 // Add new log file
                 readFile(channelDefine.getInput().getPatternCode(), ip, filePath, getChannelId());
                 log.info("watch new file create for channelId:{},ip:{},path:{}", getChannelId(), filePath, ip);

ozhera-log/log-stream/src/main/java/com/xiaomi/mone/log/stream/job/JobManager.java

@@ -116,13 +116,13 @@ private void startConsumerJob(String type, String ak, String sk, String clusterI
             String sinkProviderBean = sinkJobConfig.getMqType() + LogStreamConstants.sinkJobProviderBeanSuffix;
             SinkJobProvider sinkJobProvider = Ioc.ins().getBean(sinkProviderBean);
 
-            if (StringUtils.equalsAnyIgnoreCase(SinkJobEnum.NORMAL_JOB.name(), sinkJobType)) {
+            if (StringUtils.equalsIgnoreCase(SinkJobEnum.NORMAL_JOB.name(), sinkJobType)) {
                 sinkJobConfig.setJobType(SinkJobEnum.NORMAL_JOB.name());
                 startSinkJob(sinkJobProvider.getSinkJob(sinkJobConfig), SinkJobEnum.NORMAL_JOB,
                         logtailConfig.getLogtailId());
             }
 
-            if (StringUtils.equalsAnyIgnoreCase(SinkJobEnum.BACKUP_JOB.name(), sinkJobType)) {
+            if (StringUtils.equalsIgnoreCase(SinkJobEnum.BACKUP_JOB.name(), sinkJobType)) {
                 sinkJobConfig.setJobType(SinkJobEnum.BACKUP_JOB.name());
                 startSinkJob(sinkJobProvider.getBackupJob(sinkJobConfig), SinkJobEnum.BACKUP_JOB,
                         logtailConfig.getLogtailId());

ozhera-log/log-stream/src/main/java/com/xiaomi/mone/log/stream/job/LogDataTransfer.java

@@ -142,7 +142,6 @@ private void putCommonData(Map<String, Object> dataMap) {
     }
 
     private void sendMessage(Map<String, Object> dataMap) throws Exception {
-        dataMap.putIfAbsent(ES_KEY_MAP_TAIL_ID, sinkJobConfig.getLogTailId());
         if (!logSendFilter.sendMessageSwitch(dataMap)) {
             return;
         }

ozhera-log/log-stream/src/main/java/com/xiaomi/mone/log/stream/plugin/es/EsPlugin.java

@@ -147,7 +147,7 @@ public void beforeBulk(long executionId, BulkRequest request) {
             @Override
             public void afterBulk(long executionId, BulkRequest request, BulkResponse response) {
                 if (response.hasFailures()) {
-                    log.error("afterBulk request:{},response:{}", gson.toJson(request.requests()), gson.toJson(response));
+                    log.error("afterBulk request:{},response:{}", gson.toJson(request.requests()), response.buildFailureMessage());
                     AtomicInteger count = new AtomicInteger();
                     response.spliterator().forEachRemaining(x -> {
                         if (x.isFailed()) {

pom.xml

@@ -605,7 +605,7 @@
             <dependency>
                 <groupId>run.mone</groupId>
                 <artifactId>file</artifactId>
-                <version>${jcommon.release.version}</version>
+                <version>1.5.1-jdk21</version>
             </dependency>
             <dependency>
                 <groupId>run.mone</groupId>