apache · AlbumenJ · Feb 1, 2023 · Jan 27, 2023 · Jan 27, 2023 · Jan 28, 2023
diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-metrics-api</artifactId>
+            <artifactId>dubbo-metrics-default</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 

diff --git a/...o-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java b/...o-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
@@ -34,10 +34,6 @@
 import org.apache.dubbo.common.lang.ShutdownHookCallbacks;
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.metrics.MetricsReporter;
-import org.apache.dubbo.common.metrics.MetricsReporterFactory;
-import org.apache.dubbo.common.metrics.collector.DefaultMetricsCollector;
-import org.apache.dubbo.common.metrics.service.MetricsServiceExporter;
 import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
 import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
 import org.apache.dubbo.common.utils.ArrayUtils;
@@ -54,6 +50,10 @@
 import org.apache.dubbo.config.utils.ConfigValidationUtils;
 import org.apache.dubbo.metadata.report.MetadataReportFactory;
 import org.apache.dubbo.metadata.report.MetadataReportInstance;
+import org.apache.dubbo.metrics.collector.DefaultMetricsCollector;
+import org.apache.dubbo.metrics.report.MetricsReporter;
+import org.apache.dubbo.metrics.report.MetricsReporterFactory;
+import org.apache.dubbo.metrics.service.MetricsServiceExporter;
 import org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils;
 import org.apache.dubbo.registry.support.RegistryManager;
 import org.apache.dubbo.rpc.model.ApplicationModel;

diff --git a/...onfig-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java b/...onfig-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
@@ -19,8 +19,8 @@
 import org.apache.dubbo.common.constants.LoggerCodeConstants;
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.metrics.service.MetricsService;
-import org.apache.dubbo.common.metrics.service.MetricsServiceExporter;
+import org.apache.dubbo.metrics.service.MetricsService;
+import org.apache.dubbo.metrics.service.MetricsServiceExporter;
 import org.apache.dubbo.config.MetricsConfig;
 import org.apache.dubbo.config.ServiceConfig;
 import org.apache.dubbo.config.bootstrap.builders.InternalServiceConfigBuilder;

diff --git a/...on.metrics.service.MetricsServiceExporter → ...bo.metrics.service.MetricsServiceExporter b/...on.metrics.service.MetricsServiceExporter → ...bo.metrics.service.MetricsServiceExporter
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml
@@ -139,6 +139,10 @@
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-metrics-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-metrics-default</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-otel</artifactId>

diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
@@ -137,6 +137,10 @@
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-metrics-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-metrics-default</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-otel</artifactId>

diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml
@@ -1,4 +1,4 @@
-<!--
+ <!--
   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.
@@ -183,6 +183,13 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-metrics-default</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-metrics-prometheus</artifactId>
@@ -481,6 +488,7 @@
                                     <include>org.apache.dubbo:dubbo-metadata-report-redis</include>
                                     <include>org.apache.dubbo:dubbo-metadata-report-zookeeper</include>
                                     <include>org.apache.dubbo:dubbo-metrics-api</include>
+                                    <include>org.apache.dubbo:dubbo-metrics-default</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>
@@ -1169,19 +1177,19 @@
                                 <transformer
                                     implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>
-                                        META-INF/dubbo/internal/org.apache.dubbo.common.metrics.service.MetricsService
+                                        META-INF/dubbo/internal/org.apache.dubbo.metrics.service.MetricsService
                                     </resource>
                                 </transformer>
                                 <transformer
                                     implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>
-                                        META-INF/dubbo/internal/org.apache.dubbo.common.metrics.service.MetricsServiceExporter
+                                        META-INF/dubbo/internal/org.apache.dubbo.metrics.service.MetricsServiceExporter
                                     </resource>
                                 </transformer>
                                 <transformer
                                     implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>
-                                        META-INF/dubbo/internal/org.apache.dubbo.common.metrics.MetricsReporterFactory
+                                        META-INF/dubbo/internal/org.apache.dubbo.metrics.report.MetricsReporterFactory
                                     </resource>
                                 </transformer>
                                 <transformer

diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
@@ -230,6 +230,11 @@
                 <artifactId>dubbo-metrics-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-metrics-default</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.dubbo</groupId>
                 <artifactId>dubbo-metrics-prometheus</artifactId>

diff --git a/dubbo-distribution/dubbo-core-spi/pom.xml b/dubbo-distribution/dubbo-core-spi/pom.xml
@@ -67,6 +67,13 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-metrics-default</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-monitor-api</artifactId>
@@ -133,6 +140,7 @@
                                     <include>org.apache.dubbo:dubbo-config-api</include>
                                     <include>org.apache.dubbo:dubbo-metadata-api</include>
                                     <include>org.apache.dubbo:dubbo-metrics-api</include>
