!366 add trace id

Merge pull request !366 from AE86/dev

dbsyncer-biz/src/main/java/org/dbsyncer/biz/enums/BufferActuatorMetricEnum.java

@@ -22,9 +22,9 @@ public enum BufferActuatorMetricEnum {
      */
     TABLE_GROUP("buffer.actuator.table.group", "表执行器", "");
 
-    private String code;
-    private String group;
-    private String metricName;
+    private final String code;
+    private final String group;
+    private final String metricName;
 
     BufferActuatorMetricEnum(String code, String group, String metricName) {
         this.code = code;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/enums/OracleIncrementEnum.java

@@ -1,41 +0,0 @@
-package org.dbsyncer.biz.enums;
-
-/**
- * Oralce参数配置
- *
- * @author AE86
- * @version 1.0.0
- * @date 2021/4/28 23:21
- */
-public enum OracleIncrementEnum {
-
-    /**
-     * ROWIDTOCHAR(ROWID) 列名
-     */
-    ROW_ID("ROWIDTOCHAR(ROWID)"),
-    /**
-     * ORACLE_ROW_ID 别名
-     */
-    ROW_ID_LABEL_NAME("ORACLE_ROW_ID");
-
-    private String name;
-
-    OracleIncrementEnum(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 是否ROWIDTOCHAR(ROWID) 列名
-     *
-     * @param name
-     * @return
-     */
-    public static boolean isRowId(String name) {
-        return ROW_ID.getName().equals(name);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-}

dbsyncer-biz/src/main/java/org/dbsyncer/biz/enums/SafeInfoEnum.java

@@ -14,7 +14,7 @@ public enum SafeInfoEnum {
      */
     PASSWORD("password");
 
-    private String code;
+    private final String code;
 
     SafeInfoEnum(String code) {
         this.code = code;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/enums/StatisticEnum.java

@@ -42,7 +42,7 @@ public enum StatisticEnum {
      */
     DURATION("duration");
 
-    private String tagValueRepresentation;
+    private final String tagValueRepresentation;
 
     StatisticEnum(String tagValueRepresentation) {
         this.tagValueRepresentation = tagValueRepresentation;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/enums/ThreadPoolMetricEnum.java

@@ -30,7 +30,7 @@ public enum ThreadPoolMetricEnum {
      */
     REMAINING_CAPACITY("空闲队列");
 
-    private String metricName;
+    private final String metricName;
 
     ThreadPoolMetricEnum(String metricName) {
         this.metricName = metricName;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/enums/UserRoleEnum.java

@@ -21,9 +21,9 @@ public enum UserRoleEnum {
      */
     USER("user", "普通用户");
 
-    private String code;
+    private final String code;
 
-    private String name;
+    private final String name;
 
     UserRoleEnum(String code, String name) {
         this.code = code;

dbsyncer-common/src/main/java/org/dbsyncer/common/enums/FileSuffixEnum.java

@@ -21,7 +21,7 @@ public enum FileSuffixEnum {
      */
     JSON("json");
 
-    private String name;
+    private final String name;
 
     FileSuffixEnum(String name) {
         this.name = name;

dbsyncer-connector/dbsyncer-connector-elasticsearch/src/main/java/org/dbsyncer/connector/elasticsearch/enums/ESFieldTypeEnum.java

@@ -75,8 +75,8 @@ public enum ESFieldTypeEnum {
     GEO_SHAPE("geo_shape", Types.VARCHAR),
     BINARY("binary", Types.BINARY);
 
-    private String code;
-    private int type;
+    private final String code;
+    private final int type;
 
     ESFieldTypeEnum(String code, int type) {
         this.code = code;

dbsyncer-connector/dbsyncer-connector-kafka/src/main/java/org/dbsyncer/connector/kafka/enums/KafkaFieldTypeEnum.java

@@ -39,9 +39,9 @@ public enum KafkaFieldTypeEnum {
     TIME("Time", Time.class, Types.TIME),
     TIMESTAMP("Timestamp", Timestamp.class, Types.TIMESTAMP);
 
-    private String code;
-    private Class clazz;
-    private int type;
+    private final String code;
+    private final Class clazz;
+    private final int type;
 
     KafkaFieldTypeEnum(String code, Class clazz, int type) {
         this.code = code;

dbsyncer-connector/dbsyncer-connector-postgresql/src/main/java/org/dbsyncer/connector/postgresql/enums/MessageDecoderEnum.java

@@ -26,8 +26,8 @@ public enum MessageDecoderEnum {
      */
     PG_OUTPUT("pgoutput", PgOutputMessageDecoder.class);
 
-    private String type;
-    private Class<?> clazz;
+    private final String type;
+    private final Class<?> clazz;
 
     MessageDecoderEnum(String type, Class<?> clazz) {
         this.type = type;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/enums/CommandEnum.java

@@ -65,22 +65,22 @@ public enum CommandEnum {
     /**
      * 命令类型
      */
-    private String modelType;
+    private final String modelType;
 
     /**
      * 执行器
      */
-    private CommandExecutor commandExecutor;
+    private final CommandExecutor commandExecutor;
 
     /**
      * 是否预加载
      */
-    private boolean preload;
+    private final boolean preload;
 
     /**
      * 分组持久化策略
      */
-    private GroupStrategyEnum groupStrategyEnum;
+    private final GroupStrategyEnum groupStrategyEnum;
 
     CommandEnum(String modelType, CommandExecutor commandExecutor) {
         this(modelType, commandExecutor, false);

dbsyncer-parser/src/main/java/org/dbsyncer/parser/enums/ConvertEnum.java

@@ -108,13 +108,13 @@ public enum ConvertEnum {
     CLEAR("CLEAR", "清空", 0, new ClearHandler());
 
     // 转换编码
-    private String code;
+    private final String code;
     // 转换名称
-    private String name;
+    private final String name;
     // 参数个数
-    private int argNum;
+    private final int argNum;
     // 转换实现
-    private Handler handler;
+    private final Handler handler;
 
     ConvertEnum(String code, String name, int argNum, Handler handler) {
         this.code = code;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/enums/GroupStrategyEnum.java

@@ -28,7 +28,7 @@ public enum GroupStrategyEnum {
      */
     TABLE(new TableGroupStrategy());
 
-    private GroupStrategy groupStrategy;
+    private final GroupStrategy groupStrategy;
 
     GroupStrategyEnum(GroupStrategy groupStrategy) {
         this.groupStrategy = groupStrategy;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/enums/MetaEnum.java

@@ -1,7 +1,5 @@
 package org.dbsyncer.parser.enums;
 
-import org.dbsyncer.parser.ParserException;
-
 /**
  * 驱动状态枚举
  *
@@ -24,8 +22,8 @@ public enum MetaEnum {
      */
     STOPPING(2, "停止中");
 
-    private int code;
-    private String message;
+    private final int code;
+    private final String message;
 
     MetaEnum(int code, String message) {
         this.code = code;
@@ -40,15 +38,7 @@ public enum MetaEnum {
         return code;
     }
 
-    public void setCode(int code) {
-        this.code = code;
-    }
-
     public String getMessage() {
         return message;
     }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
 }

dbsyncer-parser/src/main/java/org/dbsyncer/parser/enums/ParserEnum.java

@@ -27,12 +27,12 @@ public enum ParserEnum {
     /**
      * 编码
      */
-    private String code;
+    private final String code;
 
     /**
      * 默认值
      */
-    private int defaultValue;
+    private final int defaultValue;
 
     ParserEnum(String code, int defaultValue) {
         this.code = code;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/GeneralBufferActuator.java

@@ -114,6 +114,7 @@ public class GeneralBufferActuator extends AbstractBufferActuator<WriterRequest,
             response.setChangedOffset(request.getChangedOffset());
         }
         if (!response.isMerged()) {
+            response.setTraceId(request.getTraceId());
             response.setTableName(request.getTableName());
             response.setEvent(request.getEvent());
             response.setTypeEnum(request.getTypeEnum());
@@ -198,6 +199,7 @@ public class GeneralBufferActuator extends AbstractBufferActuator<WriterRequest,
         context.setTargetConnectorInstance(connectorFactory.connect(getConnectorConfig(mapping.getTargetConnectorId())));
         context.setSourceTableName(tableGroup.getSourceTable().getName());
         context.setTargetTableName(tableGroup.getTargetTable().getName());
+        context.setTraceId(response.getTraceId());
         context.setEvent(response.getEvent());
         context.setTargetFields(tableGroupPicker.getTargetFields());
         context.setCommand(tableGroup.getCommand());

dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/AbstractWriter.java

@@ -20,6 +20,8 @@ public abstract class AbstractWriter {
 
     private String sql;
 
+    private String traceId;
+
     public ChangedEventTypeEnum getTypeEnum() {
         return typeEnum;
     }
@@ -60,4 +62,11 @@ public abstract class AbstractWriter {
         this.sql = sql;
     }
 
+    public String getTraceId() {
+        return traceId;
+    }
+
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
 }

dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/WriterRequest.java

@@ -15,6 +15,7 @@ public class WriterRequest extends AbstractWriter implements BufferRequest {
     private final List<Object> row;
 
     public WriterRequest(ChangedEvent event) {
+        setTraceId(event.getTraceId());
         setTypeEnum(event.getType());
         setChangedOffset(event.getChangedOffset());
         setTableName(event.getSourceTableName());

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/connector/database/AbstractDatabaseConnector.java

@@ -582,7 +582,7 @@ public abstract class AbstractDatabaseConnector extends AbstractConnector implem
             }
             final String event = existRow(connectorInstance, queryCount, args) ? ConnectorConstant.OPERTION_UPDATE
                     : ConnectorConstant.OPERTION_INSERT;
-            logger.warn("{}表执行{}失败, 重新执行{}, {}", context.getTargetTableName(), context.getEvent(), event, row);
+            logger.warn("{} {}表执行{}失败, 重新执行{}, {}", context.getTraceId(), context.getTargetTableName(), context.getEvent(), event, row);
             writer(result, connectorInstance, context, pkFields, row, event);
         }
     }
@@ -607,12 +607,13 @@ public abstract class AbstractDatabaseConnector extends AbstractConnector implem
             // 2、设置参数
             int execute = connectorInstance.execute(databaseTemplate -> databaseTemplate.update(sql, batchRow(fields, row)));
             if (execute == 0) {
-                throw new SdkException(String.format("尝试执行[%s]失败", event));
+                throw new SdkException(String.format("%s 尝试执行[%s]失败", context.getTraceId(), event));
             }
             result.getSuccessData().add(row);
         } catch (Exception e) {
             result.getFailData().add(row);
-            result.getError().append("SQL:").append(sql).append(System.lineSeparator())
+            result.getError().append(context.getTraceId())
+                    .append(" SQL:").append(sql).append(System.lineSeparator())
                     .append("DATA:").append(row).append(System.lineSeparator())
                     .append("ERROR:").append(e.getMessage()).append(System.lineSeparator());
             logger.error("执行{}失败: {}, DATA:{}", event, e.getMessage(), row);

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/ChangedEventTypeEnum.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2025 All Rights Reserved.
+ */
 package org.dbsyncer.sdk.enums;
 
 /**

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/DDLOperationEnum.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2025 All Rights Reserved.
+ */
 package org.dbsyncer.sdk.enums;
 
 /**

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/FilterEnum.java

@@ -65,9 +65,9 @@ public enum FilterEnum {
     });
 
     // 运算符名称
-    private String name;
+    private final String name;
     // 比较器
-    private CompareFilter compareFilter;
+    private final CompareFilter compareFilter;
 
     FilterEnum(String name, CompareFilter compareFilter) {
         this.name = name;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/FilterTypeEnum.java

@@ -22,7 +22,7 @@ public enum FilterTypeEnum {
      */
     LONG("long");
 
-    private String type;
+    private final String type;
 
     FilterTypeEnum(String type) {
         this.type = type;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/ListenerTypeEnum.java

@@ -18,7 +18,7 @@ public enum ListenerTypeEnum {
      */
     LOG("log");
 
-    private String type;
+    private final String type;
 
     ListenerTypeEnum(String type) {
         this.type = type;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/ModelEnum.java

@@ -24,8 +24,8 @@ public enum ModelEnum {
      */
     INCREMENT("increment", "增量");
 
-    private String code;
-    private String name;
+    private final String code;
+    private final String name;
 
     ModelEnum(String code, String name) {
         this.code = code;
@@ -49,15 +49,7 @@ public enum ModelEnum {
         return code;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getName() {
         return name;
     }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/OperationEnum.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2025 All Rights Reserved.
+ */
 package org.dbsyncer.sdk.enums;
 
 /**
@@ -19,7 +22,7 @@ public enum OperationEnum {
     OR("or");
 
     // 描述
-    private String name;
+    private final String name;
 
     OperationEnum(String name) {
         this.name = name;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/QuartzFilterEnum.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2025 All Rights Reserved.
+ */
 package org.dbsyncer.sdk.enums;
 
 import org.dbsyncer.common.util.StringUtil;
@@ -47,12 +50,12 @@ public enum QuartzFilterEnum {
      */
     TIME_STAMP_YES_END(8, "$timestamp_yes_end$", "系统昨天时间戳(结束23:59:59)", new YesTimestampFilter(false));
 
-    private Integer index;
-    private String type;
-    private String message;
-    private QuartzFilter quartzFilter;
+    private final int index;
+    private final String type;
+    private final String message;
+    private final QuartzFilter quartzFilter;
 
-    QuartzFilterEnum(Integer index, String type, String message, QuartzFilter quartzFilter) {
+    QuartzFilterEnum(int index, String type, String message, QuartzFilter quartzFilter) {
         this.index = index;
         this.type = type;
         this.message = message;
@@ -72,7 +75,7 @@ public enum QuartzFilterEnum {
         return null;
     }
 
-    public Integer getIndex() {
+    public int getIndex() {
         return index;
     }
 

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/SortEnum.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2025 All Rights Reserved.
+ */
 package org.dbsyncer.sdk.enums;
 
 /**
@@ -21,7 +24,7 @@ public enum SortEnum {
         this.code = code;
     }
 
-    private String code;
+    private final String code;
 
     public String getCode() {
         return code;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/SqlBuilderEnum.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2025 All Rights Reserved.
+ */
 package org.dbsyncer.sdk.enums;
 
 import org.dbsyncer.sdk.constant.ConnectorConstant;
@@ -49,12 +52,12 @@ public enum SqlBuilderEnum {
     /**
      * SQL构造器名称
      */
-    private String name;
+    private final String name;
 
     /**
      * SQL构造器
      */
-    private SqlBuilder sqlBuilder;
+    private final SqlBuilder sqlBuilder;
 
     SqlBuilderEnum(String name, SqlBuilder sqlBuilder) {
         this.name = name;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/StorageEnum.java

@@ -23,7 +23,7 @@ public enum StorageEnum {
      */
     DATA("data");
 
-    private String type;
+    private final String type;
 
     StorageEnum(String type) {
         this.type = type;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/StorageStrategyEnum.java

@@ -33,8 +33,8 @@ public enum StorageStrategyEnum {
      */
     LOG(StorageEnum.LOG, new LogStrategy());
 
-    private StorageEnum type;
-    private Strategy strategy;
+    private final StorageEnum type;
+    private final Strategy strategy;
 
     StorageStrategyEnum(StorageEnum type, Strategy strategy) {
         this.type = type;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/TableTypeEnum.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2025 All Rights Reserved.
+ */
 package org.dbsyncer.sdk.enums;
 
 /**
@@ -24,7 +27,7 @@ public enum TableTypeEnum {
      */
     MATERIALIZED_VIEW("MATERIALIZED VIEW");
 
-    private String code;
+    private final String code;
 
     TableTypeEnum(String code) {
         this.code = code;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/ChangedEvent.java

@@ -20,6 +20,16 @@ import java.util.List;
  */
 public interface ChangedEvent {
 
+    /**
+     * 获取traceId
+     */
+    String getTraceId();
+
+    /**
+     * 设置traceId
+     */
+    void setTraceId(String traceId);
+
     /**
      * 获取变更事件类型
      */

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/event/CommonChangedEvent.java

@@ -15,6 +15,10 @@ import org.dbsyncer.sdk.model.ChangedOffset;
  */
 public abstract class CommonChangedEvent implements ChangedEvent {
 
+    /**
+     * traceId
+     */
+    private String traceId;
     /**
      * 变更表名称
      */
@@ -28,6 +32,16 @@ public abstract class CommonChangedEvent implements ChangedEvent {
      */
     private final ChangedOffset changedOffset = new ChangedOffset();
 
+    @Override
+    public String getTraceId() {
+        return traceId;
+    }
+
+    @Override
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
     @Override
     public String getSourceTableName() {
         return sourceTableName;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/plugin/AbstractPluginContext.java

@@ -74,6 +74,8 @@ public abstract class AbstractPluginContext extends AbstractBaseContext implemen
      */
     private String pluginExtInfo;
 
+    private String traceId;
+
     @Override
     public boolean isTerminated() {
         return terminated;
@@ -184,6 +186,15 @@ public abstract class AbstractPluginContext extends AbstractBaseContext implemen
         this.pluginExtInfo = pluginExtInfo;
     }
 
+    @Override
+    public String getTraceId() {
+        return traceId;
+    }
+
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
     @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/plugin/PluginContext.java

@@ -99,6 +99,13 @@ public interface PluginContext extends BaseContext {
      */
     String getPluginExtInfo();
 
+    /**
+     * 获取TraceId
+     *
+     * @return
+     */
+    String getTraceId();
+
     /**
      * 浅拷贝
      *

dbsyncer-storage/src/main/java/org/dbsyncer/storage/enums/BinlogByteEnum.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2025 All Rights Reserved.
+ */
 package org.dbsyncer.storage.enums;
 
 /**
@@ -47,7 +50,7 @@ public enum BinlogByteEnum {
         this.byteLength = byteLength;
     }
 
-    int byteLength;
+    final int byteLength;
 
     public int getByteLength() {
         return byteLength;

dbsyncer-storage/src/main/java/org/dbsyncer/storage/enums/StorageDataStatusEnum.java

@@ -20,16 +20,16 @@ public enum StorageDataStatusEnum {
      */
     SUCCESS(1, "成功");
 
-    private Integer value;
+    private final int value;
 
-    private String message;
+    private final String message;
 
-    StorageDataStatusEnum(Integer value, String message) {
+    StorageDataStatusEnum(int value, String message) {
         this.value = value;
         this.message = message;
     }
 
-    public Integer getValue() {
+    public int getValue() {
         return value;
     }