Skip to content

Commit 08489a1

Browse files
CrazyHZMCrazyHZM
committed
Remove dubbo monitor module
Signed-off-by: crazyhzm <crazyhzm@gmail.com>
1 parent 4020107 commit 08489a1

File tree

49 files changed

+8
-2698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+8
-2698
lines changed

‎.artifacts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ dubbo-metrics-registry
6262
dubbo-metrics-config-center
6363
dubbo-metrics-netty
6464
dubbo-metrics-event
65-
dubbo-monitor
66-
dubbo-monitor-api
67-
dubbo-monitor-common
68-
dubbo-monitor-default
6965
dubbo-native
7066
dubbo-parent
7167
dubbo-plugin

‎dubbo-config/dubbo-config-api/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@
7878
<version>${project.parent.version}</version>
7979
</dependency>
8080

81-
<dependency>
82-
<groupId>org.apache.dubbo</groupId>
83-
<artifactId>dubbo-monitor-api</artifactId>
84-
<version>${project.parent.version}</version>
85-
</dependency>
8681
<dependency>
8782
<groupId>org.apache.dubbo</groupId>
8883
<artifactId>dubbo-remoting-api</artifactId>

‎dubbo-config/dubbo-config-spring/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@
7777
<version>1.9.20.1</version>
7878
<scope>test</scope>
7979
</dependency>
80-
<dependency>
81-
<groupId>org.apache.dubbo</groupId>
82-
<artifactId>dubbo-monitor-default</artifactId>
83-
<version>${project.parent.version}</version>
84-
<scope>test</scope>
85-
</dependency>
8680
<dependency>
8781
<groupId>org.apache.dubbo</groupId>
8882
<artifactId>dubbo-rpc-dubbo</artifactId>
@@ -149,12 +143,6 @@
149143
<version>${project.parent.version}</version>
150144
<scope>test</scope>
151145
</dependency>
152-
<dependency>
153-
<groupId>org.apache.dubbo</groupId>
154-
<artifactId>dubbo-monitor-common</artifactId>
155-
<version>${project.parent.version}</version>
156-
<scope>test</scope>
157-
</dependency>
158146
<dependency>
159147
<groupId>org.apache.dubbo</groupId>
160148
<artifactId>dubbo-plugin-qos-trace</artifactId>

‎dubbo-dependencies-bom/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193

194194
<snappy_java_version>1.1.10.5</snappy_java_version>
195195
<bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version>
196-
<metrics_version>2.0.6</metrics_version>
197196
<sofa_registry_version>5.4.3</sofa_registry_version>
198197
<gson_version>2.10.1</gson_version>
199198
<jackson_version>2.16.0</jackson_version>
@@ -773,28 +772,6 @@
773772
<version>${swagger_version}</version>
774773
</dependency>
775774

776-
<dependency>
777-
<groupId>com.alibaba.middleware</groupId>
778-
<artifactId>metrics-core-api</artifactId>
779-
<version>${metrics_version}</version>
780-
</dependency>
781-
<dependency>
782-
<groupId>com.alibaba.middleware</groupId>
783-
<artifactId>metrics-core-impl</artifactId>
784-
<version>${metrics_version}</version>
785-
</dependency>
786-
<dependency>
787-
<groupId>com.alibaba.middleware</groupId>
788-
<artifactId>metrics-common</artifactId>
789-
<version>${metrics_version}</version>
790-
</dependency>
791-
792-
<dependency>
793-
<groupId>com.alibaba.middleware</groupId>
794-
<artifactId>metrics-rest</artifactId>
795-
<version>${metrics_version}</version>
796-
</dependency>
797-
798775
<!-- for dubbo-registry-sofa -->
799776
<dependency>
800777
<groupId>com.alipay.sofa</groupId>

‎dubbo-distribution/dubbo-all-shaded/pom.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -203,22 +203,6 @@
203203
<optional>true</optional>
204204
</dependency>
205205

