kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dynamic configuration key bug of `endpoint-name-grouping` #5831 (#5833) 

* tangs 修改key识别为core
* Update CHANGES.md


Co-authored-by: 唐山 <tangs@dev.sgcc.com>
Co-authored-by: 吴晟 Wu Sheng <wu.sheng@foxmail.com>
This commit is contained in:
雨落殇秋 2020-11-12 08:57:37 +08:00 committed by GitHub
parent 5e8b6e92e2
commit 64707e0617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -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.

3
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java
View File

@ -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";