[skywalking] branch master updated: Fix the component id is reversed in process relation (#10113)

[wusheng]

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 6efaa6f9bc Fix the component id is reversed in process relation 
(#10113)
6efaa6f9bc is described below

commit 6efaa6f9bcca524b4b256ff1128cae87d76b6739
Author: mrproliu <741550...@qq.com>
AuthorDate: Tue Dec 6 20:33:59 2022 +0800

    Fix the component id is reversed in process relation (#10113)
---
 .../manual/relation/process/ProcessRelationClientSideMetrics.java       | 2 +-
 .../manual/relation/process/ProcessRelationServerSideMetrics.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationClientSideMetrics.java
 
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationClientSideMetrics.java
index 683c8fff8f..109305aabd 100644
--- 
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationClientSideMetrics.java
+++ 
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationClientSideMetrics.java
@@ -80,7 +80,7 @@ public class ProcessRelationClientSideMetrics extends Metrics 
{
     @Override
     public boolean combine(Metrics metrics) {
         final ProcessRelationClientSideMetrics 
processRelationClientSideMetrics = (ProcessRelationClientSideMetrics) metrics;
-        if (ProcessNetworkRelationIDs.compare(this.componentId, 
processRelationClientSideMetrics.getComponentId())) {
+        if (!ProcessNetworkRelationIDs.compare(this.componentId, 
processRelationClientSideMetrics.getComponentId())) {
             
this.setComponentId(processRelationClientSideMetrics.getComponentId());
             return true;
         }
diff --git 
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationServerSideMetrics.java
 
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationServerSideMetrics.java
index f3ae9fe867..78849f4d33 100644
--- 
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationServerSideMetrics.java
+++ 
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationServerSideMetrics.java
@@ -79,7 +79,7 @@ public class ProcessRelationServerSideMetrics extends Metrics 
{
     @Override
     public boolean combine(Metrics metrics) {
         final ProcessRelationServerSideMetrics 
processRelationServerSideMetrics = (ProcessRelationServerSideMetrics) metrics;
-        if (ProcessNetworkRelationIDs.compare(this.componentId, 
processRelationServerSideMetrics.getComponentId())) {
+        if (!ProcessNetworkRelationIDs.compare(this.componentId, 
processRelationServerSideMetrics.getComponentId())) {
             
this.setComponentId(processRelationServerSideMetrics.getComponentId());
             return true;
         }