[skywalking] branch bugfix/event-combine updated (5020cf6 -> dcb84ca)

[ke...@apache.org]

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

kezhenxu94 pushed a change to branch bugfix/event-combine
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 5020cf6  bugfix: set wrong field when combining `Event`s
     new dcb84ca  Fix setting wrong field when combining `Event`s

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   (5020cf6)
            \
             N -- N -- N   refs/heads/bugfix/event-combine (dcb84ca)

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:
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

[skywalking] 01/01: Fix setting wrong field when combining `Event`s

[ke...@apache.org]

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());