Skip to content

Commit 64b24f7

Browse files
authored
Use listening mode for Apollo configuration. (#11186)
1 parent 8d09ba6 commit 64b24f7

File tree

19 files changed

+582
-273
lines changed

19 files changed

+582
-273
lines changed

docs/en/changes/changes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
* Remove ElasticSearch 6.3.2 from our client lib tests.
6666
* Bump up ElasticSearch server 8.8.1 to 8.9.0 for latest e2e testing. 8.1.0, 7.16.3 and 7.17.10 are still tested.
6767
* Add OpenSearch 2.8.0 to our client lib tests.
68-
* Apply MQE on RabbitMQ Dashboards
68+
* Apply MQE on RabbitMQ Dashboards.
69+
* Use listening mode for apollo implementation of dynamic configuration.
6970

7071

7172
#### UI

docs/en/setup/backend/configuration-vocabulary.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ The Configuration Vocabulary lists all available configurations provided by `app
273273
| - | - | apolloCluster | `apollo.cluster` in Apollo. | SW_CONFIG_APOLLO_CLUSTER | default |
274274
| - | - | apolloEnv | `env` in Apollo. | SW_CONFIG_APOLLO_ENV | - |
275275
| - | - | appId | `app.id` in Apollo. | SW_CONFIG_APOLLO_APP_ID | skywalking |
276-
| - | - | period | The period of data sync (in seconds). | SW_CONFIG_APOLLO_PERIOD | 60 |
277276
| - | zookeeper | namespace | The namespace (represented by root path) that isolates the configurations in the Zookeeper. | SW_CONFIG_ZK_NAMESPACE | `/`, root path |
278277
| - | - | hostPort | Hosts and ports of Zookeeper Cluster. | SW_CONFIG_ZK_HOST_PORT | localhost:2181 |
279278
| - | - | baseSleepTimeMs | The period of Zookeeper client between two retries (in milliseconds). | SW_CONFIG_ZK_BASE_SLEEP_TIME_MS | 1000 |

docs/en/setup/backend/dynamic-config-apollo.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ configuration:
1010
apolloCluster: ${SW_CONFIG_APOLLO_CLUSTER:default}
1111
apolloEnv: ${SW_CONFIG_APOLLO_ENV:""}
1212
appId: ${SW_CONFIG_APOLLO_APP_ID:skywalking}
13-
period: ${SW_CONFIG_APOLLO_PERIOD:60}
1413
```
1514
1615
## Config Storage

oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/trace/TraceSamplingPolicyWatcherTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher;
2626
import org.apache.skywalking.oap.server.configuration.api.ConfigTable;
2727
import org.apache.skywalking.oap.server.configuration.api.ConfigWatcherRegister;
28+
import org.apache.skywalking.oap.server.configuration.api.FetchingConfigWatcherRegister;
2829
import org.apache.skywalking.oap.server.configuration.api.GroupConfigTable;
2930
import org.junit.jupiter.api.Assertions;
3031
import org.junit.jupiter.api.BeforeEach;
@@ -121,7 +122,7 @@ public void testTraceLatencyThresholdNotify() {
121122
" duration: 800");
122123
}
123124

124-
public static class TraceLatencyThresholdMockConfigWatcherRegister extends ConfigWatcherRegister {
125+
public static class TraceLatencyThresholdMockConfigWatcherRegister extends FetchingConfigWatcherRegister {
125126

126127
public TraceLatencyThresholdMockConfigWatcherRegister(long syncPeriod) {
127128
super(syncPeriod);
@@ -205,7 +206,7 @@ public void testDefaultSampleRateNotify() {
205206
" rate: 500");
206207
}
207208

208-
public static class DefaultSampleRateMockConfigWatcherRegister extends ConfigWatcherRegister {
209+
public static class DefaultSampleRateMockConfigWatcherRegister extends FetchingConfigWatcherRegister {
209210

210211
public DefaultSampleRateMockConfigWatcherRegister(long syncPeriod) {
211212
super(syncPeriod);
@@ -335,7 +336,7 @@ public void testServiceSampleRateNotify() {
335336

336337
}
337338

338-
public static class ServiceMockConfigWatcherRegister extends ConfigWatcherRegister {
339+
public static class ServiceMockConfigWatcherRegister extends FetchingConfigWatcherRegister {
339340

340341
public ServiceMockConfigWatcherRegister(long syncPeriod) {
341342
super(syncPeriod);

0 commit comments

Comments
 (0)