From dfec23ca3d28ccce20f501236ddc96c3df1393ed Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Sat, 2 Dec 2017 16:08:38 +0800 Subject: [PATCH] Make application metric contains transaction, business transaction, mq transaction. --- .../table/application/ApplicationMetric.java | 134 ++++++++++++++---- .../application/ApplicationMetricTable.java | 8 +- .../ApplicationMetricEsPersistenceDAO.java | 60 ++++++-- .../ApplicationMetricH2PersistenceDAO.java | 60 ++++++-- 4 files changed, 203 insertions(+), 59 deletions(-) diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMetric.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMetric.java index 42ba15c9d..a54e9beff 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMetric.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMetric.java @@ -34,21 +34,33 @@ public class ApplicationMetric extends Data { }; private static final Column[] LONG_COLUMNS = { - new Column(ApplicationMetricTable.COLUMN_CALLS, new AddOperation()), - new Column(ApplicationMetricTable.COLUMN_ERROR_CALLS, new AddOperation()), - new Column(ApplicationMetricTable.COLUMN_DURATION_SUM, new AddOperation()), - new Column(ApplicationMetricTable.COLUMN_ERROR_DURATION_SUM, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_TIME_BUCKET, new NonOperation()), + + new Column(ApplicationMetricTable.COLUMN_TRANSACTION_CALLS, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_CALLS, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_TRANSACTION_DURATION_SUM, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_DURATION_SUM, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_CALLS, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_DURATION_SUM, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_CALLS, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_CALLS, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_DURATION_SUM, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM, new AddOperation()), + new Column(ApplicationMetricTable.COLUMN_SATISFIED_COUNT, new AddOperation()), new Column(ApplicationMetricTable.COLUMN_TOLERATING_COUNT, new AddOperation()), new Column(ApplicationMetricTable.COLUMN_FRUSTRATED_COUNT, new AddOperation()), - new Column(ApplicationMetricTable.COLUMN_TIME_BUCKET, new CoverOperation()), }; private static final Column[] DOUBLE_COLUMNS = {}; + private static final Column[] INTEGER_COLUMNS = { new Column(ApplicationMetricTable.COLUMN_APPLICATION_ID, new CoverOperation()), }; private static final Column[] BOOLEAN_COLUMNS = {}; + private static final Column[] BYTE_COLUMNS = {}; public ApplicationMetric(String id) { @@ -63,67 +75,131 @@ public class ApplicationMetric extends Data { setDataInteger(0, applicationId); } - public long getCalls() { + public Long getTimeBucket() { return getDataLong(0); } - public void setCalls(long calls) { - setDataLong(0, calls); + public void setTimeBucket(Long timeBucket) { + setDataLong(0, timeBucket); } - public long getErrorCalls() { + public Long getTransactionCalls() { return getDataLong(1); } - public void setErrorCalls(long errorCalls) { - setDataLong(1, errorCalls); + public void setTransactionCalls(Long transactionCalls) { + setDataLong(1, transactionCalls); } - public long getDurationSum() { + public Long getTransactionErrorCalls() { return getDataLong(2); } - public void setDurationSum(long durationSum) { - setDataLong(2, durationSum); + public void setTransactionErrorCalls(Long transactionErrorCalls) { + setDataLong(2, transactionErrorCalls); } - public long getErrorDurationSum() { + public Long getTransactionDurationSum() { return getDataLong(3); } - public void setErrorDurationSum(long errorDurationSum) { - setDataLong(3, errorDurationSum); + public void setTransactionDurationSum(Long transactionDurationSum) { + setDataLong(3, transactionDurationSum); } - public long getSatisfiedCount() { + public Long getTransactionErrorDurationSum() { return getDataLong(4); } - public void setSatisfiedCount(long satisfiedCount) { - setDataLong(4, satisfiedCount); + public void setTransactionErrorDurationSum(Long transactionErrorDurationSum) { + setDataLong(4, transactionErrorDurationSum); } - public long getToleratingCount() { + public Long getBusinessTransactionCalls() { return getDataLong(5); } - public void setToleratingCount(long toleratingCount) { - setDataLong(5, toleratingCount); + public void setBusinessTransactionCalls(Long businessTransactionCalls) { + setDataLong(5, businessTransactionCalls); } - public long getFrustratedCount() { + public Long getBusinessTransactionErrorCalls() { return getDataLong(6); } - public void setFrustratedCount(long frustratedCount) { - setDataLong(6, frustratedCount); + public void setBusinessTransactionErrorCalls(Long businessTransactionErrorCalls) { + setDataLong(6, businessTransactionErrorCalls); } - public long getTimeBucket() { + public Long getBusinessTransactionDurationSum() { return getDataLong(7); } - public void setTimeBucket(long timeBucket) { - setDataLong(7, timeBucket); + public void setBusinessTransactionDurationSum(Long businessTransactionDurationSum) { + setDataLong(7, businessTransactionDurationSum); + } + + public Long getBusinessTransactionErrorDurationSum() { + return getDataLong(8); + } + + public void setBusinessTransactionErrorDurationSum(Long businessTransactionErrorDurationSum) { + setDataLong(8, businessTransactionErrorDurationSum); + } + + public Long getMqTransactionCalls() { + return getDataLong(9); + } + + public void setMqTransactionCalls(Long mqTransactionCalls) { + setDataLong(9, mqTransactionCalls); + } + + public Long getMqTransactionErrorCalls() { + return getDataLong(10); + } + + public void setMqTransactionErrorCalls(Long mqTransactionErrorCalls) { + setDataLong(10, mqTransactionErrorCalls); + } + + public Long getMqTransactionDurationSum() { + return getDataLong(11); + } + + public void setMqTransactionDurationSum(Long mqTransactionDurationSum) { + setDataLong(11, mqTransactionDurationSum); + } + + public Long getMqTransactionErrorDurationSum() { + return getDataLong(12); + } + + public void setMqTransactionErrorDurationSum(Long mqTransactionErrorDurationSum) { + setDataLong(12, mqTransactionErrorDurationSum); + } + + public long getSatisfiedCount() { + return getDataLong(13); + } + + public void setSatisfiedCount(long satisfiedCount) { + setDataLong(13, satisfiedCount); + } + + public long getToleratingCount() { + return getDataLong(14); + } + + public void setToleratingCount(long toleratingCount) { + setDataLong(14, toleratingCount); + } + + public long getFrustratedCount() { + return getDataLong(15); + } + + public void setFrustratedCount(long frustratedCount) { + setDataLong(15, frustratedCount); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMetricTable.java index c27a33394..d30c7ea7b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMetricTable.java @@ -18,18 +18,14 @@ package org.skywalking.apm.collector.storage.table.application; -import org.skywalking.apm.collector.core.data.CommonTable; +import org.skywalking.apm.collector.storage.table.CommonMetricTable; /** * @author peng-yongsheng */ -public class ApplicationMetricTable extends CommonTable { +public class ApplicationMetricTable extends CommonMetricTable { public static final String TABLE = "application_metric"; public static final String COLUMN_APPLICATION_ID = "application_id"; - public static final String COLUMN_CALLS = "calls"; - public static final String COLUMN_ERROR_CALLS = "error_calls"; - public static final String COLUMN_DURATION_SUM = "duration_sum"; - public static final String COLUMN_ERROR_DURATION_SUM = "error_duration_sum"; public static final String COLUMN_SATISFIED_COUNT = "satisfied_count"; public static final String COLUMN_TOLERATING_COUNT = "tolerating_count"; public static final String COLUMN_FRUSTRATED_COUNT = "frustrated_count"; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMetricEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMetricEsPersistenceDAO.java index 2552e112a..87e6b5fe7 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMetricEsPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMetricEsPersistenceDAO.java @@ -51,10 +51,22 @@ public class ApplicationMetricEsPersistenceDAO extends EsDAO implements IApplica ApplicationMetric applicationMetric = new ApplicationMetric(id); Map source = getResponse.getSource(); applicationMetric.setApplicationId(((Number)source.get(ApplicationMetricTable.COLUMN_APPLICATION_ID)).intValue()); - applicationMetric.setCalls(((Number)source.get(ApplicationMetricTable.COLUMN_CALLS)).longValue()); - applicationMetric.setErrorCalls(((Number)source.get(ApplicationMetricTable.COLUMN_ERROR_CALLS)).longValue()); - applicationMetric.setDurationSum(((Number)source.get(ApplicationMetricTable.COLUMN_DURATION_SUM)).longValue()); - applicationMetric.setErrorDurationSum(((Number)source.get(ApplicationMetricTable.COLUMN_ERROR_DURATION_SUM)).longValue()); + + applicationMetric.setTransactionCalls(((Number)source.get(ApplicationMetricTable.COLUMN_TRANSACTION_CALLS)).longValue()); + applicationMetric.setTransactionErrorCalls(((Number)source.get(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_CALLS)).longValue()); + applicationMetric.setTransactionDurationSum(((Number)source.get(ApplicationMetricTable.COLUMN_TRANSACTION_DURATION_SUM)).longValue()); + applicationMetric.setTransactionErrorDurationSum(((Number)source.get(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_DURATION_SUM)).longValue()); + + applicationMetric.setBusinessTransactionCalls(((Number)source.get(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_CALLS)).longValue()); + applicationMetric.setBusinessTransactionErrorCalls(((Number)source.get(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS)).longValue()); + applicationMetric.setBusinessTransactionDurationSum(((Number)source.get(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_DURATION_SUM)).longValue()); + applicationMetric.setBusinessTransactionErrorDurationSum(((Number)source.get(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM)).longValue()); + + applicationMetric.setMqTransactionCalls(((Number)source.get(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_CALLS)).longValue()); + applicationMetric.setMqTransactionErrorCalls(((Number)source.get(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_CALLS)).longValue()); + applicationMetric.setMqTransactionDurationSum(((Number)source.get(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_DURATION_SUM)).longValue()); + applicationMetric.setMqTransactionErrorDurationSum(((Number)source.get(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM)).longValue()); + applicationMetric.setSatisfiedCount(((Number)source.get(ApplicationMetricTable.COLUMN_SATISFIED_COUNT)).longValue()); applicationMetric.setToleratingCount(((Number)source.get(ApplicationMetricTable.COLUMN_TOLERATING_COUNT)).longValue()); applicationMetric.setFrustratedCount(((Number)source.get(ApplicationMetricTable.COLUMN_FRUSTRATED_COUNT)).longValue()); @@ -68,10 +80,22 @@ public class ApplicationMetricEsPersistenceDAO extends EsDAO implements IApplica @Override public IndexRequestBuilder prepareBatchInsert(ApplicationMetric data) { Map source = new HashMap<>(); source.put(ApplicationMetricTable.COLUMN_APPLICATION_ID, data.getApplicationId()); - source.put(ApplicationMetricTable.COLUMN_CALLS, data.getCalls()); - source.put(ApplicationMetricTable.COLUMN_ERROR_CALLS, data.getErrorCalls()); - source.put(ApplicationMetricTable.COLUMN_DURATION_SUM, data.getDurationSum()); - source.put(ApplicationMetricTable.COLUMN_ERROR_DURATION_SUM, data.getErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_CALLS, data.getTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_CALLS, data.getTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_DURATION_SUM, data.getTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_DURATION_SUM, data.getTransactionErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_CALLS, data.getBusinessTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS, data.getBusinessTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_DURATION_SUM, data.getBusinessTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM, data.getBusinessTransactionErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_CALLS, data.getMqTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_CALLS, data.getMqTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_DURATION_SUM, data.getMqTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM, data.getMqTransactionErrorDurationSum()); + source.put(ApplicationMetricTable.COLUMN_SATISFIED_COUNT, data.getSatisfiedCount()); source.put(ApplicationMetricTable.COLUMN_TOLERATING_COUNT, data.getToleratingCount()); source.put(ApplicationMetricTable.COLUMN_FRUSTRATED_COUNT, data.getFrustratedCount()); @@ -83,10 +107,22 @@ public class ApplicationMetricEsPersistenceDAO extends EsDAO implements IApplica @Override public UpdateRequestBuilder prepareBatchUpdate(ApplicationMetric data) { Map source = new HashMap<>(); source.put(ApplicationMetricTable.COLUMN_APPLICATION_ID, data.getApplicationId()); - source.put(ApplicationMetricTable.COLUMN_CALLS, data.getCalls()); - source.put(ApplicationMetricTable.COLUMN_ERROR_CALLS, data.getErrorCalls()); - source.put(ApplicationMetricTable.COLUMN_DURATION_SUM, data.getDurationSum()); - source.put(ApplicationMetricTable.COLUMN_ERROR_DURATION_SUM, data.getErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_CALLS, data.getTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_CALLS, data.getTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_DURATION_SUM, data.getTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_DURATION_SUM, data.getTransactionErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_CALLS, data.getBusinessTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS, data.getBusinessTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_DURATION_SUM, data.getBusinessTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM, data.getBusinessTransactionErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_CALLS, data.getMqTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_CALLS, data.getMqTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_DURATION_SUM, data.getMqTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM, data.getMqTransactionErrorDurationSum()); + source.put(ApplicationMetricTable.COLUMN_SATISFIED_COUNT, data.getSatisfiedCount()); source.put(ApplicationMetricTable.COLUMN_TOLERATING_COUNT, data.getToleratingCount()); source.put(ApplicationMetricTable.COLUMN_FRUSTRATED_COUNT, data.getFrustratedCount()); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMetricH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMetricH2PersistenceDAO.java index 95e1153fd..6cb1ca10b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMetricH2PersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMetricH2PersistenceDAO.java @@ -55,10 +55,22 @@ public class ApplicationMetricH2PersistenceDAO extends H2DAO implements IApplica if (rs.next()) { ApplicationMetric applicationMetric = new ApplicationMetric(id); applicationMetric.setApplicationId(rs.getInt(ApplicationMetricTable.COLUMN_APPLICATION_ID)); - applicationMetric.setCalls(rs.getLong(ApplicationMetricTable.COLUMN_CALLS)); - applicationMetric.setErrorCalls(rs.getLong(ApplicationMetricTable.COLUMN_ERROR_CALLS)); - applicationMetric.setDurationSum(rs.getLong(ApplicationMetricTable.COLUMN_DURATION_SUM)); - applicationMetric.setErrorDurationSum(rs.getLong(ApplicationMetricTable.COLUMN_ERROR_DURATION_SUM)); + + applicationMetric.setTransactionCalls(rs.getLong(ApplicationMetricTable.COLUMN_TRANSACTION_CALLS)); + applicationMetric.setTransactionErrorCalls(rs.getLong(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_CALLS)); + applicationMetric.setTransactionDurationSum(rs.getLong(ApplicationMetricTable.COLUMN_TRANSACTION_DURATION_SUM)); + applicationMetric.setTransactionErrorDurationSum(rs.getLong(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_DURATION_SUM)); + + applicationMetric.setBusinessTransactionCalls(rs.getLong(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_CALLS)); + applicationMetric.setBusinessTransactionErrorCalls(rs.getLong(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS)); + applicationMetric.setBusinessTransactionDurationSum(rs.getLong(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_DURATION_SUM)); + applicationMetric.setBusinessTransactionErrorDurationSum(rs.getLong(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM)); + + applicationMetric.setMqTransactionCalls(rs.getLong(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_CALLS)); + applicationMetric.setMqTransactionErrorCalls(rs.getLong(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_CALLS)); + applicationMetric.setMqTransactionDurationSum(rs.getLong(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_DURATION_SUM)); + applicationMetric.setMqTransactionErrorDurationSum(rs.getLong(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM)); + applicationMetric.setSatisfiedCount(rs.getLong(ApplicationMetricTable.COLUMN_SATISFIED_COUNT)); applicationMetric.setToleratingCount(rs.getLong(ApplicationMetricTable.COLUMN_TOLERATING_COUNT)); applicationMetric.setFrustratedCount(rs.getLong(ApplicationMetricTable.COLUMN_FRUSTRATED_COUNT)); @@ -76,10 +88,22 @@ public class ApplicationMetricH2PersistenceDAO extends H2DAO implements IApplica H2SqlEntity entity = new H2SqlEntity(); source.put(ApplicationMetricTable.COLUMN_ID, data.getId()); source.put(ApplicationMetricTable.COLUMN_APPLICATION_ID, data.getApplicationId()); - source.put(ApplicationMetricTable.COLUMN_CALLS, data.getCalls()); - source.put(ApplicationMetricTable.COLUMN_ERROR_CALLS, data.getErrorCalls()); - source.put(ApplicationMetricTable.COLUMN_DURATION_SUM, data.getDurationSum()); - source.put(ApplicationMetricTable.COLUMN_ERROR_DURATION_SUM, data.getErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_CALLS, data.getTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_CALLS, data.getTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_DURATION_SUM, data.getTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_DURATION_SUM, data.getTransactionErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_CALLS, data.getBusinessTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS, data.getBusinessTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_DURATION_SUM, data.getBusinessTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM, data.getBusinessTransactionErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_CALLS, data.getMqTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_CALLS, data.getMqTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_DURATION_SUM, data.getMqTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM, data.getMqTransactionErrorDurationSum()); + source.put(ApplicationMetricTable.COLUMN_SATISFIED_COUNT, data.getSatisfiedCount()); source.put(ApplicationMetricTable.COLUMN_TOLERATING_COUNT, data.getToleratingCount()); source.put(ApplicationMetricTable.COLUMN_FRUSTRATED_COUNT, data.getFrustratedCount()); @@ -95,10 +119,22 @@ public class ApplicationMetricH2PersistenceDAO extends H2DAO implements IApplica Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); source.put(ApplicationMetricTable.COLUMN_APPLICATION_ID, data.getApplicationId()); - source.put(ApplicationMetricTable.COLUMN_CALLS, data.getCalls()); - source.put(ApplicationMetricTable.COLUMN_ERROR_CALLS, data.getErrorCalls()); - source.put(ApplicationMetricTable.COLUMN_DURATION_SUM, data.getDurationSum()); - source.put(ApplicationMetricTable.COLUMN_ERROR_DURATION_SUM, data.getErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_CALLS, data.getTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_CALLS, data.getTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_DURATION_SUM, data.getTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_TRANSACTION_ERROR_DURATION_SUM, data.getTransactionErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_CALLS, data.getBusinessTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS, data.getBusinessTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_DURATION_SUM, data.getBusinessTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM, data.getBusinessTransactionErrorDurationSum()); + + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_CALLS, data.getMqTransactionCalls()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_CALLS, data.getMqTransactionErrorCalls()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_DURATION_SUM, data.getMqTransactionDurationSum()); + source.put(ApplicationMetricTable.COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM, data.getMqTransactionErrorDurationSum()); + source.put(ApplicationMetricTable.COLUMN_SATISFIED_COUNT, data.getSatisfiedCount()); source.put(ApplicationMetricTable.COLUMN_TOLERATING_COUNT, data.getToleratingCount()); source.put(ApplicationMetricTable.COLUMN_FRUSTRATED_COUNT, data.getFrustratedCount());