From 64707e061713a915a812938b496c2e70b40f72a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E8=90=BD=E6=AE=87=E7=A7=8B?= <66098854+tangshan-brs@users.noreply.github.com> Date: Thu, 12 Nov 2020 08:57:37 +0800 Subject: [PATCH] Fix dynamic configuration key bug of `endpoint-name-grouping` #5831 (#5833) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tangs 修改key识别为core * Update CHANGES.md Co-authored-by: 唐山 Co-authored-by: 吴晟 Wu Sheng --- CHANGES.md | 3 ++- .../core/config/group/EndpointNameGroupingRuleWatcher.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c4a354c038..85bb71d4ee 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -39,7 +39,8 @@ Release Notes. * Fix CVE in the uninstrumented gateways configs, when activating the dynamic configuration feature. * Fix CVE in the Apdex threshold configs, when activating the dynamic configuration feature. * Make the codes and doc consistent in sharding server and core server. -* Fix that chunked string is incorrect while the tag contains colon +* Fix that chunked string is incorrect while the tag contains colon. +* Fix the incorrect dynamic configuration key bug of `endpoint-name-grouping`. #### UI * Fix incorrect label in radial chart in topology. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java index cfb307fc09..f9cffbf296 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java @@ -22,6 +22,7 @@ import java.io.FileNotFoundException; import java.io.StringReader; import lombok.extern.slf4j.Slf4j; import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher; +import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.library.module.ModuleProvider; import org.apache.skywalking.oap.server.library.util.ResourceUtils; @@ -35,7 +36,7 @@ public class EndpointNameGroupingRuleWatcher extends ConfigChangeWatcher { public EndpointNameGroupingRuleWatcher(ModuleProvider provider, EndpointNameGrouping grouping) throws FileNotFoundException { - super(provider.module().getName(), provider, "endpoint-name-grouping"); + super(CoreModule.NAME, provider, "endpoint-name-grouping"); this.grouping = grouping; // This is just a place holder text representing the original text. ruleSetting = "SkyWalking endpoint rule"; -- GitLab