Remove dubbo monitor module

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
apache · Dec 4, 2023 · 29735e3 · 29735e3
1 parent 4020107
commit 29735e3
Show file tree

Hide file tree

Showing 49 changed files with 9 additions and 2,697 deletions.
diff --git a/.artifacts b/.artifacts
@@ -62,10 +62,6 @@ dubbo-metrics-registry
 dubbo-metrics-config-center
 dubbo-metrics-netty
 dubbo-metrics-event
-dubbo-monitor
-dubbo-monitor-api
-dubbo-monitor-common
-dubbo-monitor-default
 dubbo-native
 dubbo-parent
 dubbo-plugin

diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml
@@ -78,11 +78,6 @@
       <version>${project.parent.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-monitor-api</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-remoting-api</artifactId>

diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
@@ -77,12 +77,6 @@
       <version>1.9.20.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-monitor-default</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-rpc-dubbo</artifactId>
@@ -149,12 +143,6 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-monitor-common</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-plugin-qos-trace</artifactId>

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
@@ -193,7 +193,6 @@
 
     <snappy_java_version>1.1.10.5</snappy_java_version>
     <bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version>
-    <metrics_version>2.0.6</metrics_version>
     <sofa_registry_version>5.4.3</sofa_registry_version>
     <gson_version>2.10.1</gson_version>
     <jackson_version>2.16.0</jackson_version>
@@ -773,28 +772,6 @@
         <version>${swagger_version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.alibaba.middleware</groupId>
-        <artifactId>metrics-core-api</artifactId>
-        <version>${metrics_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.alibaba.middleware</groupId>
-        <artifactId>metrics-core-impl</artifactId>
-        <version>${metrics_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.alibaba.middleware</groupId>
-        <artifactId>metrics-common</artifactId>
-        <version>${metrics_version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.alibaba.middleware</groupId>
-        <artifactId>metrics-rest</artifactId>
-        <version>${metrics_version}</version>
-      </dependency>
-
       <!-- for dubbo-registry-sofa -->
       <dependency>
         <groupId>com.alipay.sofa</groupId>

diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml
@@ -203,22 +203,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- monitor -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-monitor-api</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-monitor-default</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- plugin -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
@@ -493,8 +477,6 @@
                                     <include>org.apache.dubbo:dubbo-metrics-metadata</include>
                                     <include>org.apache.dubbo:dubbo-metrics-config-center</include>
                                     <include>org.apache.dubbo:dubbo-metrics-prometheus</include>
-                                    <include>org.apache.dubbo:dubbo-monitor-api</include>
-                                    <include>org.apache.dubbo:dubbo-monitor-default</include>
                                     <include>org.apache.dubbo:dubbo-qos</include>
                                     <include>org.apache.dubbo:dubbo-qos-api</include>
                                     <include>org.apache.dubbo:dubbo-security</include>

diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml
@@ -240,29 +240,6 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- monitor -->
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-monitor-api</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-monitor-common</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-monitor-default</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-
     <!-- plugin -->
     <dependency>
       <groupId>org.apache.dubbo</groupId>
@@ -673,9 +650,6 @@
                   <include>org.apache.dubbo:dubbo-metrics-netty</include>
                   <include>org.apache.dubbo:dubbo-metrics-prometheus</include>
                   <include>org.apache.dubbo:dubbo-tracing</include>
-                  <include>org.apache.dubbo:dubbo-monitor-api</include>
-                  <include>org.apache.dubbo:dubbo-monitor-common</include>
-                  <include>org.apache.dubbo:dubbo-monitor-default</include>
                   <include>org.apache.dubbo:dubbo-qos</include>
                   <include>org.apache.dubbo:dubbo-qos-api</include>
                   <include>org.apache.dubbo:dubbo-security</include>

diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
@@ -285,29 +285,6 @@
         <version>${project.version}</version>
       </dependency>
 
-      <!-- monitor -->
-      <dependency>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-monitor</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-monitor-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-monitor-common</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-monitor-default</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
       <!-- native -->
       <dependency>
         <groupId>org.apache.dubbo</groupId>

diff --git a/dubbo-distribution/dubbo-core-spi/pom.xml b/dubbo-distribution/dubbo-core-spi/pom.xml
@@ -67,13 +67,6 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-monitor-api</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-registry-api</artifactId>
@@ -135,7 +128,6 @@
                                     <include>org.apache.dubbo:dubbo-metrics-api</include>
                                     <include>org.apache.dubbo:dubbo-metrics-default</include>
                                     <include>org.apache.dubbo:dubbo-tracing</include>
-                                    <include>org.apache.dubbo:dubbo-monitor-api</include>
                                     <include>org.apache.dubbo:dubbo-registry-api</include>
                                     <include>org.apache.dubbo:dubbo-remoting-api</include>
                                     <include>org.apache.dubbo:dubbo-remoting</include>

diff --git a/dubbo-metadata/dubbo-metadata-processor/pom.xml b/dubbo-metadata/dubbo-metadata-processor/pom.xml
@@ -81,10 +81,6 @@
           <groupId>org.apache.dubbo</groupId>
           <artifactId>dubbo-metadata-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.apache.dubbo</groupId>
-          <artifactId>dubbo-monitor-api</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.dubbo</groupId>
           <artifactId>dubbo-remoting-api</artifactId>

diff --git a/...a/org/apache/dubbo/monitor/Constants.java → ...a/org/apache/dubbo/monitor/Constants.java b/...a/org/apache/dubbo/monitor/Constants.java → ...a/org/apache/dubbo/monitor/Constants.java
@@ -16,6 +16,7 @@
  */
 package org.apache.dubbo.monitor;
 
+@Deprecated
 public interface Constants {
     String DUBBO_PROVIDER = "dubbo.provider";
 

diff --git a/...ava/org/apache/dubbo/monitor/Monitor.java → ...ava/org/apache/dubbo/monitor/Monitor.java b/...ava/org/apache/dubbo/monitor/Monitor.java → ...ava/org/apache/dubbo/monitor/Monitor.java
@@ -23,4 +23,5 @@
  *
  * @see org.apache.dubbo.monitor.MonitorFactory#getMonitor(org.apache.dubbo.common.URL)
  */
+@Deprecated
 public interface Monitor extends Node, MonitorService {}
diff --git a/.../apache/dubbo/monitor/MonitorFactory.java → .../apache/dubbo/monitor/MonitorFactory.java b/.../apache/dubbo/monitor/MonitorFactory.java → .../apache/dubbo/monitor/MonitorFactory.java
@@ -24,7 +24,8 @@
 /**
  * MonitorFactory. (SPI, Singleton, ThreadSafe)
  */
-@SPI("dubbo")
+@Deprecated
+@SPI
 public interface MonitorFactory {
 
     /**

diff --git a/.../apache/dubbo/monitor/MonitorService.java → .../apache/dubbo/monitor/MonitorService.java b/.../apache/dubbo/monitor/MonitorService.java → .../apache/dubbo/monitor/MonitorService.java
@@ -23,6 +23,7 @@
 /**
  * MonitorService. (SPI, Prototype, ThreadSafe)
  */
+@Deprecated
 public interface MonitorService {
 
     /**

diff --git a/...monitor/support/MonitorClusterFilter.java → ...monitor/support/MonitorClusterFilter.java b/...monitor/support/MonitorClusterFilter.java → ...monitor/support/MonitorClusterFilter.java
@@ -21,5 +21,6 @@
 
 import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
 
+@Deprecated
 @Activate(group = {CONSUMER})
 public class MonitorClusterFilter extends MonitorFilter implements ClusterFilter {}
diff --git a/.../dubbo/monitor/support/MonitorFilter.java → .../dubbo/monitor/support/MonitorFilter.java b/.../dubbo/monitor/support/MonitorFilter.java → .../dubbo/monitor/support/MonitorFilter.java
@@ -61,6 +61,7 @@
 /**
  * MonitorFilter. (SPI, Singleton, ThreadSafe)
  */
+@Deprecated
 @Activate(group = {PROVIDER})
 public class MonitorFilter implements Filter, Filter.Listener {
 

diff --git a/...bo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/...bo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
@@ -1 +1,2 @@
 metrics-provider=org.apache.dubbo.metrics.filter.MetricsProviderFilter
+monitor=org.apache.dubbo.monitor.support.MonitorFilter
diff --git a/.../main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.filter.ClusterFilter b/.../main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.filter.ClusterFilter
@@ -1,2 +1,3 @@
 observationsender=org.apache.dubbo.rpc.cluster.filter.support.ObservationSenderFilter
 metricsClusterFilter=org.apache.dubbo.rpc.cluster.filter.support.MetricsClusterFilter
+monitor=org.apache.dubbo.monitor.support.MonitorClusterFilter
diff --git a/...bo/monitor/support/MonitorFilterTest.java → ...bo/monitor/support/MonitorFilterTest.java b/...bo/monitor/support/MonitorFilterTest.java → ...bo/monitor/support/MonitorFilterTest.java
diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml
diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MetricsService.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MetricsService.java
diff --git a/dubbo-monitor/dubbo-monitor-common/pom.xml b/dubbo-monitor/dubbo-monitor-common/pom.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ @@
     /**
      * MonitorService. (SPI, Prototype, ThreadSafe)
      */
+    @Deprecated
     public interface MonitorService {
         /**
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		metrics-provider=org.apache.dubbo.metrics.filter.MetricsProviderFilter
		monitor=org.apache.dubbo.monitor.support.MonitorFilter