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 2021/10/18 23:14:35 UTC

[skywalking] branch master updated: Fix setting wrong field when combining `Event`s (#7953)

This is an automated email from the ASF dual-hosted git repository.

wusheng 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 ca539e7  Fix setting wrong field when combining `Event`s (#7953)
ca539e7 is described below

commit ca539e7ddb73359a9959a43e269171541307e642
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Oct 19 07:14:15 2021 +0800

    Fix setting wrong field when combining `Event`s (#7953)
---
 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 7f17550..d80e213 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -44,6 +44,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());