- * Global index should only be considered if a column value has a huge value candidates, but we will need a direct - * equal - * query without timestamp. - * The typical global index is designed for huge candidate of indexed values, such as `trace ID` or `segment ID`. - *
- * Only work with {@link Column} - */ - @Target({ElementType.FIELD}) - @Retention(RetentionPolicy.RUNTIME) - @interface GlobalIndex { - } - /** * Series key is used to group time series data per metric of one entity in one place. *
@@ -92,8 +77,7 @@ public @interface BanyanDB {
/**
* Force disabling indexing declare through {@link Column}.
- * In BanyanDB, {@link GlobalIndex} provides the high performance capability to filter trace/log from super large
- * dataset, some additional conditions could be done in server memory, no indexing required in this case.
+ * In BanyanDB, some additional conditions could be done in server memory, no indexing required in this case.
*
* @since 9.1.0
*/
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBExtension.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBExtension.java
index 0c0ed11cdb..0f47586d3e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBExtension.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBExtension.java
@@ -39,14 +39,6 @@ public class BanyanDBExtension {
@Getter
private final int shardingKeyIdx;
- /**
- * Global index column.
- *
- * @since 9.1.0
- */
- @Getter
- private final boolean isGlobalIndexing;
-
/**
* {@link BanyanDB.NoIndexing} exists to override {@link ModelColumn#shouldIndex()}, or be the same as {@link
* ModelColumn#shouldIndex()}.
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java
index 1ab2928f19..51aadd4c1b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java
@@ -207,8 +207,6 @@ public class StorageModels implements IModelManager, ModelCreator, ModelManipula
// BanyanDB extension
final BanyanDB.SeriesID banyanDBSeriesID = field.getAnnotation(
BanyanDB.SeriesID.class);
- final BanyanDB.GlobalIndex banyanDBGlobalIndex = field.getAnnotation(
- BanyanDB.GlobalIndex.class);
final BanyanDB.NoIndexing banyanDBNoIndex = field.getAnnotation(
BanyanDB.NoIndexing.class);
final BanyanDB.IndexRule banyanDBIndexRule = field.getAnnotation(
@@ -219,7 +217,6 @@ public class StorageModels implements IModelManager, ModelCreator, ModelManipula
BanyanDB.TopNAggregation.class);
BanyanDBExtension banyanDBExtension = new BanyanDBExtension(
banyanDBSeriesID == null ? -1 : banyanDBSeriesID.index(),
- banyanDBGlobalIndex != null,
banyanDBNoIndex == null && !column.storageOnly(),
banyanDBIndexRule == null ? BanyanDB.IndexRule.IndexType.INVERTED : banyanDBIndexRule.indexType(),
banyanDBMeasureField != null
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/model/ModelColumnTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/model/ModelColumnTest.java
index 2ed3ab5431..f1949cbece 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/model/ModelColumnTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/model/ModelColumnTest.java
@@ -49,7 +49,7 @@ public class ModelColumnTest {
new SQLDatabaseExtension(),
new ElasticSearchExtension(
ElasticSearch.MatchQuery.AnalyzerType.OAP_ANALYZER, null, false, false),
- new BanyanDBExtension(-1, false, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
+ new BanyanDBExtension(-1, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
);
Assertions.assertTrue(column.isStorageOnly());
Assertions.assertEquals("abc", column.getColumnName().getName());
@@ -58,7 +58,7 @@ public class ModelColumnTest {
false, false, true, 200,
new SQLDatabaseExtension(),
new ElasticSearchExtension(ElasticSearch.MatchQuery.AnalyzerType.OAP_ANALYZER, null, false, false),
- new BanyanDBExtension(-1, false, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
+ new BanyanDBExtension(-1, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
);
Assertions.assertTrue(column.isStorageOnly());
Assertions.assertEquals("abc", column.getColumnName().getName());
@@ -68,7 +68,7 @@ public class ModelColumnTest {
false, false, true, 200,
new SQLDatabaseExtension(),
new ElasticSearchExtension(ElasticSearch.MatchQuery.AnalyzerType.OAP_ANALYZER, null, false, false),
- new BanyanDBExtension(-1, false, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
+ new BanyanDBExtension(-1, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
);
Assertions.assertFalse(column.isStorageOnly());
Assertions.assertEquals("abc", column.getColumnName().getName());
@@ -82,7 +82,7 @@ public class ModelColumnTest {
new SQLDatabaseExtension(),
new ElasticSearchExtension(
ElasticSearch.MatchQuery.AnalyzerType.OAP_ANALYZER, "abc", false, false),
- new BanyanDBExtension(-1, false, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
+ new BanyanDBExtension(-1, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
);
});
}
@@ -95,7 +95,7 @@ public class ModelColumnTest {
new SQLDatabaseExtension(),
new ElasticSearchExtension(
ElasticSearch.MatchQuery.AnalyzerType.OAP_ANALYZER, "abc", false, false),
- new BanyanDBExtension(-1, false, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
+ new BanyanDBExtension(-1, true, BanyanDB.IndexRule.IndexType.INVERTED, false)
);
});
}
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index c8ef570e92..3d97836093 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -216,19 +216,44 @@ storage:
maxSizeOfBatchSql: ${SW_STORAGE_MAX_SIZE_OF_BATCH_SQL:2000}
asyncBatchPersistentPoolSize: ${SW_STORAGE_ASYNC_BATCH_PERSISTENT_POOL_SIZE:4}
banyandb:
+ # Targets is the list of BanyanDB servers, separated by commas.
+ # Each target is a BanyanDB server in the format of `host:port`
+ # The host is the IP address or domain name of the BanyanDB server, and the port is the port number of the BanyanDB server.
targets: ${SW_STORAGE_BANYANDB_TARGETS:127.0.0.1:17912}
+ # The max number of records in a bulk write request.
+ # Bigger value can improve the write performance, but also increase the OAP and BanyanDB Server memory usage.
maxBulkSize: ${SW_STORAGE_BANYANDB_MAX_BULK_SIZE:5000}
+ # The minimum seconds between two bulk flushes.
+ # If the data in a bulk is less than maxBulkSize, the data will be flushed after this period.
+ # If the data in a bulk is more than maxBulkSize, the data will be flushed immediately.
+ # Bigger value can reduce the write pressure on BanyanDB Server, but also increase the latency of the data.
flushInterval: ${SW_STORAGE_BANYANDB_FLUSH_INTERVAL:15}
+ # The shard number of `measure` groups that store the metrics data.
metricsShardsNumber: ${SW_STORAGE_BANYANDB_METRICS_SHARDS_NUMBER:1}
+ # The shard number of `stream` groups that store the trace, log and profile data.
recordShardsNumber: ${SW_STORAGE_BANYANDB_RECORD_SHARDS_NUMBER:1}
+ # The multiplier of the number of shards of the super dataset.
+ # Super dataset is a special dataset that stores the trace or log data that is too large to be stored in the normal dataset.
+ # If the normal dataset has `n` shards, the super dataset will have `n * superDatasetShardsFactor` shards.
+ # For example, supposing `recordShardsNumber` is 3, and `superDatasetShardsFactor` is 2,
+ # `segment-default` is a normal dataset that has 3 shards, and `segment-minute` is a super dataset that has 6 shards.
superDatasetShardsFactor: ${SW_STORAGE_BANYANDB_SUPERDATASET_SHARDS_FACTOR:2}
+ # The number of threads that write data to BanyanDB concurrently.
+ # Bigger value can improve the write performance, but also increase the OAP and BanyanDB Server CPU usage.
concurrentWriteThreads: ${SW_STORAGE_BANYANDB_CONCURRENT_WRITE_THREADS:15}
- profileTaskQueryMaxSize: ${SW_STORAGE_BANYANDB_PROFILE_TASK_QUERY_MAX_SIZE:200} # the max number of fetch task in a request
- blockIntervalHours: ${SW_STORAGE_BANYANDB_BLOCK_INTERVAL_HOURS:24} # Unit is hour
- segmentIntervalDays: ${SW_STORAGE_BANYANDB_SEGMENT_INTERVAL_DAYS:1} # Unit is day
- superDatasetBlockIntervalHours: ${SW_STORAGE_BANYANDB_SUPER_DATASET_BLOCK_INTERVAL_HOURS:4} # Unit is hour
- superDatasetSegmentIntervalDays: ${SW_STORAGE_BANYANDB_SUPER_DATASET_SEGMENT_INTERVAL_DAYS:1} # Unit is day
- specificGroupSettings: ${SW_STORAGE_BANYANDB_SPECIFIC_GROUP_SETTINGS:""} # For example, {"group1": {"blockIntervalHours": 4, "segmentIntervalDays": 1}}
+ # The max number of profile task query in a request.
+ profileTaskQueryMaxSize: ${SW_STORAGE_BANYANDB_PROFILE_TASK_QUERY_MAX_SIZE:200}
+ # Data is stored in BanyanDB in segments. A segment is a time range of data.
+ # The segment interval is the time range of a segment.
+ # The value should be less or equal to data TTL relevant settings.
+ segmentIntervalDays: ${SW_STORAGE_BANYANDB_SEGMENT_INTERVAL_DAYS:1}
+ # The super dataset segment interval is the time range of a segment in the super dataset.
+ superDatasetSegmentIntervalDays: ${SW_STORAGE_BANYANDB_SUPER_DATASET_SEGMENT_INTERVAL_DAYS:1}
+ # Specific groups settings.
+ # For example, {"group1": {"blockIntervalHours": 4, "segmentIntervalDays": 1}}
+ # Please refer to https://github.com/apache/skywalking-banyandb/blob/${BANYANDB_RELEASE}/docs/crud/group.md#create-operation
+ # for group setting details.
+ specificGroupSettings: ${SW_STORAGE_BANYANDB_SPECIFIC_GROUP_SETTINGS:""}
agent-analyzer:
selector: ${SW_AGENT_ANALYZER:default}
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java
index 91617f64da..148290f487 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java
@@ -62,13 +62,6 @@ public class BanyanDBStorageConfig extends ModuleConfig {
* Shards Factor for a super dataset
*/
private int superDatasetShardsFactor;
- /**
- * Default global block interval for non-super-dataset models.
- * Unit is hour.
- *
- * @since 9.4.0
- */
- private int blockIntervalHours;
/**
* Default global segment interval for non-super-dataset models.
* Unit is day.
@@ -76,13 +69,6 @@ public class BanyanDBStorageConfig extends ModuleConfig {
* @since 9.4.0
*/
private int segmentIntervalDays;
- /**
- * Default global block interval for super-dataset models.
- * Unit is hour.
- *
- * @since 9.4.0
- */
- private int superDatasetBlockIntervalHours;
/**
* Default global segment interval for super-dataset models.
* Unit is day.
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java
index aa3b9a88c6..2dee1ba62b 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java
@@ -19,7 +19,6 @@
package org.apache.skywalking.oap.server.storage.plugin.banyandb;
import org.apache.skywalking.banyandb.v1.client.metadata.Group;
-import org.apache.skywalking.banyandb.v1.client.metadata.IntervalRule;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.storage.IBatchDAO;
import org.apache.skywalking.oap.server.core.storage.IHistoryDeleteDAO;
@@ -89,8 +88,6 @@ public class BanyanDBStorageProvider extends ModuleProvider {
private BanyanDBStorageClient client;
private ModelInstaller modelInstaller;
- private IntervalRule bypass = IntervalRule.create(IntervalRule.Unit.UNSPECIFIED, 0);
-
@Override
public String name() {
return "banyandb";
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
index 70860cda8a..2525fc6c3c 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
@@ -69,7 +69,6 @@ import org.apache.skywalking.oap.server.core.analysis.record.Record;
import org.apache.skywalking.oap.server.core.config.ConfigService;
import org.apache.skywalking.oap.server.core.query.enumeration.Step;
import org.apache.skywalking.oap.server.core.storage.StorageException;
-import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnMetadata;
import org.apache.skywalking.oap.server.core.storage.model.Model;
@@ -156,7 +155,7 @@ public enum MetadataRegistry {
.collect(Collectors.toList());
if (model.getBanyanDBModelExtension().isStoreIDTag()) {
- indexRules.add(IndexRule.create(BanyanDBConverter.ID, IndexRule.IndexType.TREE, IndexRule.IndexLocation.SERIES));
+ indexRules.add(IndexRule.create(BanyanDBConverter.ID, IndexRule.IndexType.INVERTED));
}
final Measure.Builder builder = Measure.create(schemaMetadata.getGroup(), schemaMetadata.name(),
@@ -285,25 +284,8 @@ public enum MetadataRegistry {
}
}
- IndexRule parseIndexRule(String tagName, ModelColumn modelColumn) {
- // TODO: we need to add support index type in the OAP core
- // Currently, we only register INVERTED type
- // if it is null, it must be a user-defined tag
- if (modelColumn == null) {
- return IndexRule.create(tagName, IndexRule.IndexType.INVERTED, IndexRule.IndexLocation.SERIES);
- }
- if (modelColumn.getBanyanDBExtension().isGlobalIndexing()) {
- return IndexRule.create(tagName, parseIndexType(modelColumn.getBanyanDBExtension().getIndexType()), IndexRule.IndexLocation.GLOBAL);
- } else {
- return IndexRule.create(tagName, parseIndexType(modelColumn.getBanyanDBExtension().getIndexType()), IndexRule.IndexLocation.SERIES);
- }
- }
-
- private static IndexRule.IndexType parseIndexType(BanyanDB.IndexRule.IndexType indexType) {
- if (indexType == BanyanDB.IndexRule.IndexType.INVERTED) {
- return IndexRule.IndexType.INVERTED;
- }
- return IndexRule.IndexType.TREE;
+ IndexRule indexRule(String tagName) {
+ return IndexRule.create(tagName, IndexRule.IndexType.INVERTED);
}
/**
@@ -343,9 +325,7 @@ public enum MetadataRegistry {
builder.spec(columnStorageName, new ColumnSpec(ColumnType.TAG, col.getType()));
String colName = col.getColumnName().getStorageName();
if (!shardingColumns.contains(colName) && col.getBanyanDBExtension().shouldIndex()) {
- // build indexRule
- IndexRule indexRule = parseIndexRule(tagSpec.getTagName(), col);
- tagMetadataList.add(new TagMetadata(indexRule, tagSpec));
+ tagMetadataList.add(new TagMetadata(indexRule(tagSpec.getTagName()), tagSpec));
} else {
tagMetadataList.add(new TagMetadata(null, tagSpec));
}
@@ -385,7 +365,7 @@ public enum MetadataRegistry {
final TagFamilySpec.TagSpec tagSpec = parseTagSpec(col);
builder.spec(columnStorageName, new ColumnSpec(ColumnType.TAG, col.getType()));
String colName = col.getColumnName().getStorageName();
- result.tag(new TagMetadata(!shardingColumns.contains(colName) && col.getBanyanDBExtension().shouldIndex() ? parseIndexRule(tagSpec.getTagName(), col) : null, tagSpec));
+ result.tag(new TagMetadata(!shardingColumns.contains(colName) && col.getBanyanDBExtension().shouldIndex() ? indexRule(tagSpec.getTagName()) : null, tagSpec));
}
return result.build();
@@ -443,10 +423,8 @@ public enum MetadataRegistry {
}
public SchemaMetadata parseMetadata(Model model, BanyanDBStorageConfig config, ConfigService configService) {
- int blockIntervalHrs = config.getBlockIntervalHours();
int segmentIntervalDays = config.getSegmentIntervalDays();
if (model.isSuperDataset()) {
- blockIntervalHrs = config.getSuperDatasetBlockIntervalHours();
segmentIntervalDays = config.getSuperDatasetSegmentIntervalDays();
}
String group;
@@ -460,7 +438,6 @@ public enum MetadataRegistry {
} else if (model.getDownsampling() == DownSampling.Minute && model.isTimeRelativeID()) { // measure
group = "measure-minute";
// apply super dataset's settings to measure-minute
- blockIntervalHrs = config.getSuperDatasetBlockIntervalHours();
segmentIntervalDays = config.getSuperDatasetSegmentIntervalDays();
metricShardNum = metricShardNum * config.getSuperDatasetShardsFactor();
} else {
@@ -471,14 +448,12 @@ public enum MetadataRegistry {
return new SchemaMetadata("measure-default", model.getName(), Kind.MEASURE,
model.getDownsampling(),
config.getMetricsShardsNumber(),
- intervalDays * 24,
intervalDays, // use 10-day/240-hour strategy
configService.getMetricsDataTTL());
}
GroupSetting groupSetting = this.specificGroupSettings.get(group);
if (groupSetting != null) {
- blockIntervalHrs = groupSetting.getBlockIntervalHours();
segmentIntervalDays = groupSetting.getSegmentIntervalDays();
}
if (model.isRecord()) {
@@ -488,7 +463,6 @@ public enum MetadataRegistry {
model.getDownsampling(),
config.getRecordShardsNumber() *
(model.isSuperDataset() ? config.getSuperDatasetShardsFactor() : 1),
- blockIntervalHrs,
segmentIntervalDays,
configService.getRecordDataTTL()
);
@@ -497,7 +471,6 @@ public enum MetadataRegistry {
return new SchemaMetadata(group, model.getName(), Kind.MEASURE,
model.getDownsampling(),
metricShardNum,
- blockIntervalHrs,
segmentIntervalDays,
configService.getMetricsDataTTL());
}
@@ -517,7 +490,6 @@ public enum MetadataRegistry {
*/
private final DownSampling downSampling;
private final int shard;
- private final int blockIntervalHrs;
private final int segmentIntervalDays;
private final int ttlDays;
@@ -580,7 +552,6 @@ public enum MetadataRegistry {
resourceExist = client.existStream(this.group, this.name());
if (!resourceExist.hasGroup()) {
Group g = client.define(Group.create(this.group, Catalog.STREAM, this.shard,
- IntervalRule.create(IntervalRule.Unit.HOUR, this.blockIntervalHrs),
IntervalRule.create(IntervalRule.Unit.DAY, this.segmentIntervalDays),
IntervalRule.create(IntervalRule.Unit.DAY, this.ttlDays)));
if (g != null) {
@@ -592,7 +563,6 @@ public enum MetadataRegistry {
resourceExist = client.existMeasure(this.group, this.name());
if (!resourceExist.hasGroup()) {
Group g = client.define(Group.create(this.group, Catalog.MEASURE, this.shard,
- IntervalRule.create(IntervalRule.Unit.HOUR, this.blockIntervalHrs),
IntervalRule.create(IntervalRule.Unit.DAY, this.segmentIntervalDays),
IntervalRule.create(IntervalRule.Unit.DAY, this.ttlDays)));
if (g != null) {
@@ -726,7 +696,6 @@ public enum MetadataRegistry {
@Setter
@NoArgsConstructor
public static class GroupSetting {
- private int blockIntervalHours;
private int segmentIntervalDays;
}
}
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBEventQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBEventQueryDAO.java
index 17ebe6d1ec..567126239b 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBEventQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBEventQueryDAO.java
@@ -155,9 +155,9 @@ public class BanyanDBEventQueryDAO extends AbstractBanyanDBDAO implements IEvent
event.setUuid(dataPoint.getTagValue(Event.UUID));
- String service = dataPoint.getTagValue(Event.SERVICE);
- String serviceInstance = dataPoint.getTagValue(Event.SERVICE_INSTANCE);
- String endpoint = dataPoint.getTagValue(Event.ENDPOINT);
+ String service = getValueOrDefault(dataPoint, Event.SERVICE, "");
+ String serviceInstance = getValueOrDefault(dataPoint, Event.SERVICE_INSTANCE, "");
+ String endpoint = getValueOrDefault(dataPoint, Event.ENDPOINT, "");
event.setSource(new Source(service, serviceInstance, endpoint));
event.setName(dataPoint.getTagValue(Event.NAME));
@@ -171,4 +171,9 @@ public class BanyanDBEventQueryDAO extends AbstractBanyanDBDAO implements IEvent
return event;
}
+
+ private