From 691f8810f4aa468b4364e5b6836cb3d7fb9f2e02 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Mon, 27 Nov 2017 00:34:04 +0800 Subject: [PATCH] Change the metrics in service reference entity. --- .../agent/stream/graph/TraceStreamGraph.java | 2 +- .../worker/AgentStreamRemoteDataRegister.java | 2 +- ...rviceReferenceMetricAggregationWorker.java | 2 +- ...rviceReferenceMetricPersistenceWorker.java | 2 +- .../ServiceReferenceMetricRemoteWorker.java | 2 +- .../ServiceReferenceMetricSpanListener.java | 26 +++---- .../ServiceReferenceMetric.java | 75 ++++++------------- .../ServiceReferenceMetricTable.java | 13 ++-- ...erviceReferenceEsMetricPersistenceDAO.java | 37 ++++----- .../es/dao/ServiceReferenceEsUIDAO.java | 35 ++++----- ... ServiceReferenceMetricEsTableDefine.java} | 17 ++--- .../resources/META-INF/defines/storage.define | 2 +- ...erviceReferenceH2MetricPersistenceDAO.java | 37 ++++----- .../h2/dao/ServiceReferenceH2UIDAO.java | 31 +++----- ... ServiceReferenceMetricH2TableDefine.java} | 17 ++--- .../resources/META-INF/defines/storage.define | 2 +- .../ui/service/ServiceTreeService.java | 13 ++-- 17 files changed, 117 insertions(+), 198 deletions(-) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/{serviceref => service}/ServiceReferenceMetric.java (63%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/{serviceref => service}/ServiceReferenceMetricTable.java (71%) rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/{ServiceReferenceEsTableDefine.java => ServiceReferenceMetricEsTableDefine.java} (70%) rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/{ServiceReferenceH2TableDefine.java => ServiceReferenceMetricH2TableDefine.java} (71%) diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java index d2f3b42e1..446faed81 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java @@ -54,7 +54,7 @@ import org.skywalking.apm.collector.storage.table.instance.InstanceMetric; import org.skywalking.apm.collector.storage.table.segment.Segment; import org.skywalking.apm.collector.storage.table.segment.SegmentCost; import org.skywalking.apm.collector.storage.table.service.ServiceEntry; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetric; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; import org.skywalking.apm.collector.stream.worker.base.WorkerCreateListener; /** diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java index 48a734b62..24118322a 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.storage.table.register.Application; import org.skywalking.apm.collector.storage.table.register.Instance; import org.skywalking.apm.collector.storage.table.register.ServiceName; import org.skywalking.apm.collector.storage.table.service.ServiceEntry; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetric; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricAggregationWorker.java index 8664cf534..82f0d4728 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricAggregationWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricAggregationWorker.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.agent.stream.worker.trace.service; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetric; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricPersistenceWorker.java index 6331fa964..fca80b4fe 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricPersistenceWorker.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.StorageModule; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IServiceReferenceMetricPersistenceDAO; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetric; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricRemoteWorker.java index 3bbd31f26..239a1e4f3 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricRemoteWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricRemoteWorker.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agent.stream.worker.trace.service; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.remote.service.RemoteSenderService; import org.skywalking.apm.collector.remote.service.Selector; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetric; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.base.WorkerException; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricSpanListener.java index e6bb13ca0..00ad0ffaa 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricSpanListener.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricSpanListener.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.core.graph.Graph; import org.skywalking.apm.collector.core.graph.GraphManager; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetric; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,20 +72,15 @@ public class ServiceReferenceMetricSpanListener implements FirstSpanListener, En private void calculateCost(ServiceReferenceMetric serviceReferenceMetric, long startTime, long endTime, boolean isError) { - long cost = endTime - startTime; - if (cost <= 1000 && !isError) { - serviceReferenceMetric.setS1Lte(1L); - } else if (1000 < cost && cost <= 3000 && !isError) { - serviceReferenceMetric.setS3Lte(1L); - } else if (3000 < cost && cost <= 5000 && !isError) { - serviceReferenceMetric.setS5Lte(1L); - } else if (5000 < cost && !isError) { - serviceReferenceMetric.setS5Gt(1L); - } else { - serviceReferenceMetric.setError(1L); + long duration = endTime - startTime; + + serviceReferenceMetric.setCalls(1L); + serviceReferenceMetric.setDurationSum(duration); + + if (isError) { + serviceReferenceMetric.setErrorCalls(1L); + serviceReferenceMetric.setErrorDurationSum(duration); } - serviceReferenceMetric.setSummary(1L); - serviceReferenceMetric.setCostSummary(cost); } @Override public void build() { @@ -114,7 +109,8 @@ public class ServiceReferenceMetricSpanListener implements FirstSpanListener, En } } - private void sendToAggregationWorker(ServiceReferenceMetric serviceReferenceMetric, int entryServiceId, int frontServiceId, + private void sendToAggregationWorker(ServiceReferenceMetric serviceReferenceMetric, int entryServiceId, + int frontServiceId, int behindServiceId) { StringBuilder idBuilder = new StringBuilder(); idBuilder.append(timeBucket).append(Const.ID_SPLIT); diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceMetric.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetric.java similarity index 63% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceMetric.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetric.java index 9d7b5d8ca..2ac4737fb 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceMetric.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetric.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.table.serviceref; +package org.skywalking.apm.collector.storage.table.service; import org.skywalking.apm.collector.core.data.Column; import org.skywalking.apm.collector.core.data.Data; @@ -34,16 +34,15 @@ public class ServiceReferenceMetric extends Data { }; private static final Column[] LONG_COLUMNS = { - new Column(ServiceReferenceMetricTable.COLUMN_S1_LTE, new AddOperation()), - new Column(ServiceReferenceMetricTable.COLUMN_S3_LTE, new AddOperation()), - new Column(ServiceReferenceMetricTable.COLUMN_S5_LTE, new AddOperation()), - new Column(ServiceReferenceMetricTable.COLUMN_S5_GT, new AddOperation()), - new Column(ServiceReferenceMetricTable.COLUMN_SUMMARY, new AddOperation()), - new Column(ServiceReferenceMetricTable.COLUMN_ERROR, new AddOperation()), - new Column(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY, new AddOperation()), + new Column(ServiceReferenceMetricTable.COLUMN_CALLS, new AddOperation()), + new Column(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS, new AddOperation()), + new Column(ServiceReferenceMetricTable.COLUMN_DURATION_SUM, new AddOperation()), + new Column(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM, new AddOperation()), new Column(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET, new CoverOperation()), }; + private static final Column[] DOUBLE_COLUMNS = {}; + private static final Column[] INTEGER_COLUMNS = { new Column(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID, new NonOperation()), new Column(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID, new NonOperation()), @@ -51,17 +50,11 @@ public class ServiceReferenceMetric extends Data { }; private static final Column[] BOOLEAN_COLUMNS = {}; + private static final Column[] BYTE_COLUMNS = {}; public ServiceReferenceMetric(String id) { super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS); - setS1Lte(0L); - setS3Lte(0L); - setS5Lte(0L); - setS5Gt(0L); - setError(0L); - setSummary(0L); - setCostSummary(0L); } public Integer getEntryServiceId() { @@ -88,67 +81,43 @@ public class ServiceReferenceMetric extends Data { setDataInteger(2, behindServiceId); } - public Long getS1Lte() { + public long getCalls() { return getDataLong(0); } - public void setS1Lte(Long s1Lte) { - setDataLong(0, s1Lte); + public void setCalls(long calls) { + setDataLong(0, calls); } - public Long getS3Lte() { + public long getErrorCalls() { return getDataLong(1); } - public void setS3Lte(Long s3Lte) { - setDataLong(1, s3Lte); + public void setErrorCalls(long errorCalls) { + setDataLong(1, errorCalls); } - public Long getS5Lte() { + public long getDurationSum() { return getDataLong(2); } - public void setS5Lte(Long s5Lte) { - setDataLong(2, s5Lte); + public void setDurationSum(long durationSum) { + setDataLong(2, durationSum); } - public Long getS5Gt() { + public long getErrorDurationSum() { return getDataLong(3); } - public void setS5Gt(Long s5Gt) { - setDataLong(3, s5Gt); - } - - public Long getSummary() { - return getDataLong(4); - } - - public void setSummary(Long summary) { - setDataLong(4, summary); - } - - public Long getError() { - return getDataLong(5); - } - - public void setError(Long error) { - setDataLong(5, error); - } - - public Long getCostSummary() { - return getDataLong(6); - } - - public void setCostSummary(Long costSummary) { - setDataLong(6, costSummary); + public void setErrorDurationSum(long errorDurationSum) { + setDataLong(3, errorDurationSum); } public Long getTimeBucket() { - return getDataLong(7); + return getDataLong(4); } public void setTimeBucket(Long timeBucket) { - setDataLong(7, timeBucket); + setDataLong(4, timeBucket); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetricTable.java similarity index 71% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceMetricTable.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetricTable.java index 70452d9a3..1fcc2054f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetricTable.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.table.serviceref; +package org.skywalking.apm.collector.storage.table.service; import org.skywalking.apm.collector.core.data.CommonTable; @@ -28,11 +28,8 @@ public class ServiceReferenceMetricTable extends CommonTable { public static final String COLUMN_ENTRY_SERVICE_ID = "entry_service_id"; public static final String COLUMN_FRONT_SERVICE_ID = "front_service_id"; public static final String COLUMN_BEHIND_SERVICE_ID = "behind_service_id"; - public static final String COLUMN_S1_LTE = "s1_lte"; - public static final String COLUMN_S3_LTE = "s3_lte"; - public static final String COLUMN_S5_LTE = "s5_lte"; - public static final String COLUMN_S5_GT = "s5_gt"; - public static final String COLUMN_SUMMARY = "summary"; - public static final String COLUMN_COST_SUMMARY = "cost_summary"; - public static final String COLUMN_ERROR = "error"; + 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"; } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsMetricPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsMetricPersistenceDAO.java index ccb455514..11aeaccea 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsMetricPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsMetricPersistenceDAO.java @@ -29,8 +29,8 @@ import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.storage.dao.IServiceReferenceMetricPersistenceDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetric; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetricTable; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetricTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,13 +53,10 @@ public class ServiceReferenceEsMetricPersistenceDAO extends EsDAO implements ISe serviceReferenceMetric.setEntryServiceId(((Number)source.get(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID)).intValue()); serviceReferenceMetric.setFrontServiceId(((Number)source.get(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID)).intValue()); serviceReferenceMetric.setBehindServiceId(((Number)source.get(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID)).intValue()); - serviceReferenceMetric.setS1Lte(((Number)source.get(ServiceReferenceMetricTable.COLUMN_S1_LTE)).longValue()); - serviceReferenceMetric.setS3Lte(((Number)source.get(ServiceReferenceMetricTable.COLUMN_S3_LTE)).longValue()); - serviceReferenceMetric.setS5Lte(((Number)source.get(ServiceReferenceMetricTable.COLUMN_S5_LTE)).longValue()); - serviceReferenceMetric.setS5Gt(((Number)source.get(ServiceReferenceMetricTable.COLUMN_S5_GT)).longValue()); - serviceReferenceMetric.setSummary(((Number)source.get(ServiceReferenceMetricTable.COLUMN_SUMMARY)).longValue()); - serviceReferenceMetric.setError(((Number)source.get(ServiceReferenceMetricTable.COLUMN_ERROR)).longValue()); - serviceReferenceMetric.setCostSummary(((Number)source.get(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY)).longValue()); + serviceReferenceMetric.setCalls(((Number)source.get(ServiceReferenceMetricTable.COLUMN_CALLS)).longValue()); + serviceReferenceMetric.setErrorCalls(((Number)source.get(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS)).longValue()); + serviceReferenceMetric.setDurationSum(((Number)source.get(ServiceReferenceMetricTable.COLUMN_DURATION_SUM)).longValue()); + serviceReferenceMetric.setErrorDurationSum(((Number)source.get(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM)).longValue()); serviceReferenceMetric.setTimeBucket(((Number)source.get(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET)).longValue()); return serviceReferenceMetric; } else { @@ -72,13 +69,10 @@ public class ServiceReferenceEsMetricPersistenceDAO extends EsDAO implements ISe source.put(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID, data.getEntryServiceId()); source.put(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID, data.getFrontServiceId()); source.put(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID, data.getBehindServiceId()); - source.put(ServiceReferenceMetricTable.COLUMN_S1_LTE, data.getS1Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S3_LTE, data.getS3Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S5_LTE, data.getS5Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S5_GT, data.getS5Gt()); - source.put(ServiceReferenceMetricTable.COLUMN_SUMMARY, data.getSummary()); - source.put(ServiceReferenceMetricTable.COLUMN_ERROR, data.getError()); - source.put(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY, data.getCostSummary()); + source.put(ServiceReferenceMetricTable.COLUMN_CALLS, data.getCalls()); + source.put(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS, data.getErrorCalls()); + source.put(ServiceReferenceMetricTable.COLUMN_DURATION_SUM, data.getDurationSum()); + source.put(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM, data.getErrorDurationSum()); source.put(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); return getClient().prepareIndex(ServiceReferenceMetricTable.TABLE, data.getId()).setSource(source); @@ -89,13 +83,10 @@ public class ServiceReferenceEsMetricPersistenceDAO extends EsDAO implements ISe source.put(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID, data.getEntryServiceId()); source.put(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID, data.getFrontServiceId()); source.put(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID, data.getBehindServiceId()); - source.put(ServiceReferenceMetricTable.COLUMN_S1_LTE, data.getS1Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S3_LTE, data.getS3Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S5_LTE, data.getS5Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S5_GT, data.getS5Gt()); - source.put(ServiceReferenceMetricTable.COLUMN_SUMMARY, data.getSummary()); - source.put(ServiceReferenceMetricTable.COLUMN_ERROR, data.getError()); - source.put(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY, data.getCostSummary()); + source.put(ServiceReferenceMetricTable.COLUMN_CALLS, data.getCalls()); + source.put(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS, data.getErrorCalls()); + source.put(ServiceReferenceMetricTable.COLUMN_DURATION_SUM, data.getDurationSum()); + source.put(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM, data.getErrorDurationSum()); source.put(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); return getClient().prepareUpdate(ServiceReferenceMetricTable.TABLE, data.getId()).setDoc(source); diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java index 389579364..906e98545 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java @@ -34,7 +34,7 @@ import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.storage.dao.IServiceReferenceUIDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetricTable; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetricTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,13 +69,10 @@ public class ServiceReferenceEsUIDAO extends EsDAO implements IServiceReferenceU private Map load(SearchRequestBuilder searchRequestBuilder) { searchRequestBuilder.addAggregation(AggregationBuilders.terms(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID).field(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID).size(100) .subAggregation(AggregationBuilders.terms(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID).field(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID).size(100) - .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_S1_LTE).field(ServiceReferenceMetricTable.COLUMN_S1_LTE)) - .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_S3_LTE).field(ServiceReferenceMetricTable.COLUMN_S3_LTE)) - .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_S5_LTE).field(ServiceReferenceMetricTable.COLUMN_S5_LTE)) - .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_S5_GT).field(ServiceReferenceMetricTable.COLUMN_S5_GT)) - .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_ERROR).field(ServiceReferenceMetricTable.COLUMN_ERROR)) - .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_SUMMARY).field(ServiceReferenceMetricTable.COLUMN_SUMMARY)) - .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY).field(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY)))); + .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_CALLS).field(ServiceReferenceMetricTable.COLUMN_CALLS)) + .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS).field(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS)) + .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_DURATION_SUM).field(ServiceReferenceMetricTable.COLUMN_DURATION_SUM)) + .subAggregation(AggregationBuilders.sum(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM).field(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM)))); Map serviceReferenceMap = new LinkedHashMap<>(); @@ -98,24 +95,18 @@ public class ServiceReferenceEsUIDAO extends EsDAO implements IServiceReferenceU for (Terms.Bucket behindServiceIdBucket : behindServiceIdTerms.getBuckets()) { int behindServiceId = behindServiceIdBucket.getKeyAsNumber().intValue(); if (behindServiceId != 0) { - Sum s1LteSum = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_S1_LTE); - Sum s3LteSum = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_S3_LTE); - Sum s5LteSum = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_S5_LTE); - Sum s5GtSum = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_S5_GT); - Sum error = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_ERROR); - Sum summary = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_SUMMARY); - Sum costSum = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY); + Sum calls = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_CALLS); + Sum errorCalls = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS); + Sum durationSum = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_DURATION_SUM); + Sum errorDurationSum = behindServiceIdBucket.getAggregations().get(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM); JsonObject serviceReference = new JsonObject(); serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID), frontServiceId); serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID), behindServiceId); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S1_LTE), (long)s1LteSum.getValue()); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S3_LTE), (long)s3LteSum.getValue()); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S5_LTE), (long)s5LteSum.getValue()); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S5_GT), (long)s5GtSum.getValue()); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR), (long)error.getValue()); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_SUMMARY), (long)summary.getValue()); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY), (long)costSum.getValue()); + serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_CALLS), (long)calls.getValue()); + serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS), (long)errorCalls.getValue()); + serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_DURATION_SUM), (long)durationSum.getValue()); + serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM), (long)errorDurationSum.getValue()); String id = serviceReference.get(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID)) + Const.ID_SPLIT + serviceReference.get(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID)); serviceReferenceMap.put(id, serviceReference); diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceMetricEsTableDefine.java similarity index 70% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceMetricEsTableDefine.java index 3c3eb64fd..b40866f2c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceMetricEsTableDefine.java @@ -20,14 +20,14 @@ package org.skywalking.apm.collector.storage.es.define; import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetricTable; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetricTable; /** * @author peng-yongsheng */ -public class ServiceReferenceEsTableDefine extends ElasticSearchTableDefine { +public class ServiceReferenceMetricEsTableDefine extends ElasticSearchTableDefine { - public ServiceReferenceEsTableDefine() { + public ServiceReferenceMetricEsTableDefine() { super(ServiceReferenceMetricTable.TABLE); } @@ -40,13 +40,10 @@ public class ServiceReferenceEsTableDefine extends ElasticSearchTableDefine { addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID, ElasticSearchColumnDefine.Type.Integer.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID, ElasticSearchColumnDefine.Type.Integer.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_S1_LTE, ElasticSearchColumnDefine.Type.Long.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_S3_LTE, ElasticSearchColumnDefine.Type.Long.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_S5_LTE, ElasticSearchColumnDefine.Type.Long.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_S5_GT, ElasticSearchColumnDefine.Type.Long.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_SUMMARY, ElasticSearchColumnDefine.Type.Long.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_ERROR, ElasticSearchColumnDefine.Type.Long.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY, ElasticSearchColumnDefine.Type.Long.name())); + addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_CALLS, ElasticSearchColumnDefine.Type.Long.name())); + addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS, ElasticSearchColumnDefine.Type.Long.name())); + addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_DURATION_SUM, ElasticSearchColumnDefine.Type.Long.name())); + addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM, ElasticSearchColumnDefine.Type.Long.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET, ElasticSearchColumnDefine.Type.Long.name())); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define index 0f33bab37..ef6bafbca 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define @@ -13,4 +13,4 @@ org.skywalking.apm.collector.storage.es.define.ApplicationReferenceMetricEsTable org.skywalking.apm.collector.storage.es.define.SegmentCostEsTableDefine org.skywalking.apm.collector.storage.es.define.SegmentEsTableDefine org.skywalking.apm.collector.storage.es.define.ServiceEntryEsTableDefine -org.skywalking.apm.collector.storage.es.define.ServiceReferenceEsTableDefine \ No newline at end of file +org.skywalking.apm.collector.storage.es.define.ServiceReferenceMetricEsTableDefine \ No newline at end of file diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2MetricPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2MetricPersistenceDAO.java index 0f1a94a3d..2887826a0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2MetricPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2MetricPersistenceDAO.java @@ -30,8 +30,8 @@ import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; import org.skywalking.apm.collector.storage.dao.IServiceReferenceMetricPersistenceDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetric; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetricTable; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetricTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,13 +58,10 @@ public class ServiceReferenceH2MetricPersistenceDAO extends H2DAO implements ISe serviceReferenceMetric.setEntryServiceId(rs.getInt(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID)); serviceReferenceMetric.setFrontServiceId(rs.getInt(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID)); serviceReferenceMetric.setBehindServiceId(rs.getInt(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID)); - serviceReferenceMetric.setS1Lte(rs.getLong(ServiceReferenceMetricTable.COLUMN_S1_LTE)); - serviceReferenceMetric.setS3Lte(rs.getLong(ServiceReferenceMetricTable.COLUMN_S3_LTE)); - serviceReferenceMetric.setS5Lte(rs.getLong(ServiceReferenceMetricTable.COLUMN_S5_LTE)); - serviceReferenceMetric.setS5Gt(rs.getLong(ServiceReferenceMetricTable.COLUMN_S5_GT)); - serviceReferenceMetric.setSummary(rs.getLong(ServiceReferenceMetricTable.COLUMN_SUMMARY)); - serviceReferenceMetric.setError(rs.getLong(ServiceReferenceMetricTable.COLUMN_ERROR)); - serviceReferenceMetric.setCostSummary(rs.getLong(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY)); + serviceReferenceMetric.setCalls(rs.getLong(ServiceReferenceMetricTable.COLUMN_CALLS)); + serviceReferenceMetric.setErrorCalls(rs.getLong(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS)); + serviceReferenceMetric.setDurationSum(rs.getLong(ServiceReferenceMetricTable.COLUMN_DURATION_SUM)); + serviceReferenceMetric.setErrorDurationSum(rs.getLong(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM)); serviceReferenceMetric.setTimeBucket(rs.getLong(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET)); return serviceReferenceMetric; } @@ -82,13 +79,10 @@ public class ServiceReferenceH2MetricPersistenceDAO extends H2DAO implements ISe source.put(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID, data.getEntryServiceId()); source.put(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID, data.getFrontServiceId()); source.put(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID, data.getBehindServiceId()); - source.put(ServiceReferenceMetricTable.COLUMN_S1_LTE, data.getS1Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S3_LTE, data.getS3Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S5_LTE, data.getS5Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S5_GT, data.getS5Gt()); - source.put(ServiceReferenceMetricTable.COLUMN_SUMMARY, data.getSummary()); - source.put(ServiceReferenceMetricTable.COLUMN_ERROR, data.getError()); - source.put(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY, data.getCostSummary()); + source.put(ServiceReferenceMetricTable.COLUMN_CALLS, data.getCalls()); + source.put(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS, data.getErrorCalls()); + source.put(ServiceReferenceMetricTable.COLUMN_DURATION_SUM, data.getDurationSum()); + source.put(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM, data.getErrorDurationSum()); source.put(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); String sql = SqlBuilder.buildBatchInsertSql(ServiceReferenceMetricTable.TABLE, source.keySet()); @@ -104,13 +98,10 @@ public class ServiceReferenceH2MetricPersistenceDAO extends H2DAO implements ISe source.put(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID, data.getEntryServiceId()); source.put(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID, data.getFrontServiceId()); source.put(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID, data.getBehindServiceId()); - source.put(ServiceReferenceMetricTable.COLUMN_S1_LTE, data.getS1Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S3_LTE, data.getS3Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S5_LTE, data.getS5Lte()); - source.put(ServiceReferenceMetricTable.COLUMN_S5_GT, data.getS5Gt()); - source.put(ServiceReferenceMetricTable.COLUMN_SUMMARY, data.getSummary()); - source.put(ServiceReferenceMetricTable.COLUMN_ERROR, data.getError()); - source.put(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY, data.getCostSummary()); + source.put(ServiceReferenceMetricTable.COLUMN_CALLS, data.getCalls()); + source.put(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS, data.getErrorCalls()); + source.put(ServiceReferenceMetricTable.COLUMN_DURATION_SUM, data.getDurationSum()); + source.put(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM, data.getErrorDurationSum()); source.put(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); String sql = SqlBuilder.buildBatchUpdateSql(ServiceReferenceMetricTable.TABLE, source.keySet(), ServiceReferenceMetricTable.COLUMN_ID); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java index 46c5c6c23..a601d8165 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; import org.skywalking.apm.collector.storage.dao.IServiceReferenceUIDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetricTable; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetricTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ public class ServiceReferenceH2UIDAO extends H2DAO implements IServiceReferenceU } private static final String GET_SRV_REF_LOAD1 = "select {3}, {4}, sum({5}) as {5}, sum({6}) as {6}, sum({7}) as {7}" + - ",sum({8}) as {8}, sum({9}) as {9}, sum({10}) as {10}, sum({11}) as {11} from {0} where {1} >= ? and {1} <= ? and {2} = ? group by {3}, {4}"; + ",sum({8}) as {8} from {0} where {1} >= ? and {1} <= ? and {2} = ? group by {3}, {4}"; @Override public Map load(int entryServiceId, long startTime, long endTime) { @@ -54,9 +54,8 @@ public class ServiceReferenceH2UIDAO extends H2DAO implements IServiceReferenceU String sql = SqlBuilder.buildSql(GET_SRV_REF_LOAD1, ServiceReferenceMetricTable.TABLE, ServiceReferenceMetricTable.COLUMN_TIME_BUCKET, ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID, ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID, ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID, - ServiceReferenceMetricTable.COLUMN_S1_LTE, ServiceReferenceMetricTable.COLUMN_S3_LTE, ServiceReferenceMetricTable.COLUMN_S5_LTE, - ServiceReferenceMetricTable.COLUMN_S5_GT, ServiceReferenceMetricTable.COLUMN_ERROR, ServiceReferenceMetricTable.COLUMN_SUMMARY, - ServiceReferenceMetricTable.COLUMN_COST_SUMMARY); + ServiceReferenceMetricTable.COLUMN_CALLS, ServiceReferenceMetricTable.COLUMN_ERROR_CALLS, ServiceReferenceMetricTable.COLUMN_DURATION_SUM, + ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM); Object[] params = new Object[] {startTime, endTime, entryServiceId}; return load(client, params, sql); @@ -81,24 +80,18 @@ public class ServiceReferenceH2UIDAO extends H2DAO implements IServiceReferenceU try { int behindServiceId = rs.getInt(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID); if (behindServiceId != 0) { - long s1LteSum = rs.getLong(ServiceReferenceMetricTable.COLUMN_S1_LTE); - long s3LteSum = rs.getLong(ServiceReferenceMetricTable.COLUMN_S3_LTE); - long s5LteSum = rs.getLong(ServiceReferenceMetricTable.COLUMN_S5_LTE); - long s5GtSum = rs.getLong(ServiceReferenceMetricTable.COLUMN_S5_GT); - long error = rs.getLong(ServiceReferenceMetricTable.COLUMN_ERROR); - long summary = rs.getLong(ServiceReferenceMetricTable.COLUMN_SUMMARY); - long costSum = rs.getLong(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY); + long calls = rs.getLong(ServiceReferenceMetricTable.COLUMN_CALLS); + long errorCalls = rs.getLong(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS); + long durationSum = rs.getLong(ServiceReferenceMetricTable.COLUMN_DURATION_SUM); + long errorDurationSum = rs.getLong(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM); JsonObject serviceReference = new JsonObject(); serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID), frontServiceId); serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID), behindServiceId); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S1_LTE), s1LteSum); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S3_LTE), s3LteSum); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S5_LTE), s5LteSum); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S5_GT), s5GtSum); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR), error); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_SUMMARY), summary); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY), costSum); + serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_CALLS), calls); + serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS), errorCalls); + serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_DURATION_SUM), durationSum); + serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM), errorDurationSum); String id = serviceReference.get(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID)) + Const.ID_SPLIT + serviceReference.get(ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID)); serviceReferenceMap.put(id, serviceReference); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceMetricH2TableDefine.java similarity index 71% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceMetricH2TableDefine.java index 1b747a824..52f071676 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceMetricH2TableDefine.java @@ -20,14 +20,14 @@ package org.skywalking.apm.collector.storage.h2.define; import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetricTable; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetricTable; /** * @author peng-yongsheng */ -public class ServiceReferenceH2TableDefine extends H2TableDefine { +public class ServiceReferenceMetricH2TableDefine extends H2TableDefine { - public ServiceReferenceH2TableDefine() { + public ServiceReferenceMetricH2TableDefine() { super(ServiceReferenceMetricTable.TABLE); } @@ -36,13 +36,10 @@ public class ServiceReferenceH2TableDefine extends H2TableDefine { addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_ENTRY_SERVICE_ID, H2ColumnDefine.Type.Int.name())); addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_FRONT_SERVICE_ID, H2ColumnDefine.Type.Int.name())); addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_BEHIND_SERVICE_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_S1_LTE, H2ColumnDefine.Type.Bigint.name())); - addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_S3_LTE, H2ColumnDefine.Type.Bigint.name())); - addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_S5_LTE, H2ColumnDefine.Type.Bigint.name())); - addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_S5_GT, H2ColumnDefine.Type.Bigint.name())); - addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_SUMMARY, H2ColumnDefine.Type.Bigint.name())); - addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_ERROR, H2ColumnDefine.Type.Bigint.name())); - addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY, H2ColumnDefine.Type.Bigint.name())); + addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_CALLS, H2ColumnDefine.Type.Bigint.name())); + addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS, H2ColumnDefine.Type.Bigint.name())); + addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_DURATION_SUM, H2ColumnDefine.Type.Bigint.name())); + addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM, H2ColumnDefine.Type.Bigint.name())); addColumn(new H2ColumnDefine(ServiceReferenceMetricTable.COLUMN_TIME_BUCKET, H2ColumnDefine.Type.Bigint.name())); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define index 35df381f1..2eb975d50 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define @@ -13,4 +13,4 @@ org.skywalking.apm.collector.storage.h2.define.ApplicationReferenceMetricH2Table org.skywalking.apm.collector.storage.h2.define.SegmentCostH2TableDefine org.skywalking.apm.collector.storage.h2.define.SegmentH2TableDefine org.skywalking.apm.collector.storage.h2.define.ServiceEntryH2TableDefine -org.skywalking.apm.collector.storage.h2.define.ServiceReferenceH2TableDefine \ No newline at end of file +org.skywalking.apm.collector.storage.h2.define.ServiceReferenceMetricH2TableDefine \ No newline at end of file diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java index dfdeff623..df3bab0e1 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java @@ -34,7 +34,7 @@ import org.skywalking.apm.collector.storage.StorageModule; import org.skywalking.apm.collector.storage.dao.IServiceEntryUIDAO; import org.skywalking.apm.collector.storage.dao.IServiceReferenceUIDAO; import org.skywalking.apm.collector.storage.table.service.ServiceEntryTable; -import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceMetricTable; +import org.skywalking.apm.collector.storage.table.service.ServiceReferenceMetricTable; /** * @author peng-yongsheng @@ -125,13 +125,10 @@ public class ServiceTreeService { if (serviceReferenceMap.containsKey(id)) { JsonObject reference = serviceReferenceMap.get(id); - add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S1_LTE)); - add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S3_LTE)); - add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S5_LTE)); - add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_S5_GT)); - add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR)); - add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_SUMMARY)); - add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_COST_SUMMARY)); + add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_CALLS)); + add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR_CALLS)); + add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_DURATION_SUM)); + add(reference, serviceReference, ColumnNameUtils.INSTANCE.rename(ServiceReferenceMetricTable.COLUMN_ERROR_DURATION_SUM)); } else { serviceReferenceMap.put(id, serviceReference); }