From 7b09b36cd2cc75bcd2c725de5ec334b7066a241f Mon Sep 17 00:00:00 2001 From: dashanji Date: Wed, 11 May 2022 21:46:08 +0800 Subject: [PATCH] Adjust the UT of dynamic configmap config (#9033) --- docs/en/setup/backend/dynamic-config.md | 2 +- .../configmap/ConfigmapConfigWatcherRegisterTest.java | 4 ++-- .../test/resources/skywalking-dynamic-configmap.example.yaml | 4 ++-- .../configuration/nacos/NacosConfigWatcherRegisterTest.java | 2 +- .../zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/en/setup/backend/dynamic-config.md b/docs/en/setup/backend/dynamic-config.md index f8c95a4be5..9a42bc41a0 100755 --- a/docs/en/setup/backend/dynamic-config.md +++ b/docs/en/setup/backend/dynamic-config.md @@ -31,7 +31,7 @@ Supported configurations are as follows: | Config Key | Value Description | Value Format Example | |:----:|:----:|:----:| -|agent-analyzer.default.slowDBAccessThreshold| Thresholds of slow Database statement. Overrides `receiver-trace/default/slowDBAccessThreshold` of `application.yml`. | default:200,mongodb:50| +|agent-analyzer.default.slowDBAccessThreshold| Thresholds of slow Database statement. Overrides `agent-analyzer/default/slowDBAccessThreshold` of `application.yml`. | default:200,mongodb:50| |agent-analyzer.default.uninstrumentedGateways| The uninstrumented gateways. Overrides `gateways.yml`. | Same as [`gateways.yml`](uninstrumented-gateways.md#configuration-format). | |alarm.default.alarm-settings| The alarm settings. Overrides `alarm-settings.yml`. | Same as [`alarm-settings.yml`](backend-alarm.md). | |core.default.apdexThreshold| The apdex threshold settings. Overrides `service-apdex-threshold.yml`. | Same as [`service-apdex-threshold.yml`](apdex-threshold.md). | diff --git a/oap-server/server-configuration/configuration-k8s-configmap/src/test/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigWatcherRegisterTest.java b/oap-server/server-configuration/configuration-k8s-configmap/src/test/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigWatcherRegisterTest.java index dc8c5b6d8f..85e0722be9 100644 --- a/oap-server/server-configuration/configuration-k8s-configmap/src/test/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigWatcherRegisterTest.java +++ b/oap-server/server-configuration/configuration-k8s-configmap/src/test/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigWatcherRegisterTest.java @@ -93,10 +93,10 @@ public class ConfigmapConfigWatcherRegisterTest { Map configMapData = this.readMockConfigMapData(); PowerMockito.doReturn(configMapData).when(informer).configMapData(); Optional optionalConfigTable = register.readConfig(new HashSet() {{ - add("receiver-trace.default.slowDBAccessThreshold"); + add("agent-analyzer.default.slowDBAccessThreshold"); add("alarm.default.alarm-settings"); add("core.default.apdexThreshold"); - add("receiver-trace.default.uninstrumentedGateways"); + add("agent-analyzer.default.uninstrumentedGateways"); }}); Assert.assertTrue(optionalConfigTable.isPresent()); diff --git a/oap-server/server-configuration/configuration-k8s-configmap/src/test/resources/skywalking-dynamic-configmap.example.yaml b/oap-server/server-configuration/configuration-k8s-configmap/src/test/resources/skywalking-dynamic-configmap.example.yaml index 403ac19bd9..faa8227057 100644 --- a/oap-server/server-configuration/configuration-k8s-configmap/src/test/resources/skywalking-dynamic-configmap.example.yaml +++ b/oap-server/server-configuration/configuration-k8s-configmap/src/test/resources/skywalking-dynamic-configmap.example.yaml @@ -24,7 +24,7 @@ metadata: app: collector release: skywalking data: - receiver-trace.default.slowDBAccessThreshold: default:200,mongodb:50 + agent-analyzer.default.slowDBAccessThreshold: default:200,mongodb:50 alarm.default.alarm-settings: |- rules: # Rule unique name, must be ended with `_rule`. @@ -101,7 +101,7 @@ data: # tomcat: 1000 # the threshold of service "springboot1" is 50ms # springboot1: 50 - receiver-trace.default.uninstrumentedGateways: |- + agent-analyzer.default.uninstrumentedGateways: |- #gateways: # - name: proxy0 # instances: diff --git a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java index 671ae2a520..11b1005f78 100644 --- a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java +++ b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java @@ -36,7 +36,7 @@ public class NacosConfigWatcherRegisterTest { @Test public void shouldReadConfigs() throws NacosException { final String group = "skywalking"; - final String testKey1 = "receiver-trace.default.slowDBAccessThreshold"; + final String testKey1 = "agent-analyzer.default.slowDBAccessThreshold"; final String testVal1 = "test"; final String testKey2 = "testKey"; final String testVal2 = "testVal"; diff --git a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java index ac22408f29..aa9587499b 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java @@ -35,7 +35,7 @@ public class ZookeeperConfigWatcherRegisterTestCase { @Test public void TestCase() throws Exception { final String namespace = "/default"; - final String key = "receiver-trace.default.slowDBAccessThreshold"; + final String key = "agent-analyzer.default.slowDBAccessThreshold"; final String value = "default:100,mongodb:50"; final ZookeeperServerSettings mockSettings = mock(ZookeeperServerSettings.class);