You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2023/02/24 02:55:49 UTC
[skywalking] branch banyandb-property updated (5a22ba2a11 -> f3491b1ed7)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch banyandb-property
in repository https://gitbox.apache.org/repos/asf/skywalking.git
discard 5a22ba2a11 Create the UITemplate's group in the starting step
add d5928245d0 Add explicit `ReadTimeout` for ConsulConfigurationWatcher (#10431)
add 46ee924575 [Temp] Exclude gpg mit site from dead link check (#10432)
add cc7a2c9e97 Fix wrong time for OTEL mock service, invalid condition(ge 0) for e2e cases (#10437)
new f3491b1ed7 Create the UITemplate's group in the starting step
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5a22ba2a11)
\
N -- N -- N refs/heads/banyandb-property (f3491b1ed7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.dlc.json | 3 +
.github/workflows/skywalking.yaml | 4 +-
docs/en/changes/changes.md | 3 +-
oap-server-bom/pom.xml | 17 ++
.../cluster-consul-plugin/pom.xml | 1 -
.../configuration-consul/pom.xml | 5 -
.../consul/ConsulConfigurationWatcherRegister.java | 3 +-
test/e2e-v2/cases/aws/dynamodb/dynamodb-cases.yaml | 39 ++---
.../aws/dynamodb/expected/metrics-has-value.yml | 2 +-
.../cases/aws/dynamodb/mock-data/data-1.json | 179 ++++++++++++++++++++-
test/e2e-v2/cases/aws/eks/eks-cases.yaml | 2 +-
.../cases/aws/eks/expected/metrics-has-value.yml | 2 +-
.../cases/aws/eks/mock-data/otel-mock-metrics.json | 2 +-
.../cases/aws/s3/expected/metrics-has-value.yml | 2 +-
test/e2e-v2/cases/aws/s3/mock-data/data-1.json | 2 +
.../expected/metrics-has-value-percentile.yml | 10 +-
.../cases/meter/expected/metrics-has-value0.yml | 19 ---
test/e2e-v2/cases/meter/meter-cases.yaml | 4 +-
...etrics-has-value0.yml => metrics-has-value.yml} | 0
test/e2e-v2/cases/virtual-mq/mq-cases.yaml | 4 +-
.../cases/win/expected/metrics-has-value.yml | 6 +-
test/e2e-v2/cases/win/win-cases.yaml | 10 +-
.../e2e/controller/OtelMetricsSender.java | 2 +-
23 files changed, 233 insertions(+), 88 deletions(-)
delete mode 100644 test/e2e-v2/cases/meter/expected/metrics-has-value0.yml
rename test/e2e-v2/cases/virtual-mq/expected/{metrics-has-value0.yml => metrics-has-value.yml} (100%)
[skywalking] 01/01: Create the UITemplate's group in the starting step
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch banyandb-property
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit f3491b1ed7a4f92beaf784e291acb49b6b6d95c4
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Feb 24 10:07:41 2023 +0800
Create the UITemplate's group in the starting step
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
oap-server-bom/pom.xml | 2 +-
.../storage/plugin/banyandb/BanyanDBStorageClient.java | 15 +++++++++++++++
.../storage/plugin/banyandb/BanyanDBStorageProvider.java | 9 +++++++++
.../plugin/banyandb/BanyanDBUITemplateManagementDAO.java | 2 +-
skywalking-ui | 2 +-
5 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 289353d600..6be20194f7 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -72,7 +72,7 @@
<awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version>
<commons-compress.version>1.21</commons-compress.version>
- <banyandb-java-client.version>0.3.0</banyandb-java-client.version>
+ <banyandb-java-client.version>0.4.0-SNAPSHOT</banyandb-java-client.version>
<kafka-clients.version>2.8.1</kafka-clients.version>
<spring-kafka-test.version>2.4.6.RELEASE</spring-kafka-test.version>
<consul.client.version>1.5.3</consul.client.version>
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java
index f2408f8695..a9a55b40f1 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java
@@ -27,7 +27,9 @@ import org.apache.skywalking.banyandb.v1.client.StreamBulkWriteProcessor;
import org.apache.skywalking.banyandb.v1.client.StreamQuery;
import org.apache.skywalking.banyandb.v1.client.StreamQueryResponse;
import org.apache.skywalking.banyandb.v1.client.StreamWrite;
+import org.apache.skywalking.banyandb.v1.client.grpc.exception.AlreadyExistsException;
import org.apache.skywalking.banyandb.v1.client.grpc.exception.BanyanDBException;
+import org.apache.skywalking.banyandb.v1.client.metadata.Group;
import org.apache.skywalking.banyandb.v1.client.metadata.Measure;
import org.apache.skywalking.banyandb.v1.client.metadata.Property;
import org.apache.skywalking.banyandb.v1.client.metadata.Stream;
@@ -146,6 +148,19 @@ public class BanyanDBStorageClient implements Client, HealthCheckable {
}
}
+ public void defineIfEmpty(Group group) throws IOException {
+ try {
+ try {
+ this.client.define(group);
+ } catch (AlreadyExistsException ignored) {
+ }
+ this.healthChecker.health();
+ } catch (BanyanDBException ex) {
+ healthChecker.unHealth(ex);
+ throw new IOException("fail to define group", ex);
+ }
+ }
+
public void write(StreamWrite streamWrite) {
this.client.write(streamWrite);
}
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 53571c6dc2..877b5f8d5c 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
@@ -18,6 +18,12 @@
package org.apache.skywalking.oap.server.storage.plugin.banyandb;
+import org.apache.skywalking.banyandb.common.v1.BanyandbCommon;
+import org.apache.skywalking.banyandb.v1.client.grpc.exception.AlreadyExistsException;
+import org.apache.skywalking.banyandb.v1.client.grpc.exception.BanyanDBException;
+import org.apache.skywalking.banyandb.v1.client.metadata.Catalog;
+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;
@@ -82,6 +88,8 @@ 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";
@@ -166,6 +174,7 @@ public class BanyanDBStorageProvider extends ModuleProvider {
this.client.registerChecker(healthChecker);
try {
this.client.connect();
+ this.client.defineIfEmpty(Group.create(BanyanDBUITemplateManagementDAO.GROUP));
this.modelInstaller.start();
getManager().find(CoreModule.NAME).provider().getService(ModelCreator.class).addModelListener(modelInstaller);
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 bbbb4b183f..f6f6414828 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
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
@Slf4j
public class BanyanDBUITemplateManagementDAO extends AbstractBanyanDBDAO implements UITemplateManagementDAO {
- private static final String GROUP = "sw";
+ public static final String GROUP = "sw";
public BanyanDBUITemplateManagementDAO(BanyanDBStorageClient client) {
super(client);
diff --git a/skywalking-ui b/skywalking-ui
index 72060f8227..1278454148 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 72060f8227ee3db4a8c12d31ece46404be760c69
+Subproject commit 127845414890fc3868dc9af73972f1c89e776366