From 467a95b61d843233046b333bdbed232f990c2d7a Mon Sep 17 00:00:00 2001 From: Cool-Coding Date: Mon, 19 Jul 2021 14:58:24 +0800 Subject: [PATCH] Fix the problem of -meters metrics topic isn't created with namespace prefix (#7325) (#7330) --- CHANGES.md | 1 + docs/en/setup/backend/backend-fetcher.md | 3 --- docs/en/setup/backend/backend-meter.md | 1 - docs/en/setup/backend/configuration-vocabulary.md | 1 - .../server-bootstrap/src/main/resources/application.yml | 1 - .../analyzer/agent/kafka/module/KafkaFetcherConfig.java | 2 -- .../analyzer/agent/kafka/provider/KafkaFetcherProvider.java | 4 +--- 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4ab666c5f..7c5019fee 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -105,6 +105,7 @@ Release Notes. * The `core/syncThreads` setting(added in 8.5.0) is removed due to metrics persistence is fully asynchronous. * Optimization: Concurrency mode of execution stage for metrics is removed(added in 8.5.0). Only concurrency of prepare stage is meaningful and kept. +* Fix -meters metrics topic isn't created with namespace issue #### UI diff --git a/docs/en/setup/backend/backend-fetcher.md b/docs/en/setup/backend/backend-fetcher.md index cd684813c..717c55add 100644 --- a/docs/en/setup/backend/backend-fetcher.md +++ b/docs/en/setup/backend/backend-fetcher.md @@ -108,7 +108,6 @@ kafka-fetcher: namespace: ${SW_NAMESPACE:""} partitions: ${SW_KAFKA_FETCHER_PARTITIONS:3} replicationFactor: ${SW_KAFKA_FETCHER_PARTITIONS_FACTOR:2} - enableMeterSystem: ${SW_KAFKA_FETCHER_ENABLE_METER_SYSTEM:false} isSharding: ${SW_KAFKA_FETCHER_IS_SHARDING:false} consumePartitions: ${SW_KAFKA_FETCHER_CONSUME_PARTITIONS:""} ``` @@ -124,7 +123,6 @@ kafka-fetcher: namespace: ${SW_NAMESPACE:""} partitions: ${SW_KAFKA_FETCHER_PARTITIONS:3} replicationFactor: ${SW_KAFKA_FETCHER_PARTITIONS_FACTOR:2} - enableMeterSystem: ${SW_KAFKA_FETCHER_ENABLE_METER_SYSTEM:false} isSharding: ${SW_KAFKA_FETCHER_IS_SHARDING:true} consumePartitions: ${SW_KAFKA_FETCHER_CONSUME_PARTITIONS:1,3,5} kafkaConsumerConfig: @@ -141,7 +139,6 @@ kafka-fetcher: namespace: ${SW_NAMESPACE:""} partitions: ${SW_KAFKA_FETCHER_PARTITIONS:3} replicationFactor: ${SW_KAFKA_FETCHER_PARTITIONS_FACTOR:2} - enableMeterSystem: ${SW_KAFKA_FETCHER_ENABLE_METER_SYSTEM:false} isSharding: ${SW_KAFKA_FETCHER_IS_SHARDING:true} consumePartitions: ${SW_KAFKA_FETCHER_CONSUME_PARTITIONS:1,3,5} mm2SourceAlias: ${SW_KAFKA_MM2_SOURCE_ALIAS:""} diff --git a/docs/en/setup/backend/backend-meter.md b/docs/en/setup/backend/backend-meter.md index e94b843bb..178c043e6 100644 --- a/docs/en/setup/backend/backend-meter.md +++ b/docs/en/setup/backend/backend-meter.md @@ -15,7 +15,6 @@ kafka-fetcher: selector: ${SW_KAFKA_FETCHER:default} default: bootstrapServers: ${SW_KAFKA_FETCHER_SERVERS:localhost:9092} - enableMeterSystem: ${SW_KAFKA_FETCHER_ENABLE_METER_SYSTEM:true} ``` ## Configuration file diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md index 7c52b1593..0eb412843 100644 --- a/docs/en/setup/backend/configuration-vocabulary.md +++ b/docs/en/setup/backend/configuration-vocabulary.md @@ -228,7 +228,6 @@ core|default|role|Option values, `Mixed/Receiver/Aggregator`. **Receiver** mode | - | - | isSharding | it was true when OAP Server in cluster. | SW_KAFKA_FETCHER_IS_SHARDING | false | | - | - | createTopicIfNotExist | If true, create the Kafka topic when it does not exist. | - | true | | - | - | partitions | The number of partitions for the topic being created. | SW_KAFKA_FETCHER_PARTITIONS | 3 | -| - | - | enableMeterSystem | To enable to fetch and handle [Meter System](backend-meter.md) data. | SW_KAFKA_FETCHER_ENABLE_METER_SYSTEM | false | | - | - | enableNativeProtoLog | To enable to fetch and handle native proto log data. | SW_KAFKA_FETCHER_ENABLE_NATIVE_PROTO_LOG | false | | - | - | enableNativeJsonLog | To enable to fetch and handle native json log data. | SW_KAFKA_FETCHER_ENABLE_NATIVE_JSON_LOG | false | | - | - | replicationFactor | The replication factor for each partition in the topic being created. | SW_KAFKA_FETCHER_PARTITIONS_FACTOR | 2 | diff --git a/oap-server/server-bootstrap/src/main/resources/application.yml b/oap-server/server-bootstrap/src/main/resources/application.yml index 22ac44120..d79a40cc6 100755 --- a/oap-server/server-bootstrap/src/main/resources/application.yml +++ b/oap-server/server-bootstrap/src/main/resources/application.yml @@ -366,7 +366,6 @@ kafka-fetcher: namespace: ${SW_NAMESPACE:""} partitions: ${SW_KAFKA_FETCHER_PARTITIONS:3} replicationFactor: ${SW_KAFKA_FETCHER_PARTITIONS_FACTOR:2} - enableMeterSystem: ${SW_KAFKA_FETCHER_ENABLE_METER_SYSTEM:false} enableNativeProtoLog: ${SW_KAFKA_FETCHER_ENABLE_NATIVE_PROTO_LOG:false} enableNativeJsonLog: ${SW_KAFKA_FETCHER_ENABLE_NATIVE_JSON_LOG:false} isSharding: ${SW_KAFKA_FETCHER_IS_SHARDING:false} diff --git a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/module/KafkaFetcherConfig.java b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/module/KafkaFetcherConfig.java index e173513b3..424d77f76 100644 --- a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/module/KafkaFetcherConfig.java +++ b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/module/KafkaFetcherConfig.java @@ -67,8 +67,6 @@ public class KafkaFetcherConfig extends ModuleConfig { */ private int replicationFactor = 2; - private boolean enableMeterSystem = false; - private boolean enableNativeProtoLog = false; private boolean enableNativeJsonLog = false; diff --git a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/KafkaFetcherProvider.java b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/KafkaFetcherProvider.java index 697ec256d..c68a6bc80 100644 --- a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/KafkaFetcherProvider.java +++ b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/KafkaFetcherProvider.java @@ -74,10 +74,8 @@ public class KafkaFetcherProvider extends ModuleProvider { handlerRegister.register(new ServiceManagementHandler(getManager(), config)); handlerRegister.register(new TraceSegmentHandler(getManager(), config)); handlerRegister.register(new ProfileTaskHandler(getManager(), config)); + handlerRegister.register(new MeterServiceHandler(getManager(), config)); - if (config.isEnableMeterSystem()) { - handlerRegister.register(new MeterServiceHandler(getManager(), config)); - } if (config.isEnableNativeProtoLog()) { handlerRegister.register(new LogHandler(getManager(), config)); }