206-
<!-- monitor -->
207-
<dependency>
208-
<groupId>org.apache.dubbo</groupId>
209-
<artifactId>dubbo-monitor-api</artifactId>
210-
<version>${project.version}</version>
211-
<scope>compile</scope>
212-
<optional>true</optional>
213-
</dependency>
214-
<dependency>
215-
<groupId>org.apache.dubbo</groupId>
216-
<artifactId>dubbo-monitor-default</artifactId>
217-
<version>${project.version}</version>
218-
<scope>compile</scope>
219-
<optional>true</optional>
220-
</dependency>
221-
222206
<!-- plugin -->
223207
<dependency>
224208
<groupId>org.apache.dubbo</groupId>
@@ -493,8 +477,6 @@
493477
<include>org.apache.dubbo:dubbo-metrics-metadata</include>
494478
<include>org.apache.dubbo:dubbo-metrics-config-center</include>
495479
<include>org.apache.dubbo:dubbo-metrics-prometheus</include>
496-
<include>org.apache.dubbo:dubbo-monitor-api</include>
497-
<include>org.apache.dubbo:dubbo-monitor-default</include>
498480
<include>org.apache.dubbo:dubbo-qos</include>
499481
<include>org.apache.dubbo:dubbo-qos-api</include>
500482
<include>org.apache.dubbo:dubbo-security</include>

‎dubbo-distribution/dubbo-all/pom.xml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -240,29 +240,6 @@
240240
<optional>true</optional>
241241
</dependency>
242242

243-
<!-- monitor -->
244-
<dependency>
245-
<groupId>org.apache.dubbo</groupId>
246-
<artifactId>dubbo-monitor-api</artifactId>
247-
<version>${project.version}</version>
248-
<scope>compile</scope>
249-
<optional>true</optional>
250-
</dependency>
251-
<dependency>
252-
<groupId>org.apache.dubbo</groupId>
253-
<artifactId>dubbo-monitor-common</artifactId>
254-
<version>${project.version}</version>
255-
<scope>compile</scope>
256-
<optional>true</optional>
257-
</dependency>
258-
<dependency>
259-
<groupId>org.apache.dubbo</groupId>
260-
<artifactId>dubbo-monitor-default</artifactId>
261-
<version>${project.version}</version>
262-
<scope>compile</scope>
263-
<optional>true</optional>
264-
</dependency>
265-
266243
<!-- plugin -->
267244
<dependency>
268245
<groupId>org.apache.dubbo</groupId>
@@ -673,9 +650,6 @@
673650
<include>org.apache.dubbo:dubbo-metrics-netty</include>
674651
<include>org.apache.dubbo:dubbo-metrics-prometheus</include>
675652
<include>org.apache.dubbo:dubbo-tracing</include>
676-
<include>org.apache.dubbo:dubbo-monitor-api</include>
677-
<include>org.apache.dubbo:dubbo-monitor-common</include>
678-
<include>org.apache.dubbo:dubbo-monitor-default</include>
679653
<include>org.apache.dubbo:dubbo-qos</include>
680654
<include>org.apache.dubbo:dubbo-qos-api</include>
681655
<include>org.apache.dubbo:dubbo-security</include>

‎dubbo-distribution/dubbo-bom/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -285,29 +285,6 @@
285285
<version>${project.version}</version>
286286
</dependency>
287287

288-
<!-- monitor -->
289-
<dependency>
290-
<groupId>org.apache.dubbo</groupId>
291-
<artifactId>dubbo-monitor</artifactId>
292-
<version>${project.version}</version>
293-
<type>pom</type>
294-
</dependency>
295-
<dependency>
296-
<groupId>org.apache.dubbo</groupId>
297-
<artifactId>dubbo-monitor-api</artifactId>
298-
<version>${project.version}</version>
299-
</dependency>
300-
<dependency>
301-
<groupId>org.apache.dubbo</groupId>
302-
<artifactId>dubbo-monitor-common</artifactId>
303-
<version>${project.version}</version>
304-
</dependency>
305-
<dependency>
306-
<groupId>org.apache.dubbo</groupId>
307-
<artifactId>dubbo-monitor-default</artifactId>
308-
<version>${project.version}</version>
309-
</dependency>
310-
311288
<!-- native -->
312289
<dependency>
313290
<groupId>org.apache.dubbo</groupId>

