You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/03/27 06:44:18 UTC
[skywalking] 01/01: Fix event type of export data is incorrect, it was `EventType.TOTAL` always.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 0fce050c5725b8ad2db0f93cfb3305585adc6dde
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Mar 27 14:43:49 2022 +0800
Fix event type of export data is incorrect, it was `EventType.TOTAL` always.
---
CHANGES.md | 1 +
.../skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java | 6 +++---
.../library/elasticsearch/requests/factory/TemplateFactory.java | 2 +-
.../org/apache/skywalking/oap/server/receiver/otel/Handler.java | 5 +++--
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 149d621..291849e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -143,6 +143,7 @@ NOTICE, this sharding concept is NOT just for splitting data into different data
* Enhance endpoint dependency analysis to support cross threads cases. Refactor span analysis code structures.
* Remove `isNotNormal` service requirement when use alias to merge service topology from client side. All RPCs' peer
services from client side are always normal services. This cause the topology is not merged correctly.
+* Fix event type of export data is incorrect, it was `EventType.TOTAL` always.
#### UI
diff --git a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
index fd6d28e..5fe5e5b 100644
--- a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
+++ b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
@@ -27,8 +27,6 @@ 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.library.datacarrier.DataCarrier;
-import org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer;
import org.apache.skywalking.oap.server.core.analysis.metrics.DoubleValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.IntValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder;
@@ -49,6 +47,8 @@ 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.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.GRPCStreamStatus;
@Slf4j
@@ -180,7 +180,7 @@ public class GRPCExporter extends MetricFormatter implements MetricValuesExportS
MetricsMetaInfo meta = row.getMeta();
builder.setMetricName(meta.getMetricsName());
builder.setEventType(
- EventType.INCREMENT.equals(row.getEventType()) ? EventType.INCREMENT : EventType.TOTAL);
+ ExportEvent.EventType.INCREMENT.equals(row.getEventType()) ? EventType.INCREMENT : EventType.TOTAL);
String entityName = getEntityName(meta);
if (entityName == null) {
return;
diff --git a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/TemplateFactory.java b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/TemplateFactory.java
index 3fb7a66..c90fd47 100644
--- a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/TemplateFactory.java
+++ b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/TemplateFactory.java
@@ -39,7 +39,7 @@ public interface TemplateFactory {
/**
* Returns a request to create or update a template of {@code name} with the given {@code
- * settings}, {@code mapping} and {@code order}.
+ * settings}, {@code mappings} and {@code order}.
*/
HttpRequest createOrUpdate(String name, Map<String, ?> settings,
Mappings mappings, int order);
diff --git a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/Handler.java b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/Handler.java
index 03b3fc0..bb2f78d 100644
--- a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/Handler.java
+++ b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/Handler.java
@@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.receiver.otel;
import com.google.common.collect.ImmutableSet;
import com.google.common.reflect.ClassPath;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -41,8 +42,8 @@ public interface Handler {
Class<?> c = each.load();
if (Arrays.stream(c.getInterfaces()).anyMatch(interfaceClass -> interfaceClass.isAssignableFrom(Handler.class))) {
try {
- result.add((Handler) c.newInstance());
- } catch (InstantiationException | IllegalAccessException e) {
+ result.add((Handler) c.getDeclaredConstructor().newInstance());
+ } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
throw new HandlerInitializationException("failed to get instances of handler classed", e);
}
}