+                                    <include>org.apache.dubbo:dubbo-metrics-default</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>

diff --git a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/DubboMetrics.java b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/DubboMetrics.java
@@ -22,7 +22,7 @@
 
 public class DubboMetrics implements MeterBinder {
 
-    protected static volatile  MeterRegistry globalRegistry = null;
+    public static volatile  MeterRegistry globalRegistry = null;
     @Override
     public void bindTo(MeterRegistry registry) {
         this.globalRegistry = registry;

diff --git a/...n/metrics/collector/MetricsCollector.java → ...o/metrics/collector/MetricsCollector.java b/...n/metrics/collector/MetricsCollector.java → ...o/metrics/collector/MetricsCollector.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.collector;
+package org.apache.dubbo.metrics.collector;
 
-import org.apache.dubbo.common.metrics.model.sample.MetricSample;
+import org.apache.dubbo.metrics.model.sample.MetricSample;
 
 import java.util.List;
 

diff --git a/...cs/collector/stat/MetricsStatHandler.java → ...cs/collector/stat/MetricsStatHandler.java b/...cs/collector/stat/MetricsStatHandler.java → ...cs/collector/stat/MetricsStatHandler.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.collector.stat;
+package org.apache.dubbo.metrics.collector.stat;
+
+import org.apache.dubbo.metrics.model.MethodMetric;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.dubbo.common.metrics.model.MethodMetric;
-
 public interface MetricsStatHandler {
     Map<MethodMetric, AtomicLong> get();
     void increase(String interfaceName, String methodName, String group, String version);

diff --git a/...bo/common/metrics/event/MetricsEvent.java → ...che/dubbo/metrics/event/MetricsEvent.java b/...bo/common/metrics/event/MetricsEvent.java → ...che/dubbo/metrics/event/MetricsEvent.java
@@ -15,15 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.event;
+package org.apache.dubbo.metrics.event;
+
+import org.apache.dubbo.metrics.model.MethodMetric;
 
 /**
  * BaseMetricsEvent.
  */
 public abstract class MetricsEvent {
 
     /**
-     * Metric object. (eg. {@link org.apache.dubbo.common.metrics.model.MethodMetric})
+     * Metric object. (eg. {@link MethodMetric})
      */
     protected transient Object source;
 

diff --git a/...e/dubbo/common/metrics/event/RTEvent.java → ...g/apache/dubbo/metrics/event/RTEvent.java b/...e/dubbo/common/metrics/event/RTEvent.java → ...g/apache/dubbo/metrics/event/RTEvent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.event;
+package org.apache.dubbo.metrics.event;
 
 /**
  * RtEvent.

diff --git a/...bo/common/metrics/event/RequestEvent.java → ...che/dubbo/metrics/event/RequestEvent.java b/...bo/common/metrics/event/RequestEvent.java → ...che/dubbo/metrics/event/RequestEvent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.event;
+package org.apache.dubbo.metrics.event;
 
 /**
  * RequestEvent.

diff --git a/...mon/metrics/listener/MetricsListener.java → ...bbo/metrics/listener/MetricsListener.java b/...mon/metrics/listener/MetricsListener.java → ...bbo/metrics/listener/MetricsListener.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.listener;
+package org.apache.dubbo.metrics.listener;
 
-import org.apache.dubbo.common.metrics.event.MetricsEvent;
+import org.apache.dubbo.metrics.event.MetricsEvent;
 
 /**
  * Metrics Listener.

diff --git a/...bo/common/metrics/model/MethodMetric.java → ...che/dubbo/metrics/model/MethodMetric.java b/...bo/common/metrics/model/MethodMetric.java → ...che/dubbo/metrics/model/MethodMetric.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.model;
+package org.apache.dubbo.metrics.model;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...common/metrics/model/MetricsCategory.java → .../dubbo/metrics/model/MetricsCategory.java b/...common/metrics/model/MetricsCategory.java → .../dubbo/metrics/model/MetricsCategory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.model;
+package org.apache.dubbo.metrics.model;
 
 /**
  * Metric category.

diff --git a/...ubbo/common/metrics/model/MetricsKey.java → ...pache/dubbo/metrics/model/MetricsKey.java b/...ubbo/common/metrics/model/MetricsKey.java → ...pache/dubbo/metrics/model/MetricsKey.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.model;
+package org.apache.dubbo.metrics.model;
 
 public enum MetricsKey {
 

diff --git a/...trics/model/sample/GaugeMetricSample.java → ...trics/model/sample/GaugeMetricSample.java b/...trics/model/sample/GaugeMetricSample.java → ...trics/model/sample/GaugeMetricSample.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.model.sample;
+package org.apache.dubbo.metrics.model.sample;
 
-import org.apache.dubbo.common.metrics.model.MetricsCategory;
-import org.apache.dubbo.common.metrics.model.MetricsKey;
+import org.apache.dubbo.metrics.model.MetricsCategory;
+import org.apache.dubbo.metrics.model.MetricsKey;
 
 import java.util.Map;
 import java.util.function.Supplier;

diff --git a/...on/metrics/model/sample/MetricSample.java → ...bo/metrics/model/sample/MetricSample.java b/...on/metrics/model/sample/MetricSample.java → ...bo/metrics/model/sample/MetricSample.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.model.sample;
+package org.apache.dubbo.metrics.model.sample;
 
-import org.apache.dubbo.common.metrics.model.MetricsCategory;
+import org.apache.dubbo.metrics.model.MetricsCategory;
 
 import java.util.Map;
 import java.util.Objects;

diff --git a/...trics/AbstractMetricsReporterFactory.java → ...eport/AbstractMetricsReporterFactory.java b/...trics/AbstractMetricsReporterFactory.java → ...eport/AbstractMetricsReporterFactory.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.metrics;
+package org.apache.dubbo.metrics.report;
 
-import org.apache.dubbo.common.metrics.MetricsReporterFactory;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
 /**

diff --git a/...dubbo/common/metrics/MetricsReporter.java → ...dubbo/metrics/report/MetricsReporter.java b/...dubbo/common/metrics/MetricsReporter.java → ...dubbo/metrics/report/MetricsReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics;
+package org.apache.dubbo.metrics.report;
 
 /**
  * Metrics Reporter.

diff --git a/...ommon/metrics/MetricsReporterFactory.java → ...etrics/report/MetricsReporterFactory.java b/...ommon/metrics/MetricsReporterFactory.java → ...etrics/report/MetricsReporterFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics;
+package org.apache.dubbo.metrics.report;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.extension.Adaptive;

diff --git a/...common/metrics/service/MetricsEntity.java → .../dubbo/metrics/service/MetricsEntity.java b/...common/metrics/service/MetricsEntity.java → .../dubbo/metrics/service/MetricsEntity.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.service;
+package org.apache.dubbo.metrics.service;
 
-import org.apache.dubbo.common.metrics.model.MetricsCategory;
+import org.apache.dubbo.metrics.model.MetricsCategory;
 
 import java.util.Map;
 import java.util.Objects;

diff --git a/...ommon/metrics/service/MetricsService.java → ...dubbo/metrics/service/MetricsService.java b/...ommon/metrics/service/MetricsService.java → ...dubbo/metrics/service/MetricsService.java
@@ -15,20 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.service;
+package org.apache.dubbo.metrics.service;
 
 import org.apache.dubbo.common.extension.ExtensionScope;
 import org.apache.dubbo.common.extension.SPI;
-import org.apache.dubbo.common.metrics.model.MetricsCategory;
+import org.apache.dubbo.metrics.model.MetricsCategory;
+import org.apache.dubbo.metrics.collector.MetricsCollector;
 
 import java.util.List;
 import java.util.Map;
 
-import static org.apache.dubbo.common.metrics.service.MetricsService.DEFAULT_EXTENSION_NAME;
+import static org.apache.dubbo.metrics.service.MetricsService.DEFAULT_EXTENSION_NAME;
 
 /**
  * Metrics Service.
- * Provide an interface to get metrics from {@link org.apache.dubbo.common.metrics.collector.MetricsCollector}
+ * Provide an interface to get metrics from {@link MetricsCollector}
  */
 @SPI(value = DEFAULT_EXTENSION_NAME, scope = ExtensionScope.APPLICATION)
 public interface MetricsService {

diff --git a/...trics/service/MetricsServiceExporter.java → ...trics/service/MetricsServiceExporter.java b/...trics/service/MetricsServiceExporter.java → ...trics/service/MetricsServiceExporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.common.metrics.service;
+package org.apache.dubbo.metrics.service;
 
 import org.apache.dubbo.common.extension.ExtensionScope;
 import org.apache.dubbo.common.extension.SPI;

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 @@
-metrics-beta=org.apache.dubbo.metrics.filter.MetricsFilter
 observationsender=org.apache.dubbo.metrics.filter.observation.ObservationSenderFilter