This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new b7ae788 [type: delete]: remove monitor plugin. (#2991)
b7ae788 is described below
commit b7ae788989386e7ef95e48fe1a1b7e2c120c4e74
Author: YuI <[email protected]>
AuthorDate: Sun Mar 6 22:43:47 2022 +0800
[type: delete]: remove monitor plugin. (#2991)
* [type: modify]: remove tag of big object in trace.
* [type: feature]: add a part of metrics in agent
* [type: modify]: delete test code.
* [type: modify]: modify shenyu-agent-plugin-metrics-prometheus's module
pom.xml.
* [type: fix]: fix JaegerGlobalPluginHandler.class to resolve NPE.
* [type: feature]: add shenyu_execute_latency_millis metrics.
* [type: modify]: revert yaml.
* [type: feature]: add shenyu_dubbo_request_total metrics.
* [type: feature]: add metrics of grpc、sofa、tars、motan and spring cloud.
* [type: delete]: remove monitor plugin.
* [type: modify]: modify to h2 db.
Co-authored-by: 艺铭 <[email protected]>
---
script/2.4.2-upgrade-2.4.3-mysql.sql | 6 +-
script/2.4.2-upgrade-2.4.3-pg.sql | 6 +-
.../src/main/resources/sql-script/h2/schema.sql | 6 +-
.../src/main/resources/sql-script/mysql/schema.sql | 5 --
.../src/main/resources/sql-script/pg/schema.sql | 7 +-
shenyu-bootstrap/pom.xml | 8 ---
.../org/apache/shenyu/common/enums/PluginEnum.java | 5 --
.../src/main/resources/conf/tracing-point.yaml | 11 ---
.../src/main/resources/conf/tracing-point.yaml | 7 --
.../src/main/resources/conf/tracing-point.yaml | 7 --
.../src/main/resources/conf/tracing-point.yaml | 7 --
shenyu-plugin/pom.xml | 1 -
shenyu-plugin/shenyu-plugin-monitor/pom.xml | 51 --------------
.../shenyu/plugin/monitor/MonitorPlugin.java | 78 ----------------------
.../monitor/handler/MonitorPluginDataHandler.java | 75 ---------------------
.../shenyu/plugin/monitor/MonitorPluginTest.java | 68 -------------------
.../handler/MonitorPluginDataHandlerTest.java | 73 --------------------
.../shenyu-spring-boot-starter-plugin/pom.xml | 1 -
.../pom.xml | 49 --------------
.../plugin/monitor/MonitorPluginConfiguration.java | 52 ---------------
.../src/main/resources/META-INF/spring.factories | 19 ------
.../src/main/resources/META-INF/spring.provides | 18 -----
.../monitor/MonitorPluginConfigurationTest.java | 63 -----------------
.../resources/mock_configs_fetch_response.json | 7 --
24 files changed, 12 insertions(+), 618 deletions(-)
diff --git a/script/2.4.2-upgrade-2.4.3-mysql.sql
b/script/2.4.2-upgrade-2.4.3-mysql.sql
index 9f70c46..e14d645 100644
--- a/script/2.4.2-upgrade-2.4.3-mysql.sql
+++ b/script/2.4.2-upgrade-2.4.3-mysql.sql
@@ -34,4 +34,8 @@ INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`,
`label`, `data_type`, `t
INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'fixed', 'fixed', '', '3', '1');
INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'eager', 'eager', '', '2', '1');
INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'cached', 'cached', '', '0', '1');
-INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'limited', 'limited', '', '1', '1');
\ No newline at end of file
+INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'limited', 'limited', '', '1', '1');
+
+-- remove monitor plugin
+DELETE FROM plugin WHERE `id` = '7';
+DELETE FROM plugin_handle WHERE `plugin_id` = '7';
\ No newline at end of file
diff --git a/script/2.4.2-upgrade-2.4.3-pg.sql
b/script/2.4.2-upgrade-2.4.3-pg.sql
index 5fa88cf..4d94e6a 100644
--- a/script/2.4.2-upgrade-2.4.3-pg.sql
+++ b/script/2.4.2-upgrade-2.4.3-pg.sql
@@ -34,4 +34,8 @@ INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`,
`label`, `data_type`, `t
INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'fixed', 'fixed', '', '3', '1');
INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'eager', 'eager', '', '2', '1');
INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'cached', 'cached', '', '0', '1');
-INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'limited', 'limited', '', '1', '1');
\ No newline at end of file
+INSERT IGNORE INTO shenyu_dict (`type`, `dict_code`, `dict_name`,
`dict_value`, `desc`, `sort`, `enabled`) VALUES ('threadpool', 'THREADPOOL',
'limited', 'limited', '', '1', '1');
+
+-- remove monitor plugin
+DELETE FROM plugin WHERE `id` = '7';
+DELETE FROM plugin_handle WHERE `plugin_id` = '7';
\ No newline at end of file
diff --git a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
index 07ec38f..629ea36 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -336,7 +336,6 @@ INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`,
`enabled`, `date_crea
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,`enabled`,
`date_created`, `date_updated`) VALUES ('4','rateLimiter','FaultTolerance',
60,'{"master":"mymaster","mode":"standalone","url":"192.168.1.1:6379","password":"abc"}',
'0', '2018-06-23 10:26:37', '2018-06-13 15:34:48');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,`enabled`,
`date_created`, `date_updated`) VALUES ('5','divide', 'Proxy',
200,'{"multiSelectorHandle":"1","multiRuleHandle":"0"}','1', '2018-06-25
10:19:10', '2018-06-13 13:56:04');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,`enabled`,
`date_created`, `date_updated`) VALUES ('6','dubbo','Proxy',
310,'{"register":"zookeeper://localhost:2181","multiSelectorHandle":"1","threadpool":"cached","corethreads":0,"threads":2147483647,"queues":0}',
'0', '2018-06-23 10:26:41', '2018-06-11 10:11:47');;
-INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,`enabled`,
`date_created`, `date_updated`) VALUES ('7','monitor', 'Monitor',
170,'{"metricsName":"prometheus","host":"localhost","port":"9190","async":"true"}','0',
'2018-06-25 13:47:57', '2018-06-25 13:47:57');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`,
`date_created`, `date_updated`) VALUES ('8','springCloud','Proxy', 200, '0',
'2018-06-25 13:47:57', '2018-06-25 13:47:57');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`,
`date_created`, `date_updated`) VALUES ('9','hystrix', 'FaultTolerance',
130,'0', '2020-01-15 10:19:10', '2020-01-15 10:19:10');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`,
`date_created`, `date_updated`) VALUES ('10','sentinel', 'FaultTolerance',
140,'0', '2020-11-09 01:19:10', '2020-11-09 01:19:10');;
@@ -418,10 +417,7 @@ INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`,
`label`, `data_type`, `t
INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('11', 'register', 'register', 2, 3, 2,
NULL);;
INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('2', 'model', 'model', 2, 3, 1, NULL);;
INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('6', 'register', 'register', 2, 3, 1, NULL);;
-INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('7', 'metricsName', 'metricsName', 2, 3, 1,
NULL);;
-INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('7', 'host', 'host', 2, 3, 2, NULL);;
-INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('7', 'port', 'port', 2, 3, 3,
'{"rule":"/^[0-9]*$/"}');;
-INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('7', 'async', 'async', 2, 3, 4, NULL);;
+
/*insert plugin_handle data for plugin rateLimiter*/
INSERT IGNORE INTO plugin_handle
(`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES ('4'
,'algorithmName','algorithmName','3', 2, 1,
'{"required":"1","defaultValue":"slidingWindow","rule":""}');;
INSERT IGNORE INTO plugin_handle
(`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES ('4'
,'keyResolverName','keyResolverName','3', 2, 4,
'{"required":"1","defaultValue":"WHOLE_KEY_RESOLVER","rule":""}');;
diff --git a/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
b/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
index 713c972..52d8d09 100644
--- a/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
@@ -349,7 +349,6 @@ INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`,
`enabled`, `date_crea
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,`enabled`,
`date_created`, `date_updated`) VALUES ('4','rateLimiter','FaultTolerance',
60,'{"master":"mymaster","mode":"standalone","url":"192.168.1.1:6379","password":"abc"}',
'0', '2018-06-23 10:26:37', '2018-06-13 15:34:48');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,`enabled`,
`date_created`, `date_updated`) VALUES ('5','divide', 'Proxy',
200,'{"multiSelectorHandle":"1","multiRuleHandle":"0"}','1', '2018-06-25
10:19:10', '2018-06-13 13:56:04');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,`enabled`,
`date_created`, `date_updated`) VALUES ('6','dubbo','Proxy',
310,'{"register":"zookeeper://localhost:2181","multiSelectorHandle":"1","threadpool":"cached","corethreads":0,"threads":2147483647,"queues":0}',
'0', '2018-06-23 10:26:41', '2018-06-11 10:11:47');;
-INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,`enabled`,
`date_created`, `date_updated`) VALUES ('7','monitor', 'Monitor',
170,'{"metricsName":"prometheus","host":"localhost","port":"9190","async":"true"}','0',
'2018-06-25 13:47:57', '2018-06-25 13:47:57');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`,
`date_created`, `date_updated`) VALUES ('8','springCloud','Proxy', 200, '0',
'2018-06-25 13:47:57', '2018-06-25 13:47:57');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`,
`date_created`, `date_updated`) VALUES ('9','hystrix', 'FaultTolerance',
130,'0', '2020-01-15 10:19:10', '2020-01-15 10:19:10');;
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`,
`date_created`, `date_updated`) VALUES ('10','sentinel', 'FaultTolerance',
140,'0', '2020-11-09 01:19:10', '2020-11-09 01:19:10');;
@@ -431,10 +430,6 @@ INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`,
`label`, `data_type`, `t
INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('11', 'register', 'register', 2, 3, 2,
NULL);;
INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('2', 'model', 'model', 2, 3, 1, NULL);;
INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('6', 'register', 'register', 2, 3, 1, NULL);;
-INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('7', 'metricsName', 'metricsName', 2, 3, 1,
NULL);;
-INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('7', 'host', 'host', 2, 3, 2, NULL);;
-INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('7', 'port', 'port', 2, 3, 3,
'{"rule":"/^[0-9]*$/"}');;
-INSERT IGNORE INTO plugin_handle (`plugin_id`, `field`, `label`, `data_type`,
`type`, `sort`, `ext_obj`) VALUES ('7', 'async', 'async', 2, 3, 4, NULL);;
/*insert plugin_handle data for plugin rateLimiter*/
INSERT IGNORE INTO plugin_handle
(`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES ('4'
,'algorithmName','algorithmName','3', 2, 1,
'{"required":"1","defaultValue":"slidingWindow","rule":""}');;
diff --git a/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
b/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
index 79d8e52..c347936 100644
--- a/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
@@ -390,7 +390,6 @@ ELSE
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin" VALUES
(''' || '4' || ''', ''' || 'rateLimiter' || ''', ''' ||
'{"master":"mymaster","mode":"standalone","url":"192.168.1.1:6379","password":"abc"}'
|| ''', ''' || 'FaultTolerance' || ''', 60, 0, ''' || '2018-06-23 10:26:37' ||
''', ''' || '2018-06-13 15:34:48' || ''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin" VALUES
(''' || '5' || ''', ''' || 'divide' || ''', ''' ||
'{"multiSelectorHandle":"1","multiRuleHandle":"0"}' || ''', ''' || 'Proxy' ||
''', 200, 1, ''' || '2018-06-25 10:19:10' || ''', ''' || '2018-06-13 13:56:04'
|| ''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin" VALUES
(''' || '6' || ''', ''' || 'dubbo' || ''', ''' ||
'{"register":"zookeeper://localhost:2181","multiSelectorHandle":"1","threadpool":"cached","corethreads":0,"threads":2147483647,"queues":0}'
|| ''', ''' || 'Proxy' || ''', 310, 0, ''' || '2018-06-23 10:26:41' || ''',
''' || '2018-06-11 10:11:47' || ''');');
- PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin" VALUES
(''' || '7' || ''', ''' || 'monitor' || ''', ''' ||
'{"metricsName":"prometheus","host":"localhost","port":"9190","async":"true"}'
|| ''', ''' || 'Monitor' || ''', 170, 0, ''' || '2018-06-25 13:47:57' || ''',
''' || '2018-06-25 13:47:57' || ''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin" VALUES
(''' || '8' || ''', ''' || 'springCloud' || ''', NULL, ''' || 'Proxy' || ''',
200, 0, ''' || '2018-06-25 13:47:57' || ''', ''' || '2018-06-25 13:47:57' ||
''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin" VALUES
(''' || '9' || ''', ''' || 'hystrix' || ''', NULL, ''' || 'FaultTolerance' ||
''', 130, 0, ''' || '2020-01-15 10:19:10' || ''', ''' || '2020-01-15 10:19:10'
|| ''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin" VALUES
(''' || '27' || ''', ''' || 'generalContext' || ''', NULL, ''' || 'Common' ||
''', 125, 0, ''' || '2021-11-24 21:38:48' || ''', ''' || '2021-11-24 21:38:48'
|| ''');');
@@ -542,10 +541,7 @@ ELSE
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '11' || ''', ''' || 'register' || ''', ''' || 'register' || ''', 2, 3,
2, NULL);');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '2' || ''', ''' || 'model' || ''', ''' || 'model' || ''', 2, 3, 1,
NULL);');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '6' || ''', ''' || 'register' || ''', ''' || 'register' || ''', 2, 3,
1, NULL);');
- PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '7' || ''', ''' || 'metricsName' || ''', ''' || 'metricsName' || ''',
2, 3, 1, NULL);');
- PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '7' || ''', ''' || 'host' || ''', ''' || 'host' || ''', 2, 3, 2,
NULL);');
- PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '7' || ''', ''' || 'port' || ''', ''' || 'port' || ''', 2, 3, 3, ''' ||
'{"rule":"/^[0-9]*$/"}' || ''');');
- PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '7' || ''', ''' || 'async' || ''', ''' || 'async' || ''', 2, 3, 4,
NULL);');
+
/*insert "plugin_handle" data for plugin rateLimiter*/
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES (''' ||
'4' || ''' ,''' || 'algorithmName' || ''',''' || 'algorithmName' || ''',''' ||
'3' || ''', 2, 1, ''' ||
'{"required":"1","defaultValue":"slidingWindow","rule":""}' || ''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES (''' ||
'4' || ''' ,''' || 'keyResolverName' || ''',''' || 'keyResolverName' || ''','''
|| '3' || ''', 2, 4, ''' ||
'{"required":"1","defaultValue":"WHOLE_KEY_RESOLVER","rule":""}' || ''');');
@@ -617,7 +613,6 @@ ELSE
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '6' || ''', ''' || 'multiSelectorHandle' || ''', ''' ||
'multiSelectorHandle' || ''', ''' || '3' || ''', ''' || '3' || ''', ''' || '0'
|| ''', NULL);');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '6' || ''', ''' || 'protocol' || ''', ''' || 'protocol' || ''', ''' ||
'2' || ''', ''' || '1' || ''', ''' || '2' || ''', ''' ||
'{"required":"0","defaultValue":"","placeholder":"http://","rule":""}' ||
''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '6' || ''', ''' || 'status' || ''', ''' || 'status' || ''', ''' || '3'
|| ''', ''' || '1' || ''', ''' || '8' || ''', ''' ||
'{"defaultValue":"true","rule":""}' || ''');');
- PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '6' || ''', ''' || 'timestamp' || ''', ''' || 'startupTime' || ''', '''
|| '1' || ''', ''' || '1' || ''', ''' || '7' || ''', ''' ||
'{"defaultValue":"0","placeholder":"startup timestamp","rule":""}' || ''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '6' || ''', ''' || 'upstreamHost' || ''', ''' || 'host' || ''', ''' ||
'2' || ''', ''' || '1' || ''', ''' || '0' || ''', NULL);');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '6' || ''', ''' || 'upstreamUrl' || ''', ''' || 'ip:port' || ''', '''
|| '2' || ''', ''' || '1' || ''', ''' || '1' || ''', ''' ||
'{"required":"1","placeholder":"","rule":""}' || ''');');
PERFORM public.dblink_exec('init_conn', 'INSERT INTO "plugin_handle" (
plugin_id , field , label , data_type , type , sort , ext_obj ) VALUES
(''' || '6' || ''', ''' || 'version' || ''', ''' || 'version' || ''', ''' ||
'2' || ''', ''' || '1' || ''', ''' || '4' || ''', ''' ||
'{"required":"0","placeholder":"version","rule":""}' || ''');');
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index 004b69e..76e0932 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -63,14 +63,6 @@
</dependency>
<!-- shenyu waf plugin end-->
- <!-- shenyu monitor plugin starter-->
- <dependency>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-plugin-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- shenyu monitor plugin end-->
-
<!-- shenyu ratelimiter plugin start-->
<dependency>
<groupId>org.apache.shenyu</groupId>
diff --git
a/shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java
b/shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java
index c9aed89..170f008 100644
--- a/shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java
@@ -116,11 +116,6 @@ public enum PluginEnum {
LOGGING(160, 0, "logging"),
/**
- * Monitor plugin enum.
- */
- MONITOR(170, 0, "monitor"),
-
- /**
* Divide plugin enum.
*/
DIVIDE(200, 0, "divide"),
diff --git
a/shenyu-dist/shenyu-agent-dist/src/main/resources/conf/tracing-point.yaml
b/shenyu-dist/shenyu-agent-dist/src/main/resources/conf/tracing-point.yaml
index 237c708..285c616 100644
--- a/shenyu-dist/shenyu-agent-dist/src/main/resources/conf/tracing-point.yaml
+++ b/shenyu-dist/shenyu-agent-dist/src/main/resources/conf/tracing-point.yaml
@@ -137,17 +137,6 @@ pointCuts:
-
org.apache.shenyu.agent.plugin.tracing.opentelemetry.handler.OpenTelemetryPluginCommonHandler
zipkin:
-
org.apache.shenyu.agent.plugin.tracing.zipkin.handler.ZipkinPluginCommonHandler
- - targetClass: org.apache.shenyu.plugin.monitor.MonitorPlugin
- points:
- - type: instanceMethod
- name: doExecute
- handlers:
- jaeger:
- -
org.apache.shenyu.agent.plugin.tracing.jaeger.handler.JaegerPluginCommonHandler
- opentelemetry:
- -
org.apache.shenyu.agent.plugin.tracing.opentelemetry.handler.OpenTelemetryPluginCommonHandler
- zipkin:
- -
org.apache.shenyu.agent.plugin.tracing.zipkin.handler.ZipkinPluginCommonHandler
- targetClass: org.apache.shenyu.plugin.motan.MotanPlugin
points:
- type: instanceMethod
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-jaeger/src/main/resources/conf/tracing-point.yaml
b/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-jaeger/src/main/resources/conf/tracing-point.yaml
index 1268dd2..4f4d2ec 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-jaeger/src/main/resources/conf/tracing-point.yaml
+++
b/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-jaeger/src/main/resources/conf/tracing-point.yaml
@@ -93,13 +93,6 @@ pointCuts:
handlers:
jaeger:
-
org.apache.shenyu.agent.plugin.tracing.jaeger.handler.JaegerPluginCommonHandler
- - targetClass: org.apache.shenyu.plugin.monitor.MonitorPlugin
- points:
- - type: instanceMethod
- name: doExecute
- handlers:
- jaeger:
- -
org.apache.shenyu.agent.plugin.tracing.jaeger.handler.JaegerPluginCommonHandler
- targetClass: org.apache.shenyu.plugin.motan.MotanPlugin
points:
- type: instanceMethod
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-opentelemetry/src/main/resources/conf/tracing-point.yaml
b/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-opentelemetry/src/main/resources/conf/tracing-point.yaml
index 403c8a7..80141ce 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-opentelemetry/src/main/resources/conf/tracing-point.yaml
+++
b/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-opentelemetry/src/main/resources/conf/tracing-point.yaml
@@ -93,13 +93,6 @@ pointCuts:
handlers:
opentelemetry:
-
org.apache.shenyu.agent.plugin.tracing.opentelemetry.handler.OpenTelemetryPluginCommonHandler
- - targetClass: org.apache.shenyu.plugin.monitor.MonitorPlugin
- points:
- - type: instanceMethod
- name: doExecute
- handlers:
- opentelemetry:
- -
org.apache.shenyu.agent.plugin.tracing.opentelemetry.handler.OpenTelemetryPluginCommonHandler
- targetClass: org.apache.shenyu.plugin.motan.MotanPlugin
points:
- type: instanceMethod
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-zipkin/src/main/resources/conf/tracing-point.yaml
b/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-zipkin/src/main/resources/conf/tracing-point.yaml
index dc307b5..55e3b59 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-zipkin/src/main/resources/conf/tracing-point.yaml
+++
b/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-zipkin/src/main/resources/conf/tracing-point.yaml
@@ -93,13 +93,6 @@ pointCuts:
handlers:
zipkin:
-
org.apache.shenyu.agent.plugin.tracing.zipkin.handler.ZipkinPluginCommonHandler
- - targetClass: org.apache.shenyu.plugin.monitor.MonitorPlugin
- points:
- - type: instanceMethod
- name: doExecute
- handlers:
- zipkin:
- -
org.apache.shenyu.agent.plugin.tracing.zipkin.handler.ZipkinPluginCommonHandler
- targetClass: org.apache.shenyu.plugin.motan.MotanPlugin
points:
- type: instanceMethod
diff --git a/shenyu-plugin/pom.xml b/shenyu-plugin/pom.xml
index ed8f270..565745d 100644
--- a/shenyu-plugin/pom.xml
+++ b/shenyu-plugin/pom.xml
@@ -31,7 +31,6 @@
<module>shenyu-plugin-base</module>
<module>shenyu-plugin-divide</module>
<module>shenyu-plugin-ratelimiter</module>
- <module>shenyu-plugin-monitor</module>
<module>shenyu-plugin-sign</module>
<module>shenyu-plugin-hystrix</module>
<module>shenyu-plugin-springcloud</module>
diff --git a/shenyu-plugin/shenyu-plugin-monitor/pom.xml
b/shenyu-plugin/shenyu-plugin-monitor/pom.xml
deleted file mode 100644
index 5104d7a..0000000
--- a/shenyu-plugin/shenyu-plugin-monitor/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-plugin</artifactId>
- <version>2.4.3-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-plugin-monitor</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-plugin-base</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-metrics-facade</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git
a/shenyu-plugin/shenyu-plugin-monitor/src/main/java/org/apache/shenyu/plugin/monitor/MonitorPlugin.java
b/shenyu-plugin/shenyu-plugin-monitor/src/main/java/org/apache/shenyu/plugin/monitor/MonitorPlugin.java
deleted file mode 100644
index 2021107..0000000
---
a/shenyu-plugin/shenyu-plugin-monitor/src/main/java/org/apache/shenyu/plugin/monitor/MonitorPlugin.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.plugin.monitor;
-
-import org.apache.shenyu.common.constant.Constants;
-import org.apache.shenyu.common.dto.RuleData;
-import org.apache.shenyu.common.dto.SelectorData;
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.common.utils.DateUtils;
-import org.apache.shenyu.metrics.constant.LabelNames;
-import org.apache.shenyu.metrics.reporter.MetricsReporter;
-import org.apache.shenyu.plugin.api.ShenyuPluginChain;
-import org.apache.shenyu.plugin.api.context.ShenyuContext;
-import org.apache.shenyu.plugin.base.AbstractShenyuPlugin;
-import org.springframework.http.server.reactive.ServerHttpResponse;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-import java.util.Optional;
-
-/**
- * the monitor plugin.
- */
-public class MonitorPlugin extends AbstractShenyuPlugin {
-
- @Override
- protected Mono<Void> doExecute(final ServerWebExchange exchange, final
ShenyuPluginChain chain, final SelectorData selector, final RuleData rule) {
- MetricsReporter.counterIncrement(LabelNames.REQUEST_TOTAL);
- MetricsReporter.counterIncrement(LabelNames.HTTP_REQUEST_TOTAL, new
String[]{exchange.getRequest().getURI().getPath(),
exchange.getRequest().getMethodValue()});
- ShenyuContext shenyuContext = exchange.getAttribute(Constants.CONTEXT);
- LocalDateTime startDateTime =
Optional.ofNullable(shenyuContext).map(ShenyuContext::getStartDateTime).orElseGet(LocalDateTime::now);
- return chain.execute(exchange).doOnSuccess(e ->
responseCommitted(exchange, startDateTime))
- .doOnError(throwable -> responseCommitted(exchange,
startDateTime));
- }
-
- @Override
- public int getOrder() {
- return PluginEnum.MONITOR.getCode();
- }
-
- @Override
- public String named() {
- return PluginEnum.MONITOR.getName();
- }
-
- private void responseCommitted(final ServerWebExchange exchange, final
LocalDateTime startDateTime) {
- ServerHttpResponse response = exchange.getResponse();
- if (response.isCommitted()) {
- recordTime(startDateTime);
- } else {
- response.beforeCommit(() -> {
- recordTime(startDateTime);
- return Mono.empty();
- });
- }
- }
-
- private void recordTime(final LocalDateTime startDateTime) {
- long millisBetween = DateUtils.acquireMillisBetween(startDateTime,
LocalDateTime.now());
- MetricsReporter.recordTime(LabelNames.EXECUTE_LATENCY_NAME,
millisBetween);
- }
-}
diff --git
a/shenyu-plugin/shenyu-plugin-monitor/src/main/java/org/apache/shenyu/plugin/monitor/handler/MonitorPluginDataHandler.java
b/shenyu-plugin/shenyu-plugin-monitor/src/main/java/org/apache/shenyu/plugin/monitor/handler/MonitorPluginDataHandler.java
deleted file mode 100644
index ef0e4b5..0000000
---
a/shenyu-plugin/shenyu-plugin-monitor/src/main/java/org/apache/shenyu/plugin/monitor/handler/MonitorPluginDataHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.plugin.monitor.handler;
-
-import java.util.Objects;
-import org.apache.shenyu.common.dto.PluginData;
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.metrics.config.MetricsConfig;
-import org.apache.shenyu.metrics.facade.MetricsTrackerFacade;
-import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.apache.shenyu.common.utils.Singleton;
-
-/**
- * The type Monitor plugin data handler.
- */
-public class MonitorPluginDataHandler implements PluginDataHandler {
-
- @Override
- public void handlerPlugin(final PluginData pluginData) {
- if (Objects.nonNull(pluginData) &&
Boolean.TRUE.equals(pluginData.getEnabled())) {
- MetricsConfig monitorConfig =
GsonUtils.getInstance().fromJson(pluginData.getConfig(), MetricsConfig.class);
- if (!checkConfig(monitorConfig)) {
- return;
- }
- if (!MetricsTrackerFacade.getInstance().isStarted()) {
- start(monitorConfig);
- } else if
(!monitorConfig.equals(Singleton.INST.get(MetricsConfig.class))) {
- restart(monitorConfig);
- }
- } else {
- stop();
- }
- }
-
- @Override
- public String pluginNamed() {
- return PluginEnum.MONITOR.getName();
- }
-
- private boolean checkConfig(final MetricsConfig monitorConfig) {
- return Objects.nonNull(monitorConfig)
- && Objects.nonNull(monitorConfig.getPort())
- && Objects.nonNull(monitorConfig.getAsync());
- }
-
- private void restart(final MetricsConfig monitorConfig) {
- stop();
- start(monitorConfig);
- }
-
- private void start(final MetricsConfig monitorConfig) {
- MetricsTrackerFacade.getInstance().start(monitorConfig);
- Singleton.INST.single(MetricsConfig.class, monitorConfig);
- }
-
- private void stop() {
- MetricsTrackerFacade.getInstance().stop();
- }
-}
diff --git
a/shenyu-plugin/shenyu-plugin-monitor/src/test/java/org/apache/shenyu/plugin/monitor/MonitorPluginTest.java
b/shenyu-plugin/shenyu-plugin-monitor/src/test/java/org/apache/shenyu/plugin/monitor/MonitorPluginTest.java
deleted file mode 100644
index dda3244..0000000
---
a/shenyu-plugin/shenyu-plugin-monitor/src/test/java/org/apache/shenyu/plugin/monitor/MonitorPluginTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.plugin.monitor;
-
-import org.apache.shenyu.common.dto.RuleData;
-import org.apache.shenyu.common.dto.SelectorData;
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.plugin.api.ShenyuPluginChain;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
-import org.springframework.mock.web.server.MockServerWebExchange;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Test case for MonitorPlugin.
- */
-public final class MonitorPluginTest {
-
- private MonitorPlugin monitorPlugin;
-
- @BeforeEach
- public void setup() {
- monitorPlugin = new MonitorPlugin();
- }
-
- @Test
- public void testDoExecute() {
- ServerWebExchange exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("localhost").build());
- ShenyuPluginChain chain = mock(ShenyuPluginChain.class);
- when(chain.execute(exchange)).thenReturn(Mono.empty());
- SelectorData selectorData = mock(SelectorData.class);
- RuleData data = mock(RuleData.class);
- Mono<Void> voidMono = monitorPlugin.doExecute(exchange, chain,
selectorData, data);
- StepVerifier.create(voidMono).expectSubscription().verifyComplete();
- }
-
- @Test
- public void testGetOrder() {
- assertEquals(PluginEnum.MONITOR.getCode(), monitorPlugin.getOrder());
- }
-
- @Test
- public void testNamed() {
- assertEquals(PluginEnum.MONITOR.getName(), monitorPlugin.named());
- }
-}
diff --git
a/shenyu-plugin/shenyu-plugin-monitor/src/test/java/org/apache/shenyu/plugin/monitor/handler/MonitorPluginDataHandlerTest.java
b/shenyu-plugin/shenyu-plugin-monitor/src/test/java/org/apache/shenyu/plugin/monitor/handler/MonitorPluginDataHandlerTest.java
deleted file mode 100644
index e6645c3..0000000
---
a/shenyu-plugin/shenyu-plugin-monitor/src/test/java/org/apache/shenyu/plugin/monitor/handler/MonitorPluginDataHandlerTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.plugin.monitor.handler;
-
-import org.apache.shenyu.common.dto.PluginData;
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.metrics.facade.MetricsTrackerFacade;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Test case for MonitorPluginHandler.
- */
-public final class MonitorPluginDataHandlerTest {
-
- private final MonitorPluginDataHandler monitorPluginDataHandler = new
MonitorPluginDataHandler();
-
- @Test
- public void testHandlerPlugin() {
- //test with plugin enable: false
- String config =
"{\"host\":\"localhost\",\"port\":\"19996\",\"async\":false,\"metricsName\":\"prometheus\"}";
- PluginData pluginData = new PluginData("", "", config, "1", false);
- monitorPluginDataHandler.handlerPlugin(pluginData);
- assertFalse(MetricsTrackerFacade.getInstance().isStarted());
-
- //test with plugin config incomplete
- config =
"{\"host\":\"localhost\",\"async\":false,\"metricsName\":\"prometheus\"}";
- pluginData = new PluginData("", "", config, "1", true);
- monitorPluginDataHandler.handlerPlugin(pluginData);
- assertFalse(MetricsTrackerFacade.getInstance().isStarted());
-
- //test with plugin config complete
- config =
"{\"host\":\"localhost\",\"port\":\"19997\",\"async\":false,\"metricsName\":\"prometheus\"}";
- pluginData = new PluginData("", "", config, "1", true);
- monitorPluginDataHandler.handlerPlugin(pluginData);
- assertTrue(MetricsTrackerFacade.getInstance().isStarted());
-
- //test with plugin config modified
- config =
"{\"host\":\"localhost\",\"port\":\"19998\",\"async\":true,\"metricsName\":\"prometheus\"}";
- pluginData = new PluginData("", "", config, "1", true);
- monitorPluginDataHandler.handlerPlugin(pluginData);
- assertTrue(MetricsTrackerFacade.getInstance().isStarted());
- }
-
- @Test
- public void testPluginNamed() {
- assertEquals(PluginEnum.MONITOR.getName(),
monitorPluginDataHandler.pluginNamed());
- }
-
- @AfterAll
- public static void close() {
- MetricsTrackerFacade.getInstance().stop();
- }
-}
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
index a8c7b9a..a40ee54 100644
--- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
+++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
@@ -32,7 +32,6 @@
<module>shenyu-spring-boot-starter-plugin-httpclient</module>
<module>shenyu-spring-boot-starter-plugin-springcloud</module>
<module>shenyu-spring-boot-starter-plugin-hystrix</module>
- <module>shenyu-spring-boot-starter-plugin-monitor</module>
<module>shenyu-spring-boot-starter-plugin-ratelimiter</module>
<module>shenyu-spring-boot-starter-plugin-sign</module>
<module>shenyu-spring-boot-starter-plugin-waf</module>
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/pom.xml
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/pom.xml
deleted file mode 100644
index 41c08cb..0000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-plugin</artifactId>
- <version>2.4.3-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-spring-boot-starter-plugin-monitor</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-plugin-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfiguration.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfiguration.java
deleted file mode 100644
index c6cd585..0000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfiguration.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.springboot.starter.plugin.monitor;
-
-import org.apache.shenyu.plugin.api.ShenyuPlugin;
-import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.apache.shenyu.plugin.monitor.MonitorPlugin;
-import org.apache.shenyu.plugin.monitor.handler.MonitorPluginDataHandler;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * The type Monitor plugin configuration.
- */
-@Configuration
-public class MonitorPluginConfiguration {
-
- /**
- * Monitor plugin .
- *
- * @return the shenyu plugin
- */
- @Bean
- public ShenyuPlugin monitorPlugin() {
- return new MonitorPlugin();
- }
-
- /**
- * Monitor plugin data handler plugin data handler.
- *
- * @return the plugin data handler
- */
- @Bean
- public PluginDataHandler monitorPluginDataHandler() {
- return new MonitorPluginDataHandler();
- }
-}
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/resources/META-INF/spring.factories
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index efcb1d2..0000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.shenyu.springboot.starter.plugin.monitor.MonitorPluginConfiguration
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/resources/META-INF/spring.provides
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index e05f43c..0000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-provides: shenyu-spring-boot-starter-plugin-monitor
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/test/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/test/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfigurationTest.java
deleted file mode 100644
index 21ed2c2..0000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/test/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfigurationTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.springboot.starter.plugin.monitor;
-
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.plugin.api.ShenyuPlugin;
-import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * Test case for {@link MonitorPluginConfiguration}.
- */
-@Configuration
-@EnableConfigurationProperties
-public class MonitorPluginConfigurationTest {
-
- @Test
- public void testMonitorPlugin() {
- new ApplicationContextRunner()
-
.withConfiguration(AutoConfigurations.of(MonitorPluginConfiguration.class))
- .withBean(MonitorPluginConfigurationTest.class)
- .withPropertyValues("debug=true")
- .run(context -> {
- ShenyuPlugin plugin = context.getBean("monitorPlugin",
ShenyuPlugin.class);
- assertNotNull(plugin);
-
assertThat(plugin.named()).isEqualTo(PluginEnum.MONITOR.getName());
- });
- }
-
- @Test
- public void testMonitorPluginDataHandler() {
- new ApplicationContextRunner()
-
.withConfiguration(AutoConfigurations.of(MonitorPluginConfiguration.class))
- .withBean(MonitorPluginConfigurationTest.class)
- .withPropertyValues("debug=true")
- .run(context -> {
- PluginDataHandler handler =
context.getBean("monitorPluginDataHandler", PluginDataHandler.class);
- assertNotNull(handler);
- });
- }
-}
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/src/test/resources/mock_configs_fetch_response.json
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/src/test/resources/mock_configs_fetch_response.json
index ceaa33b..fc79339 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/src/test/resources/mock_configs_fetch_response.json
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/src/test/resources/mock_configs_fetch_response.json
@@ -59,13 +59,6 @@
"enabled": false
},
{
- "id": "7",
- "name": "monitor",
- "config":
"{\"metricsName\":\"prometheus\",\"host\":\"localhost\",\"port\":\"9190\",\"async\":\"true\"}",
- "role": 0,
- "enabled": false
- },
- {
"id": "8",
"name": "springCloud",
"config": null,
