From 9dff577548fc6a9a4a3669eddbda284037bf0020 Mon Sep 17 00:00:00 2001 From: "sanhuan.sw" Date: Tue, 8 Aug 2023 20:10:17 +0800 Subject: [PATCH] git subrepo push --remote=git@github.com:sw1136562366/holoinsight.git --branch=fix/fix_apm_log_level opensource subrepo: subdir: "opensource" merged: "4fd27c37b" upstream: origin: "git@github.com:sw1136562366/holoinsight.git" branch: "fix/fix_apm_log_level" commit: "4fd27c37b" git-subrepo: version: "0.4.3" origin: "https://github.com/Homebrew/brew" commit: "4446fe603" --- .../io/holoinsight/server/apm/receiver/trace/SpanHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/apm/apm-server/apm-receiver/src/main/java/io/holoinsight/server/apm/receiver/trace/SpanHandler.java b/server/apm/apm-server/apm-receiver/src/main/java/io/holoinsight/server/apm/receiver/trace/SpanHandler.java index 67e25d1e3..7478686a1 100644 --- a/server/apm/apm-server/apm-receiver/src/main/java/io/holoinsight/server/apm/receiver/trace/SpanHandler.java +++ b/server/apm/apm-server/apm-receiver/src/main/java/io/holoinsight/server/apm/receiver/trace/SpanHandler.java @@ -180,7 +180,9 @@ public void buildRelation(List relationBuilders) throws relationBuilders.forEach(callingIn -> { ServiceRelation serviceRelation = callingIn.toServiceRelation(); - serverRelationList.add(ServiceRelationDO.fromServiceRelation(serviceRelation)); + if (serviceRelation != null) { + serverRelationList.add(ServiceRelationDO.fromServiceRelation(serviceRelation)); + } ServiceInstanceRelation serviceInstanceRelation = callingIn.toServiceInstanceRelation(); if (serviceInstanceRelation != null) {