‎dubbo-distribution/dubbo-core-spi/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@
6767
<scope>compile</scope>
6868
<optional>true</optional>
6969
</dependency>
70-
<dependency>
71-
<groupId>org.apache.dubbo</groupId>
72-
<artifactId>dubbo-monitor-api</artifactId>
73-
<version>${project.version}</version>
74-
<scope>compile</scope>
75-
<optional>true</optional>
76-
</dependency>
7770
<dependency>
7871
<groupId>org.apache.dubbo</groupId>
7972
<artifactId>dubbo-registry-api</artifactId>
@@ -135,7 +128,6 @@
135128
<include>org.apache.dubbo:dubbo-metrics-api</include>
136129
<include>org.apache.dubbo:dubbo-metrics-default</include>
137130
<include>org.apache.dubbo:dubbo-tracing</include>
138-
<include>org.apache.dubbo:dubbo-monitor-api</include>
139131
<include>org.apache.dubbo:dubbo-registry-api</include>
140132
<include>org.apache.dubbo:dubbo-remoting-api</include>
141133
<include>org.apache.dubbo:dubbo-remoting</include>

‎dubbo-metadata/dubbo-metadata-processor/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@
8181
<groupId>org.apache.dubbo</groupId>
8282
<artifactId>dubbo-metadata-api</artifactId>
8383
</exclusion>
84-
<exclusion>
85-
<groupId>org.apache.dubbo</groupId>
86-
<artifactId>dubbo-monitor-api</artifactId>
87-
</exclusion>
8884
<exclusion>
8985
<groupId>org.apache.dubbo</groupId>
9086
<artifactId>dubbo-remoting-api</artifactId>

‎dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/Constants.java renamed to ‎dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/monitor/Constants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.dubbo.monitor;
1818

19+
@Deprecated
1920
public interface Constants {
2021
String DUBBO_PROVIDER = "dubbo.provider";
2122

‎dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/Monitor.java renamed to ‎dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/monitor/Monitor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
*
2424
* @see org.apache.dubbo.monitor.MonitorFactory#getMonitor(org.apache.dubbo.common.URL)
2525
*/
26+
@Deprecated
2627
public interface Monitor extends Node, MonitorService {}

‎dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorFactory.java renamed to ‎dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/monitor/MonitorFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
import org.apache.dubbo.common.URL;
2020
import org.apache.dubbo.common.constants.CommonConstants;
2121
import org.apache.dubbo.common.extension.Adaptive;
22-
import org.apache.dubbo.common.extension.SPI;
2322

2423
/**
2524
* MonitorFactory. (SPI, Singleton, ThreadSafe)
2625
*/
27-
@SPI("dubbo")
26+
@Deprecated
2827
public interface MonitorFactory {
2928

3029
/**

‎dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorService.java renamed to ‎dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/monitor/MonitorService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/**
2424
* MonitorService. (SPI, Prototype, ThreadSafe)
2525
*/
26+
@Deprecated
2627
public interface MonitorService {
2728

2829
/**

‎dubbo-monitor/dubbo-monitor-common/src/main/java/org/apache/dubbo/monitor/support/MonitorClusterFilter.java renamed to ‎dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/monitor/support/MonitorClusterFilter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121

2222
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
2323

24+
@Deprecated
2425
@Activate(group = {CONSUMER})
2526
public class MonitorClusterFilter extends MonitorFilter implements ClusterFilter {}

‎dubbo-monitor/dubbo-monitor-common/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java renamed to ‎dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
/**
6262
* MonitorFilter. (SPI, Singleton, ThreadSafe)
6363
*/
64+
@Deprecated
6465
@Activate(group = {PROVIDER})
6566
public class MonitorFilter implements Filter, Filter.Listener {
6667

‎dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
metrics-provider=org.apache.dubbo.metrics.filter.MetricsProviderFilter
2+
monitor=org.apache.dubbo.monitor.support.MonitorFilter

‎dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.filter.ClusterFilter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
observationsender=org.apache.dubbo.rpc.cluster.filter.support.ObservationSenderFilter
22
metricsClusterFilter=org.apache.dubbo.rpc.cluster.filter.support.MetricsClusterFilter
3+
monitor=org.apache.dubbo.monitor.support.MonitorClusterFilter

‎dubbo-monitor/dubbo-monitor-common/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java renamed to ‎dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java

File renamed without changes.

‎dubbo-monitor/dubbo-monitor-api/pom.xml

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MetricsService.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎dubbo-monitor/dubbo-monitor-common/pom.xml

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)