This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch id0-refactor
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/id0-refactor by this push:
new eb8b32b07e Finish code level changes.
eb8b32b07e is described below
commit eb8b32b07ef0bd85ae6164cef711dd7961734e5e
Author: Wu Sheng <[email protected]>
AuthorDate: Wed Dec 14 21:31:00 2022 +0800
Finish code level changes.
---
.../server/exporter/provider/kafka/log/KafkaLogExporter.java | 2 +-
.../oal-rt/src/main/resources/code-templates/metrics/id.ftl | 2 +-
.../oap/server/core/alarm/provider/RunningRuleTest.java | 4 ++--
.../server/core/analysis/worker/MetricsAggregateWorker.java | 3 ---
.../server/library/datacarrier/consumer/BulkConsumePool.java | 2 +-
.../library/datacarrier/consumer/MultipleChannelsConsumer.java | 2 +-
.../server/storage/plugin/banyandb/BanyanDBNoneStreamDAO.java | 2 +-
.../plugin/banyandb/BanyanDBUITemplateManagementDAO.java | 10 +++++-----
.../storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java | 6 +++---
.../storage/plugin/banyandb/stream/BanyanDBRecordDAO.java | 2 +-
.../storage/plugin/elasticsearch/base/ManagementEsDAO.java | 2 +-
.../server/storage/plugin/elasticsearch/base/MetricsEsDAO.java | 8 ++++----
.../storage/plugin/elasticsearch/base/NoneStreamEsDAO.java | 2 +-
.../server/storage/plugin/elasticsearch/base/RecordEsDAO.java | 2 +-
.../storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java | 6 +++---
.../plugin/elasticsearch/query/UITemplateManagementEsDAO.java | 10 +++++-----
.../storage/plugin/jdbc/common/dao/JDBCManagementDAO.java | 2 +-
.../server/storage/plugin/jdbc/common/dao/JDBCMetricsDAO.java | 2 +-
.../server/storage/plugin/jdbc/common/dao/JDBCSQLExecutor.java | 6 +++---
.../storage/plugin/jdbc/shardingsphere/ServiceCpmMetrics.java | 8 +++++---
20 files changed, 41 insertions(+), 42 deletions(-)
diff --git
a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/kafka/log/KafkaLogExporter.java
b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/kafka/log/KafkaLogExporter.java
index 095a364ee7..bc54fd7360 100644
---
a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/kafka/log/KafkaLogExporter.java
+++
b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/kafka/log/KafkaLogExporter.java
@@ -101,7 +101,7 @@ public class KafkaLogExporter extends KafkaExportProducer
implements LogExportSe
LogData logData = transLogData(logRecord);
ProducerRecord<String, Bytes> record = new
ProducerRecord<>(
setting.getKafkaTopicLog(),
- logRecord.id(),
+ logRecord.id().build(),
Bytes.wrap(logData.toByteArray())
);
super.getProducer().send(record, (metadata, ex) -> {
diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/id.ftl
b/oap-server/oal-rt/src/main/resources/code-templates/metrics/id.ftl
index 6928897c3c..55cb3c87a7 100644
--- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/id.ftl
+++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/id.ftl
@@ -1,4 +1,4 @@
-protected String id0() {
+protected org.apache.skywalking.oap.server.core.storage.StorageID id0() {
org.apache.skywalking.oap.server.core.storage.StorageID id = new
org.apache.skywalking.oap.server.core.storage.StorageID().append(TIME_BUCKET,
getTimeBucket());
<#list fieldsFromSource as sourceField>
<#if sourceField.isID()>
diff --git
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
index 048076cb6a..ed678430fe 100644
---
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
+++
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
@@ -430,7 +430,7 @@ public class RunningRuleTest {
private int value;
@Override
- protected String id0() {
+ protected StorageID id0() {
return null;
}
@@ -487,7 +487,7 @@ public class RunningRuleTest {
}
@Override
- protected String id0() {
+ protected StorageID id0() {
return null;
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
index 61576fc9cf..698341144f 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
@@ -118,9 +118,6 @@ public class MetricsAggregateWorker extends
AbstractWorker<Metrics> {
if (currentTime - lastSendTime > l1FlushPeriod) {
mergeDataCache.read().forEach(
data -> {
- if (log.isDebugEnabled()) {
- log.debug(data.toString());
- }
nextWorker.in(data);
}
);
diff --git
a/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/BulkConsumePool.java
b/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/BulkConsumePool.java
index b881d50531..9d5bb0f615 100644
---
a/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/BulkConsumePool.java
+++
b/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/BulkConsumePool.java
@@ -36,7 +36,7 @@ public class BulkConsumePool implements ConsumerPool {
public BulkConsumePool(String name, int size, long consumeCycle) {
size = EnvUtil.getInt(name + "_THREAD", size);
- allConsumers = new ArrayList<MultipleChannelsConsumer>(size);
+ allConsumers = new ArrayList<>(size);
for (int i = 0; i < size; i++) {
MultipleChannelsConsumer multipleChannelsConsumer = new
MultipleChannelsConsumer("DataCarrier." + name + ".BulkConsumePool." + i +
".Thread", consumeCycle);
multipleChannelsConsumer.setDaemon(true);
diff --git
a/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/MultipleChannelsConsumer.java
b/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/MultipleChannelsConsumer.java
index db60f0d098..69e2732f20 100644
---
a/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/MultipleChannelsConsumer.java
+++
b/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/MultipleChannelsConsumer.java
@@ -95,7 +95,7 @@ public class MultipleChannelsConsumer extends Thread {
public void addNewTarget(Channels channels, IConsumer consumer) {
Group group = new Group(channels, consumer);
// Recreate the new list to avoid change list while the list is used
in consuming.
- ArrayList<Group> newList = new ArrayList<Group>();
+ ArrayList<Group> newList = new ArrayList<>();
for (Group target : consumeTargets) {
newList.add(target);
}
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBNoneStreamDAO.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBNoneStreamDAO.java
index 46edb436ab..25f698a8fe 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBNoneStreamDAO.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBNoneStreamDAO.java
@@ -47,7 +47,7 @@ public class BanyanDBNoneStreamDAO extends
AbstractDAO<BanyanDBStorageClient> im
StreamWrite streamWrite = new StreamWrite(
schema.getMetadata().getGroup(), // group name
schema.getMetadata().name(), // stream-name
- noneStream.id() // identity
+ noneStream.id().build() // identity
); // set timestamp inside `BanyanDBConverter.StreamToStorage`
Convert2Storage<StreamWrite> convert2Storage = new
BanyanDBConverter.StreamToStorage(schema, streamWrite);
storageBuilder.entity2Storage(noneStream, convert2Storage);
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBUITemplateManagementDAO.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBUITemplateManagementDAO.java
index d616ed032e..bbbb4b183f 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBUITemplateManagementDAO.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBUITemplateManagementDAO.java
@@ -101,11 +101,11 @@ public class BanyanDBUITemplateManagementDAO extends
AbstractBanyanDBDAO impleme
this.getClient().define(applyStatus(uiTemplate));
return TemplateChangeStatus.builder()
.status(true)
- .id(uiTemplate.id())
+ .id(uiTemplate.id().build())
.build();
} catch (IOException ioEx) {
log.error("fail to disable the template", ioEx);
- return
TemplateChangeStatus.builder().status(false).id(uiTemplate.id()).message("Can't
disable the template")
+ return
TemplateChangeStatus.builder().status(false).id(uiTemplate.id().build()).message("Can't
disable the template")
.build();
}
}
@@ -133,7 +133,7 @@ public class BanyanDBUITemplateManagementDAO extends
AbstractBanyanDBDAO impleme
}
public Property applyAll(UITemplate uiTemplate) {
- return Property.create(GROUP, UITemplate.INDEX_NAME, uiTemplate.id())
+ return Property.create(GROUP, UITemplate.INDEX_NAME,
uiTemplate.id().build())
.addTag(TagAndValue.newStringTag(UITemplate.CONFIGURATION,
uiTemplate.getConfiguration()))
.addTag(TagAndValue.newLongTag(UITemplate.DISABLED,
uiTemplate.getDisabled()))
.addTag(TagAndValue.newLongTag(UITemplate.UPDATE_TIME,
uiTemplate.getUpdateTime()))
@@ -147,7 +147,7 @@ public class BanyanDBUITemplateManagementDAO extends
AbstractBanyanDBDAO impleme
* @return new property (patch) to be applied
*/
public Property applyStatus(UITemplate uiTemplate) {
- return Property.create(GROUP, UITemplate.INDEX_NAME, uiTemplate.id())
+ return Property.create(GROUP, UITemplate.INDEX_NAME,
uiTemplate.id().build())
.addTag(TagAndValue.newLongTag(UITemplate.DISABLED,
uiTemplate.getDisabled()))
.addTag(TagAndValue.newLongTag(UITemplate.UPDATE_TIME,
uiTemplate.getUpdateTime()))
.build();
@@ -160,7 +160,7 @@ public class BanyanDBUITemplateManagementDAO extends
AbstractBanyanDBDAO impleme
* @return new property (patch) to be applied
*/
public Property applyConfiguration(UITemplate uiTemplate) {
- return Property.create(GROUP, UITemplate.INDEX_NAME, uiTemplate.id())
+ return Property.create(GROUP, UITemplate.INDEX_NAME,
uiTemplate.id().build())
.addTag(TagAndValue.newStringTag(UITemplate.CONFIGURATION,
uiTemplate.getConfiguration()))
.addTag(TagAndValue.newLongTag(UITemplate.UPDATE_TIME,
uiTemplate.getUpdateTime()))
.build();
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java
index dbef1af363..758098eb63 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java
@@ -62,7 +62,7 @@ public class BanyanDBMetricsDAO extends AbstractBanyanDBDAO
implements IMetricsD
@Override
protected void apply(MeasureQuery query) {
for (final Metrics missCachedMetric : metrics) {
- query.or(id(missCachedMetric.id()));
+ query.or(id(missCachedMetric.id().build()));
}
}
});
@@ -89,7 +89,7 @@ public class BanyanDBMetricsDAO extends AbstractBanyanDBDAO
implements IMetricsD
TimeBucket.getTimestamp(metrics.getTimeBucket(),
model.getDownsampling())); // timestamp
final BanyanDBConverter.MeasureToStorage toStorage = new
BanyanDBConverter.MeasureToStorage(schema, measureWrite);
storageBuilder.entity2Storage(metrics, toStorage);
- toStorage.acceptID(metrics.id());
+ toStorage.acceptID(metrics.id().build());
return new BanyanDBMeasureInsertRequest(toStorage.obtain(), callback);
}
@@ -105,7 +105,7 @@ public class BanyanDBMetricsDAO extends AbstractBanyanDBDAO
implements IMetricsD
TimeBucket.getTimestamp(metrics.getTimeBucket(),
model.getDownsampling())); // timestamp
final BanyanDBConverter.MeasureToStorage toStorage = new
BanyanDBConverter.MeasureToStorage(schema, measureWrite);
storageBuilder.entity2Storage(metrics, toStorage);
- toStorage.acceptID(metrics.id());
+ toStorage.acceptID(metrics.id().build());
return new BanyanDBMeasureUpdateRequest(toStorage.obtain());
}
}
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBRecordDAO.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBRecordDAO.java
index ed04f7e1bf..74e2d48cc9 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBRecordDAO.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBRecordDAO.java
@@ -44,7 +44,7 @@ public class BanyanDBRecordDAO implements IRecordDAO {
StreamWrite streamWrite = new StreamWrite(
schema.getMetadata().getGroup(), // group name
model.getName(), // index-name
- record.id() // identity
+ record.id().build() // identity
); // set timestamp inside `BanyanDBConverter.StreamToStorage`
Convert2Storage<StreamWrite> convert2Storage = new
BanyanDBConverter.StreamToStorage(schema, streamWrite);
storageBuilder.entity2Storage(record, convert2Storage);
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ManagementEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ManagementEsDAO.java
index 9693c90c9b..f0d0a10387 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ManagementEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ManagementEsDAO.java
@@ -38,7 +38,7 @@ public class ManagementEsDAO extends EsDAO implements
IManagementDAO {
@Override
public void insert(Model model, ManagementData managementData) throws
IOException {
String tableName = IndexController.INSTANCE.getTableName(model);
- String docId = IndexController.INSTANCE.generateDocId(model,
managementData.id());
+ String docId = IndexController.INSTANCE.generateDocId(model,
managementData.id().build());
final boolean exist = getClient().existDoc(tableName, docId);
if (exist) {
return;
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
index 12319dae1a..75027a6fd5 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
@@ -65,7 +65,7 @@ public class MetricsEsDAO extends EsDAO implements
IMetricsDAO {
Map<String, List<String>> indexIdsGroup = new HashMap<>();
groupIndices.forEach((tableName, metricList) -> {
List<String> ids = metricList.stream()
- .map(item ->
IndexController.INSTANCE.generateDocId(model, item.id()))
+ .map(item ->
IndexController.INSTANCE.generateDocId(model, item.id().build()))
.collect(Collectors.toList());
indexIdsGroup.put(tableName, ids);
});
@@ -85,7 +85,7 @@ public class MetricsEsDAO extends EsDAO implements
IMetricsDAO {
});
groupIndices.forEach((tableName, metricList) -> {
List<String> ids = metricList.stream()
- .map(item ->
IndexController.INSTANCE.generateDocId(model, item.id()))
+ .map(item ->
IndexController.INSTANCE.generateDocId(model, item.id().build()))
.collect(Collectors.toList());
final SearchResponse response =
getClient().searchIDs(tableName, ids);
response.getHits().getHits().forEach(hit -> {
@@ -103,7 +103,7 @@ public class MetricsEsDAO extends EsDAO implements
IMetricsDAO {
storageBuilder.entity2Storage(metrics, toStorage);
Map<String, Object> builder =
IndexController.INSTANCE.appendTableColumn(model, toStorage.obtain());
String modelName = TimeSeriesUtils.writeIndexName(model,
metrics.getTimeBucket());
- String id = IndexController.INSTANCE.generateDocId(model,
metrics.id());
+ String id = IndexController.INSTANCE.generateDocId(model,
metrics.id().build());
return new
MetricIndexRequestWrapper(getClient().prepareInsert(modelName, id, builder),
callback);
}
@@ -114,7 +114,7 @@ public class MetricsEsDAO extends EsDAO implements
IMetricsDAO {
Map<String, Object> builder =
IndexController.INSTANCE.appendTableColumn(model,
toStorage.obtain());
String modelName = TimeSeriesUtils.writeIndexName(model,
metrics.getTimeBucket());
- String id = IndexController.INSTANCE.generateDocId(model,
metrics.id());
+ String id = IndexController.INSTANCE.generateDocId(model,
metrics.id().build());
return new
MetricIndexUpdateWrapper(getClient().prepareUpdate(modelName, id, builder),
callback);
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/NoneStreamEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/NoneStreamEsDAO.java
index 811923cbbb..7ec21a0ccb 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/NoneStreamEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/NoneStreamEsDAO.java
@@ -45,7 +45,7 @@ public class NoneStreamEsDAO extends EsDAO implements
INoneStreamDAO {
Map<String, Object> builder =
IndexController.INSTANCE.appendTableColumn(model,
toStorage.obtain());
String modelName = TimeSeriesUtils.writeIndexName(model,
noneStream.getTimeBucket());
- String id = IndexController.INSTANCE.generateDocId(model,
noneStream.id());
+ String id = IndexController.INSTANCE.generateDocId(model,
noneStream.id().build());
getClient().forceInsert(modelName, id, builder);
}
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java
index 264007a024..21ffbb675e 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java
@@ -42,7 +42,7 @@ public class RecordEsDAO extends EsDAO implements IRecordDAO {
storageBuilder.entity2Storage(record, toStorage);
Map<String, Object> builder =
IndexController.INSTANCE.appendTableColumn(model, toStorage.obtain());
String modelName = TimeSeriesUtils.writeIndexName(model,
record.getTimeBucket());
- String id = IndexController.INSTANCE.generateDocId(model, record.id());
+ String id = IndexController.INSTANCE.generateDocId(model,
record.id().build());
return getClient().prepareInsert(modelName, id, builder);
}
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
index cbce35e41a..a0462d45fb 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
@@ -228,7 +228,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
new EndpointTraffic.Builder().storage2Entity(new
ElasticSearchConverter.ToEntity(EndpointTraffic.INDEX_NAME, sourceAsMap));
Endpoint endpoint = new Endpoint();
- endpoint.setId(endpointTraffic.id());
+ endpoint.setId(endpointTraffic.id().build());
endpoint.setName(endpointTraffic.getName());
endpoints.add(endpoint);
}
@@ -388,7 +388,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
new InstanceTraffic.Builder().storage2Entity(new
ElasticSearchConverter.ToEntity(InstanceTraffic.INDEX_NAME, sourceAsMap));
ServiceInstance serviceInstance = new ServiceInstance();
- serviceInstance.setId(instanceTraffic.id());
+ serviceInstance.setId(instanceTraffic.id().build());
serviceInstance.setName(instanceTraffic.getName());
serviceInstance.setInstanceUUID(serviceInstance.getId());
@@ -420,7 +420,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
new ProcessTraffic.Builder().storage2Entity(new
ElasticSearchConverter.ToEntity(ProcessTraffic.INDEX_NAME, sourceAsMap));
Process process = new Process();
- process.setId(processTraffic.id());
+ process.setId(processTraffic.id().build());
process.setName(processTraffic.getName());
final String serviceId = processTraffic.getServiceId();
process.setServiceId(serviceId);
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/UITemplateManagementEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/UITemplateManagementEsDAO.java
index 14146e8df5..a0719597b1 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/UITemplateManagementEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/UITemplateManagementEsDAO.java
@@ -105,7 +105,7 @@ public class UITemplateManagementEsDAO extends EsDAO
implements UITemplateManage
final UITemplate.Builder builder = new UITemplate.Builder();
final UITemplate uiTemplate = setting.toEntity();
- final boolean exist = getClient().existDoc(UITemplate.INDEX_NAME,
uiTemplate.id());
+ final boolean exist = getClient().existDoc(UITemplate.INDEX_NAME,
uiTemplate.id().build());
if (exist) {
return
TemplateChangeStatus.builder().status(false).id(setting.getId()).message("Template
exists")
.build();
@@ -113,7 +113,7 @@ public class UITemplateManagementEsDAO extends EsDAO
implements UITemplateManage
final ElasticSearchConverter.ToStorage toStorage = new
ElasticSearchConverter.ToStorage(UITemplate.INDEX_NAME);
builder.entity2Storage(uiTemplate, toStorage);
- getClient().forceInsert(UITemplate.INDEX_NAME, uiTemplate.id(),
toStorage.obtain());
+ getClient().forceInsert(UITemplate.INDEX_NAME,
uiTemplate.id().build(), toStorage.obtain());
return
TemplateChangeStatus.builder().status(true).id(uiTemplate.getTemplateId()).build();
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -128,7 +128,7 @@ public class UITemplateManagementEsDAO extends EsDAO
implements UITemplateManage
final UITemplate.Builder builder = new UITemplate.Builder();
final UITemplate uiTemplate = setting.toEntity();
- final boolean exist = getClient().existDoc(UITemplate.INDEX_NAME,
uiTemplate.id());
+ final boolean exist = getClient().existDoc(UITemplate.INDEX_NAME,
uiTemplate.id().build());
if (!exist) {
return
TemplateChangeStatus.builder().status(false).id(setting.getId())
.message("Can't find the
template").build();
@@ -136,7 +136,7 @@ public class UITemplateManagementEsDAO extends EsDAO
implements UITemplateManage
final ElasticSearchConverter.ToStorage toStorage = new
ElasticSearchConverter.ToStorage(UITemplate.INDEX_NAME);
builder.entity2Storage(uiTemplate, toStorage);
- getClient().forceUpdate(UITemplate.INDEX_NAME, uiTemplate.id(),
toStorage.obtain());
+ getClient().forceUpdate(UITemplate.INDEX_NAME,
uiTemplate.id().build(), toStorage.obtain());
return
TemplateChangeStatus.builder().status(true).id(setting.getId()).build();
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -156,7 +156,7 @@ public class UITemplateManagementEsDAO extends EsDAO
implements UITemplateManage
final ElasticSearchConverter.ToStorage toStorage = new
ElasticSearchConverter.ToStorage(UITemplate.INDEX_NAME);
builder.entity2Storage(uiTemplate, toStorage);
- getClient().forceUpdate(UITemplate.INDEX_NAME, uiTemplate.id(),
toStorage.obtain());
+ getClient().forceUpdate(UITemplate.INDEX_NAME,
uiTemplate.id().build(), toStorage.obtain());
return TemplateChangeStatus.builder().status(true).id(id).build();
} else {
return
TemplateChangeStatus.builder().status(false).id(id).message("Can't find the
template")
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCManagementDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCManagementDAO.java
index 2aea8f6ef3..1a335a6d61 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCManagementDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCManagementDAO.java
@@ -42,7 +42,7 @@ public class JDBCManagementDAO extends JDBCSQLExecutor
implements IManagementDAO
@Override
public void insert(Model model, ManagementData storageData) throws
IOException {
try (Connection connection = jdbcClient.getConnection()) {
- final StorageData data = getByID(jdbcClient, model.getName(),
storageData.id(), storageBuilder);
+ final StorageData data = getByID(jdbcClient, model.getName(),
storageData.id().build(), storageBuilder);
if (data != null) {
return;
}
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetricsDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetricsDAO.java
index 5170362df7..082bf2d913 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetricsDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetricsDAO.java
@@ -40,7 +40,7 @@ public class JDBCMetricsDAO extends JDBCSQLExecutor
implements IMetricsDAO {
@Override
public List<Metrics> multiGet(Model model, List<Metrics> metrics) throws
IOException {
- String[] ids =
metrics.stream().map(Metrics::id).collect(Collectors.toList()).toArray(new
String[] {});
+ String[] ids = metrics.stream().map(m ->
m.id().build()).collect(Collectors.toList()).toArray(new String[] {});
List<StorageData> storageDataList = getByIDs(jdbcClient,
model.getName(), ids, storageBuilder);
List<Metrics> result = new ArrayList<>(storageDataList.size());
for (StorageData storageData : storageDataList) {
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCSQLExecutor.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCSQLExecutor.java
index c15f4768ae..6db79f18b2 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCSQLExecutor.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCSQLExecutor.java
@@ -154,7 +154,7 @@ public class JDBCSQLExecutor {
SQLBuilder sqlBuilder = new SQLBuilder("INSERT INTO " + tableName + "
VALUES");
List<Object> param = new ArrayList<>();
sqlBuilder.append("(?,");
- param.add(metrics.id());
+ param.add(metrics.id().build());
for (int i = 0; i < columns.size(); i++) {
ModelColumn column = columns.get(i);
sqlBuilder.append("?");
@@ -185,7 +185,7 @@ public class JDBCSQLExecutor {
SQLBuilder sqlBuilder = new SQLBuilder("INSERT INTO " + tableName + "
VALUES");
List<Object> param = new ArrayList<>();
sqlBuilder.append("(?,");
- param.add(metrics.id());
+ param.add(metrics.id().build());
int position = 0;
List valueList = new ArrayList();
for (int i = 0; i < columns.size(); i++) {
@@ -257,7 +257,7 @@ public class JDBCSQLExecutor {
}
sqlBuilder.replace(sqlBuilder.length() - 1, sqlBuilder.length(), "");
sqlBuilder.append(" WHERE id = ?");
- param.add(metrics.id());
+ param.add(metrics.id().build());
return new SQLExecutor(sqlBuilder.toString(), param, callback);
}
diff --git
a/oap-server/server-storage-plugin/storage-shardingsphere-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/shardingsphere/ServiceCpmMetrics.java
b/oap-server/server-storage-plugin/storage-shardingsphere-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/shardingsphere/ServiceCpmMetrics.java
index 2982b5186b..96277e5452 100644
---
a/oap-server/server-storage-plugin/storage-shardingsphere-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/shardingsphere/ServiceCpmMetrics.java
+++
b/oap-server/server-storage-plugin/storage-shardingsphere-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/shardingsphere/ServiceCpmMetrics.java
@@ -21,13 +21,13 @@ package
org.apache.skywalking.oap.server.storage.plugin.jdbc.shardingsphere;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
-import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.analysis.Stream;
import org.apache.skywalking.oap.server.core.analysis.metrics.CPMMetrics;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
import
org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor;
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
+import org.apache.skywalking.oap.server.core.storage.StorageID;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
@Stream(
@@ -51,8 +51,10 @@ public class ServiceCpmMetrics extends CPMMetrics {
private String entityId;
@Override
- protected String id0() {
- return getTimeBucket() + Const.ID_CONNECTOR + entityId;
+ protected StorageID id0() {
+ return new StorageID()
+ .append(TIME_BUCKET, getTimeBucket())
+ .append(ENTITY_ID, entityId);
}
@Override
