merge code and fixed issue #2755 #2756 #2735 #2714 #2711 #2710 #2616 #2602 #2585 #2565 #2935 #2434 #2623 #2418 #2387
This commit is contained in:
+13
-7
@@ -1,13 +1,13 @@
|
||||
package com.alibaba.otter.canal.prometheus.impl;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
import com.alibaba.otter.canal.protocol.CanalEntry;
|
||||
import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
|
||||
import com.alibaba.otter.canal.sink.AbstractCanalEventDownStreamHandler;
|
||||
import com.alibaba.otter.canal.store.model.Event;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
/**
|
||||
* @author Chuanyi Li
|
||||
*/
|
||||
@@ -26,17 +26,23 @@ public class PrometheusCanalEventDownStreamHandler extends AbstractCanalEventDow
|
||||
switch (type) {
|
||||
case TRANSACTIONBEGIN: {
|
||||
long exec = e.getExecuteTime();
|
||||
if (exec > 0) localExecTime = exec;
|
||||
if (exec > 0) {
|
||||
localExecTime = exec;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ROWDATA: {
|
||||
long exec = e.getExecuteTime();
|
||||
if (exec > 0) localExecTime = exec;
|
||||
if (exec > 0) {
|
||||
localExecTime = exec;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case TRANSACTIONEND: {
|
||||
long exec = e.getExecuteTime();
|
||||
if (exec > 0) localExecTime = exec;
|
||||
if (exec > 0) {
|
||||
localExecTime = exec;
|
||||
}
|
||||
transactionCounter.incrementAndGet();
|
||||
break;
|
||||
}
|
||||
@@ -51,7 +57,7 @@ public class PrometheusCanalEventDownStreamHandler extends AbstractCanalEventDow
|
||||
}
|
||||
}
|
||||
if (localExecTime > 0) {
|
||||
latestExecuteTime.lazySet(localExecTime);
|
||||
latestExecuteTime.set(localExecTime);
|
||||
}
|
||||
}
|
||||
return events;
|
||||
|
||||
Reference in New Issue
Block a user