chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #896 from lcybo/master

Browse Source 
修复execTime快于canal当前时间，delay无data points
This commit is contained in:
agapple
2018-08-31 13:59:57 +08:00
committed by GitHub
parent 283956ee93 06275a46ed
commit 21ef2e5dd4
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
prometheus/src/main/java/com/alibaba/otter/canal/prometheus/impl/EntryCollector.java
View File

@@ -53,9 +53,9 @@ public class EntryCollector extends Collector implements InstanceRegistry {
for (EntryMetricsHolder emh : instances.values()) {
long now = System.currentTimeMillis();
long latest = emh.latestExecTime.get();
if (now >= latest) {
delay.addMetric(emh.destLabelValues, (now - latest));
}
// execTime > now，delay显示为0
long d = (now >= latest) ? (now - latest) : 0;
delay.addMetric(emh.destLabelValues, d);
transactions.addMetric(emh.destLabelValues, emh.transactionCounter.doubleValue());
}
mfs.add(delay);

16
prometheus/src/main/java/com/alibaba/otter/canal/prometheus/impl/StoreCollector.java
View File

@@ -99,15 +99,13 @@ public class StoreCollector extends Collector implements InstanceRegistry {
long get = Math.min(smh.getExecTime.get(), pet);
long aet = Math.min(smh.ackExecTime.get(), get);
long now = System.currentTimeMillis();
if (now >= pet) {
putDelay.addMetric(smh.destLabelValues, (now - pet));
}
if (now >= get) {
getDelay.addMetric(smh.destLabelValues, (now - get));
}
if (now >= aet) {
ackDelay.addMetric(smh.destLabelValues, (now - aet));
}
// execTime > now，delay显示为0
long pd = (now >= pet) ? (now - pet) : 0;
putDelay.addMetric(smh.destLabelValues, pd);
long gd = (now >= get) ? (now - get) : 0;
getDelay.addMetric(smh.destLabelValues, gd);
long ad = (now >= aet) ? (now - aet) : 0;
ackDelay.addMetric(smh.destLabelValues, ad);
putRows.addMetric(smh.destLabelValues, smh.putTableRows.doubleValue());
getRows.addMetric(smh.destLabelValues, smh.getTableRows.doubleValue());
ackRows.addMetric(smh.destLabelValues, smh.ackTableRows.doubleValue());