You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/10/18 13:28:55 UTC
[skywalking] 01/01: Fix setting wrong field when combining `Event`s
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch bugfix/event-combine
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit dcb84cae16ab390ba74b5581c9bd0268cc94ea40
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Oct 18 21:27:12 2021 +0800
Fix setting wrong field when combining `Event`s
Closes https://github.com/apache/skywalking/issues/7952
---
CHANGES.md | 1 +
.../main/java/org/apache/skywalking/oap/server/core/source/Event.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 86d1cb2..9ad5b28 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -43,6 +43,7 @@ Release Notes.
* Add `Message Queue Consuming Count` metric for MQ consuming service and endpoint.
* Add `Message Queue Avg Consuming Latency` metric for MQ consuming service and endpoint.
* Support `-Inf` as bucket in the meter system.
+* Fix setting wrong field when combining `Event`s.
#### UI
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
index 52f5b9f..f14b606 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
@@ -138,7 +138,7 @@ public class Event extends Metrics implements ISource, WithMetadata, LongValueHo
setType(event.getType());
}
if (isNotBlank(event.getMessage())) {
- setType(event.getMessage());
+ setMessage(event.getMessage());
}
if (isNotBlank(event.getParameters())) {
setParameters(event.getParameters());