You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wa...@apache.org on 2024/04/24 06:29:18 UTC
(skywalking) branch master updated: [Break Change] gGRPC metrics exporter unified the metric value type and support labeled metrics. (#12156)
This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new fe2c4b5f3f [Break Change] gGRPC metrics exporter unified the metric value type and support labeled metrics. (#12156)
fe2c4b5f3f is described below
commit fe2c4b5f3f87a0b7eb4e57d0f10202e50ba119e9
Author: Wan Kai <wa...@foxmail.com>
AuthorDate: Wed Apr 24 14:29:13 2024 +0800
[Break Change] gGRPC metrics exporter unified the metric value type and support labeled metrics. (#12156)
---
docs/en/changes/changes.md | 2 +-
docs/en/setup/backend/exporter.md | 2 +-
.../provider/grpc/GRPCMetricsExporter.java | 191 +++++++++++----------
.../exporter/src/main/proto/metric-exporter.proto | 26 +--
.../exporter/provider/grpc/GRPCExporterTest.java | 67 ++++++--
...ueMetrics.java => MockLabeledValueMetrics.java} | 14 +-
.../provider/grpc/MockMetricExportServiceImpl.java | 41 ++++-
.../server/exporter/provider/grpc/MockMetrics.java | 2 +-
8 files changed, 222 insertions(+), 123 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 45e96452ed..ef10ed66e1 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -105,7 +105,6 @@
- `memory_swap_percentage` -> `memory_virtual_memory_percentage`
* Fix/Change UI init setting for Windows Swap -> Virtual Memory
* Fix `Memory Swap Usage`/`Virtual Memory Usage` display with UI init.(Linux/Windows)
-
* Fix inaccurate APISIX metrics.
* Fix inaccurate MongoDB Metrics.
* Support Apache ActiveMQ server monitoring.
@@ -117,6 +116,7 @@
* Fix inaccurate Hierarchy of RabbitMQ Server monitoring metrics.
* Fix inaccurate MySQL/MariaDB, Redis, PostgreSQL metrics.
* Support DoubleValue,IntValue,BoolValue in OTEL metrics attributes.
+* [Break Change] gGRPC metrics exporter unified the metric value type and support labeled metrics.
#### UI
diff --git a/docs/en/setup/backend/exporter.md b/docs/en/setup/backend/exporter.md
index 2917d09ca8..fd68a4cb01 100644
--- a/docs/en/setup/backend/exporter.md
+++ b/docs/en/setup/backend/exporter.md
@@ -48,7 +48,7 @@ Return empty list, if you want to export all metrics in the incremental event ty
2. Export implementation.
Stream service. All subscribed metrics will be sent here based on the OAP core schedule. Also, if the OAP is deployed as a cluster,
-this method will be called concurrently. For metrics value, you need to follow `#type` to choose `#longValue` or `#doubleValue`.
+this method will be called concurrently.
## Kafka Exporter
### Trace Kafka Exporter
diff --git a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCMetricsExporter.java b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCMetricsExporter.java
index 4693fc51a9..d2b6bda6fd 100644
--- a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCMetricsExporter.java
+++ b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCMetricsExporter.java
@@ -26,12 +26,13 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.server.core.analysis.metrics.DoubleValueHolder;
+import org.apache.skywalking.oap.server.core.analysis.metrics.DataLabel;
+import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
import org.apache.skywalking.oap.server.core.analysis.metrics.IntValueHolder;
+import org.apache.skywalking.oap.server.core.analysis.metrics.LabeledValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
import org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo;
-import org.apache.skywalking.oap.server.core.analysis.metrics.MultiIntValuesHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.WithMetadata;
import org.apache.skywalking.oap.server.core.exporter.ExportData;
import org.apache.skywalking.oap.server.core.exporter.ExportEvent;
@@ -39,16 +40,18 @@ import org.apache.skywalking.oap.server.core.exporter.MetricValuesExportService;
import org.apache.skywalking.oap.server.exporter.grpc.EventType;
import org.apache.skywalking.oap.server.exporter.grpc.ExportMetricValue;
import org.apache.skywalking.oap.server.exporter.grpc.ExportResponse;
+import org.apache.skywalking.oap.server.exporter.grpc.KeyValue;
import org.apache.skywalking.oap.server.exporter.grpc.MetricExportServiceGrpc;
+import org.apache.skywalking.oap.server.exporter.grpc.MetricValue;
import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionMetric;
import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionReq;
import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionsResp;
-import org.apache.skywalking.oap.server.exporter.grpc.ValueType;
import org.apache.skywalking.oap.server.exporter.provider.ExporterSetting;
import org.apache.skywalking.oap.server.exporter.provider.MetricFormatter;
import org.apache.skywalking.oap.server.library.client.grpc.GRPCClient;
import org.apache.skywalking.oap.server.library.datacarrier.DataCarrier;
import org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer;
+import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.library.util.GRPCStreamStatus;
@Slf4j
@@ -132,99 +135,115 @@ public class GRPCMetricsExporter extends MetricFormatter implements MetricValues
@Override
public void consume(List<ExportData> data) {
- GRPCStreamStatus status = new GRPCStreamStatus();
- StreamObserver<ExportMetricValue> streamObserver =
- exportServiceFutureStub.withDeadlineAfter(10, TimeUnit.SECONDS)
- .export(
- new StreamObserver<ExportResponse>() {
- @Override
- public void onNext(
- ExportResponse response) {
-
- }
-
- @Override
- public void onError(
- Throwable throwable) {
- status.done();
- }
-
- @Override
- public void onCompleted() {
- status.done();
- }
- });
- AtomicInteger exportNum = new AtomicInteger();
- data.forEach(row -> {
- ExportMetricValue.Builder builder = ExportMetricValue.newBuilder();
-
- Metrics metrics = row.getMetrics();
- if (metrics instanceof LongValueHolder) {
- long value = ((LongValueHolder) metrics).getValue();
- builder.setLongValue(value);
- builder.setType(ValueType.LONG);
- } else if (metrics instanceof IntValueHolder) {
- long value = ((IntValueHolder) metrics).getValue();
- builder.setLongValue(value);
- builder.setType(ValueType.LONG);
- } else if (metrics instanceof DoubleValueHolder) {
- double value = ((DoubleValueHolder) metrics).getValue();
- builder.setDoubleValue(value);
- builder.setType(ValueType.DOUBLE);
- } else if (metrics instanceof MultiIntValuesHolder) {
- int[] values = ((MultiIntValuesHolder) metrics).getValues();
- for (int value : values) {
- builder.addLongValues(value);
+ if (CollectionUtils.isNotEmpty(data)) {
+ GRPCStreamStatus status = new GRPCStreamStatus();
+ StreamObserver<ExportMetricValue> streamObserver =
+ exportServiceFutureStub.withDeadlineAfter(10, TimeUnit.SECONDS)
+ .export(
+ new StreamObserver<ExportResponse>() {
+ @Override
+ public void onNext(
+ ExportResponse response) {
+
+ }
+
+ @Override
+ public void onError(
+ Throwable throwable) {
+ log.error("Export metrics to {}:{} fails.",
+ setting.getGRPCTargetHost(),
+ setting.getGRPCTargetPort(), throwable
+ );
+ status.done();
+ }
+
+ @Override
+ public void onCompleted() {
+ status.done();
+ }
+ });
+ AtomicInteger exportNum = new AtomicInteger();
+
+ data.forEach(row -> {
+ ExportMetricValue.Builder builder = ExportMetricValue.newBuilder();
+
+ Metrics metrics = row.getMetrics();
+ if (metrics instanceof LongValueHolder) {
+ long value = ((LongValueHolder) metrics).getValue();
+ MetricValue.Builder valueBuilder = MetricValue.newBuilder();
+ valueBuilder.setLongValue(value);
+ builder.addMetricValues(valueBuilder);
+ } else if (metrics instanceof IntValueHolder) {
+ long value = ((IntValueHolder) metrics).getValue();
+ MetricValue.Builder valueBuilder = MetricValue.newBuilder();
+ valueBuilder.setLongValue(value);
+ builder.addMetricValues(valueBuilder);
+ } else if (metrics instanceof LabeledValueHolder) {
+ DataTable values = ((LabeledValueHolder) metrics).getValue();
+ values.keys().forEach(key -> {
+ MetricValue.Builder valueBuilder = MetricValue.newBuilder();
+ valueBuilder.setLongValue(values.get(key));
+ DataLabel labels = new DataLabel();
+ labels.put(key);
+ labels.forEach((labelName, LabelValue) -> {
+ KeyValue.Builder kvBuilder = KeyValue.newBuilder();
+ kvBuilder.setKey(labelName);
+ kvBuilder.setValue(LabelValue);
+ valueBuilder.addLabels(kvBuilder);
+ });
+ builder.addMetricValues(valueBuilder);
+ });
+ } else {
+ return;
}
- builder.setType(ValueType.MULTI_LONG);
- } else {
- return;
- }
- MetricsMetaInfo meta = row.getMeta();
- builder.setMetricName(meta.getMetricsName());
- builder.setEventType(
- ExportEvent.EventType.INCREMENT.equals(row.getEventType()) ? EventType.INCREMENT : EventType.TOTAL);
- String entityName = getEntityName(meta);
- if (entityName == null) {
- return;
- }
- builder.setEntityName(entityName);
- builder.setEntityId(meta.getId());
+ MetricsMetaInfo meta = row.getMeta();
+ builder.setMetricName(meta.getMetricsName());
+ builder.setEventType(
+ ExportEvent.EventType.INCREMENT.equals(row.getEventType()) ? EventType.INCREMENT : EventType.TOTAL);
+ String entityName = getEntityName(meta);
+ if (entityName == null) {
+ return;
+ }
+ builder.setEntityName(entityName);
+ builder.setEntityId(meta.getId());
- builder.setTimeBucket(metrics.getTimeBucket());
+ builder.setTimeBucket(metrics.getTimeBucket());
- streamObserver.onNext(builder.build());
- exportNum.getAndIncrement();
- });
+ streamObserver.onNext(builder.build());
+ exportNum.getAndIncrement();
+ });
- streamObserver.onCompleted();
+ streamObserver.onCompleted();
- long sleepTime = 0;
- long cycle = 100L;
+ long sleepTime = 0;
+ long cycle = 100L;
- //For memory safe of oap, we must wait for the peer confirmation.
- while (!status.isDone()) {
- try {
- sleepTime += cycle;
- Thread.sleep(cycle);
- } catch (InterruptedException e) {
- }
+ //For memory safe of oap, we must wait for the peer confirmation.
+ while (!status.isDone()) {
+ try {
+ sleepTime += cycle;
+ Thread.sleep(cycle);
+ } catch (InterruptedException e) {
+ }
- if (sleepTime > 2000L) {
- log.warn(
- "Export {} metrics to {}:{}, wait {} milliseconds.", exportNum.get(), setting.getGRPCTargetHost(),
- setting
- .getGRPCTargetPort(), sleepTime
- );
- cycle = 2000L;
+ if (sleepTime > 2000L) {
+ log.warn(
+ "Export {} metrics to {}:{}, wait {} milliseconds.", exportNum.get(),
+ setting.getGRPCTargetHost(),
+ setting
+ .getGRPCTargetPort(), sleepTime
+ );
+ cycle = 2000L;
+ }
}
- }
-
- log.debug(
- "Exported {} metrics to {}:{} in {} milliseconds.", exportNum.get(), setting.getGRPCTargetHost(), setting
- .getGRPCTargetPort(), sleepTime);
+ log.debug(
+ "Exported {} metrics to {}:{} in {} milliseconds.", exportNum.get(), setting.getGRPCTargetHost(),
+ setting
+ .getGRPCTargetPort(), sleepTime
+ );
+ }
fetchSubscriptionList();
}
diff --git a/oap-server/exporter/src/main/proto/metric-exporter.proto b/oap-server/exporter/src/main/proto/metric-exporter.proto
index 4013bcc36a..37e4dcaa63 100644
--- a/oap-server/exporter/src/main/proto/metric-exporter.proto
+++ b/oap-server/exporter/src/main/proto/metric-exporter.proto
@@ -34,12 +34,9 @@ message ExportMetricValue {
string metricName = 1;
string entityName = 2;
string entityId = 3;
- ValueType type = 4;
- int64 timeBucket = 5;
- int64 longValue = 6;
- double doubleValue = 7;
- repeated int64 longValues = 8;
- EventType eventType = 9;
+ int64 timeBucket = 4;
+ EventType eventType = 5;
+ repeated MetricValue metricValues = 6;
}
message SubscriptionsResp {
@@ -51,12 +48,6 @@ message SubscriptionMetric {
EventType eventType = 2;
}
-enum ValueType {
- LONG = 0;
- DOUBLE = 1;
- MULTI_LONG = 2;
-}
-
enum EventType {
// The metrics aggregated in this bulk, not include the existing persistent data.
INCREMENT = 0;
@@ -70,3 +61,14 @@ message SubscriptionReq {
message ExportResponse {
}
+
+message MetricValue {
+ // Could be empty, if it is not a labeled metric.
+ repeated KeyValue labels = 1;
+ int64 longValue = 2;
+}
+
+message KeyValue {
+ string key = 1;
+ string value = 2;
+}
diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java
index 07e52c0cf5..23346d88d6 100644
--- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java
+++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java
@@ -23,38 +23,47 @@ import io.grpc.Server;
import io.grpc.inprocess.InProcessChannelBuilder;
import io.grpc.inprocess.InProcessServerBuilder;
import io.grpc.util.MutableHandlerRegistry;
+import java.util.concurrent.TimeUnit;
+import org.apache.skywalking.oap.server.core.analysis.IDManager;
import org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo;
import org.apache.skywalking.oap.server.core.analysis.metrics.WithMetadata;
import org.apache.skywalking.oap.server.core.exporter.ExportData;
import org.apache.skywalking.oap.server.core.exporter.ExportEvent;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
+import org.apache.skywalking.oap.server.exporter.grpc.ExportMetricValue;
+import org.apache.skywalking.oap.server.exporter.grpc.KeyValue;
import org.apache.skywalking.oap.server.exporter.grpc.MetricExportServiceGrpc;
+import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionMetric;
import org.apache.skywalking.oap.server.exporter.provider.ExporterSetting;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
import org.powermock.reflect.Whitebox;
-
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
-import java.util.concurrent.TimeUnit;
import static org.apache.skywalking.oap.server.core.exporter.ExportEvent.EventType.INCREMENT;
+import static org.mockito.Mockito.when;
public class GRPCExporterTest {
private GRPCMetricsExporter exporter;
private MetricExportServiceGrpc.MetricExportServiceImplBase service = new MockMetricExportServiceImpl();
- private MetricsMetaInfo metaInfo = new MetricsMetaInfo("mock-metrics", DefaultScopeDefine.SERVICE);
-
- private MetricExportServiceGrpc.MetricExportServiceBlockingStub stub;
+ private MetricsMetaInfo metaInfo = new MetricsMetaInfo(
+ "first-mock-metrics", DefaultScopeDefine.SERVICE, IDManager.ServiceID.buildId("mock-service", true));
+ private MetricExportServiceGrpc.MetricExportServiceBlockingStub blockingStub;
+ private MetricExportServiceGrpc.MetricExportServiceStub futureStub;
private Server server;
private ManagedChannel channel;
private MutableHandlerRegistry serviceRegistry;
+ private MockedStatic<DefaultScopeDefine> defineMockedStatic;
@BeforeEach
public void setUp() throws Exception {
@@ -74,10 +83,14 @@ public class GRPCExporterTest {
setting.setGRPCTargetHost("localhost");
setting.setGRPCTargetPort(9870);
exporter = new GRPCMetricsExporter(setting);
- serviceRegistry.addService(service);
- stub = MetricExportServiceGrpc.newBlockingStub(channel);
- Whitebox.setInternalState(exporter, "blockingStub", stub);
exporter.start();
+ serviceRegistry.addService(service);
+ blockingStub = MetricExportServiceGrpc.newBlockingStub(channel);
+ futureStub = MetricExportServiceGrpc.newStub(channel);
+ Whitebox.setInternalState(exporter, "blockingStub", blockingStub);
+ Whitebox.setInternalState(exporter, "exportServiceFutureStub", futureStub);
+ defineMockedStatic = Mockito.mockStatic(DefaultScopeDefine.class);
+ when(DefaultScopeDefine.inServiceCatalog(1)).thenReturn(true);
}
@AfterEach
@@ -96,25 +109,38 @@ public class GRPCExporterTest {
channel = null;
server.shutdownNow();
server = null;
+ defineMockedStatic.close();
}
}
@Test
public void export() {
- ExportEvent event = new ExportEvent(new MockExporterMetrics(), ExportEvent.EventType.TOTAL);
+ exporter.fetchSubscriptionList();
+ ExportEvent event = new ExportEvent(new MockExporterMetrics(), INCREMENT);
exporter.export(event);
+ List<SubscriptionMetric> subscriptionList = Whitebox.getInternalState(exporter, "subscriptionList");
+ Assertions.assertEquals("mock-metrics", subscriptionList.get(0).getMetricName());
+ Assertions.assertEquals("int-mock-metrics", subscriptionList.get(1).getMetricName());
+ Assertions.assertEquals("long-mock-metrics", subscriptionList.get(2).getMetricName());
+ Assertions.assertEquals("labeled-mock-metrics", subscriptionList.get(3).getMetricName());
}
- public static class MockExporterMetrics extends MockMetrics implements WithMetadata {
+ public static class MockExporterMetrics extends MockLabeledValueMetrics implements WithMetadata {
@Override
public MetricsMetaInfo getMeta() {
- return new MetricsMetaInfo("mock-metrics", DefaultScopeDefine.SERVICE);
+ return new MetricsMetaInfo(
+ "labeled-mock-metrics", DefaultScopeDefine.SERVICE, IDManager.ServiceID.buildId("mock-service", true));
}
}
@Test
public void initSubscriptionList() {
exporter.fetchSubscriptionList();
+ List<SubscriptionMetric> subscriptionList = Whitebox.getInternalState(exporter, "subscriptionList");
+ Assertions.assertEquals("mock-metrics", subscriptionList.get(0).getMetricName());
+ Assertions.assertEquals("int-mock-metrics", subscriptionList.get(1).getMetricName());
+ Assertions.assertEquals("long-mock-metrics", subscriptionList.get(2).getMetricName());
+ Assertions.assertEquals("labeled-mock-metrics", subscriptionList.get(3).getMetricName());
}
@Test
@@ -124,9 +150,14 @@ public class GRPCExporterTest {
@Test
public void consume() {
-
exporter.consume(dataList());
exporter.consume(Collections.emptyList());
+ List<ExportMetricValue> exportMetricValues = ((MockMetricExportServiceImpl) service).exportMetricValues;
+ Assertions.assertEquals(3, exportMetricValues.size());
+ Assertions.assertEquals(12, exportMetricValues.get(0).getMetricValues(0).getLongValue());
+ Assertions.assertEquals(1234567891234563312L, exportMetricValues.get(1).getMetricValues(0).getLongValue());
+ Assertions.assertEquals(1000L, exportMetricValues.get(2).getMetricValues(0).getLongValue());
+ Assertions.assertEquals(KeyValue.newBuilder().setKey("labelName").setValue("labelValue").build(), exportMetricValues.get(2).getMetricValues(0).getLabels(0));
}
@Test
@@ -143,10 +174,14 @@ public class GRPCExporterTest {
private List<ExportData> dataList() {
List<ExportData> dataList = new LinkedList<>();
- dataList.add(new ExportData(metaInfo, new MockMetrics(), INCREMENT));
- dataList.add(new ExportData(metaInfo, new MockIntValueMetrics(), INCREMENT));
- dataList.add(new ExportData(metaInfo, new MockLongValueMetrics(), INCREMENT));
- dataList.add(new ExportData(metaInfo, new MockDoubleValueMetrics(), INCREMENT));
+ dataList.add(new ExportData(new MetricsMetaInfo(
+ "mock-metrics", DefaultScopeDefine.SERVICE, IDManager.ServiceID.buildId("mock-service", true)), new MockMetrics(), INCREMENT));
+ dataList.add(new ExportData(new MetricsMetaInfo(
+ "int-mock-metrics", DefaultScopeDefine.SERVICE, IDManager.ServiceID.buildId("mock-service", true)), new MockIntValueMetrics(), INCREMENT));
+ dataList.add(new ExportData(new MetricsMetaInfo(
+ "long-mock-metrics", DefaultScopeDefine.SERVICE, IDManager.ServiceID.buildId("mock-service", true)), new MockLongValueMetrics(), INCREMENT));
+ dataList.add(new ExportData(new MetricsMetaInfo(
+ "labeled-mock-metrics", DefaultScopeDefine.SERVICE, IDManager.ServiceID.buildId("mock-service", true)), new MockLabeledValueMetrics(), INCREMENT));
return dataList;
}
}
diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockDoubleValueMetrics.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockLabeledValueMetrics.java
similarity index 61%
rename from oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockDoubleValueMetrics.java
rename to oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockLabeledValueMetrics.java
index f417416465..27be82b275 100644
--- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockDoubleValueMetrics.java
+++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockLabeledValueMetrics.java
@@ -18,11 +18,17 @@
package org.apache.skywalking.oap.server.exporter.provider.grpc;
-import org.apache.skywalking.oap.server.core.analysis.metrics.DoubleValueHolder;
+import org.apache.skywalking.oap.server.core.analysis.metrics.DataLabel;
+import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
+import org.apache.skywalking.oap.server.core.analysis.metrics.LabeledValueHolder;
-public class MockDoubleValueMetrics extends MockMetrics implements DoubleValueHolder {
+public class MockLabeledValueMetrics extends MockMetrics implements LabeledValueHolder {
@Override
- public double getValue() {
- return 2.3;
+ public DataTable getValue() {
+ DataTable dataTable = new DataTable();
+ DataLabel label = new DataLabel();
+ label.put("labelName", "labelValue");
+ dataTable.put(label, 1000L);
+ return dataTable;
}
}
diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetricExportServiceImpl.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetricExportServiceImpl.java
index 72b3ec4d22..40037de61c 100644
--- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetricExportServiceImpl.java
+++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetricExportServiceImpl.java
@@ -19,28 +19,65 @@
package org.apache.skywalking.oap.server.exporter.provider.grpc;
import io.grpc.stub.StreamObserver;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.skywalking.oap.server.exporter.grpc.EventType;
+import org.apache.skywalking.oap.server.exporter.grpc.ExportMetricValue;
+import org.apache.skywalking.oap.server.exporter.grpc.ExportResponse;
import org.apache.skywalking.oap.server.exporter.grpc.MetricExportServiceGrpc;
import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionMetric;
import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionReq;
import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionsResp;
public class MockMetricExportServiceImpl extends MetricExportServiceGrpc.MetricExportServiceImplBase {
+ public final List<ExportMetricValue> exportMetricValues = new ArrayList<>();
+
@Override
public void subscription(SubscriptionReq request, StreamObserver<SubscriptionsResp> responseObserver) {
SubscriptionsResp resp = SubscriptionsResp.newBuilder()
.addMetrics(
SubscriptionMetric
.newBuilder()
- .setMetricName("first")
+ .setMetricName("mock-metrics")
+ .setEventType(EventType.INCREMENT))
+ .addMetrics(
+ SubscriptionMetric
+ .newBuilder()
+ .setMetricName("int-mock-metrics")
+ .setEventType(EventType.INCREMENT))
+ .addMetrics(
+ SubscriptionMetric
+ .newBuilder()
+ .setMetricName("long-mock-metrics")
.setEventType(EventType.INCREMENT))
.addMetrics(
SubscriptionMetric
.newBuilder()
- .setMetricName("second")
+ .setMetricName("labeled-mock-metrics")
.setEventType(EventType.INCREMENT))
.build();
responseObserver.onNext(resp);
responseObserver.onCompleted();
}
+
+ @Override
+ public StreamObserver<ExportMetricValue> export(StreamObserver<ExportResponse> responseObserver) {
+ return new StreamObserver<ExportMetricValue>() {
+ @Override
+ public void onNext(ExportMetricValue value) {
+ exportMetricValues.add(value);
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ responseObserver.onError(throwable);
+ }
+
+ @Override
+ public void onCompleted() {
+ responseObserver.onNext(ExportResponse.newBuilder().build());
+ responseObserver.onCompleted();
+ }
+ };
+ }
}
diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetrics.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetrics.java
index 8cf52dccaf..9324ca9cea 100644
--- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetrics.java
+++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetrics.java
@@ -26,7 +26,7 @@ public class MockMetrics extends Metrics {
@Override
protected StorageID id0() {
- return new StorageID().append("", "mock-metrics");
+ return new StorageID().append("mock-service", "mock-metrics");
}
@Override