refactor: switch the orginal package path from com.xiaomi.mone to org…

….apache.ozhera apache#457 (apache#467) Co-authored-by: wodiwudi <[email protected]>
sadadw1 · Sep 13, 2024 · e264094 · e264094
1 parent ea5385a
commit e264094
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 37 deletions.
diff --git a/...server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java b/...server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java
@@ -15,7 +15,7 @@
  */
 package com.xiaomi.mone.hera.demo.client.config;
 
-import com.xiaomi.mione.prometheus.starter.all.config.PrometheusConfigure;
+import org.apache.ozhera.prometheus.starter.all.config.PrometheusConfigure;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/...ient-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java b/...ient-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java
@@ -19,7 +19,7 @@
 import com.xiaomi.mone.hera.demo.client.api.service.DubboHealthService;
 import com.xiaomi.mone.hera.demo.client.grpc.GrpcClientService;
 import com.xiaomi.mone.hera.demo.client.util.HttpClientUtil;
-import com.xiaomi.youpin.prometheus.all.client.Metrics;
+import org.apache.ozhera.prometheus.all.client.Metrics;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;

diff --git a/...youpin/prometheus/all/client/Metrics.java → ...ozhera/prometheus/all/client/Metrics.java b/...youpin/prometheus/all/client/Metrics.java → ...ozhera/prometheus/all/client/Metrics.java
@@ -13,12 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 
-import com.xiaomi.youpin.prometheus.all.client.binder.ClassLoaderMetricsReduced;
-import com.xiaomi.youpin.prometheus.all.client.binder.JvmGcMetricsReduced;
-import com.xiaomi.youpin.prometheus.all.client.binder.JvmMemoryMetricsReduced;
-import com.xiaomi.youpin.prometheus.all.client.binder.JvmThreadMetricsReduced;
+import org.apache.ozhera.prometheus.all.client.binder.ClassLoaderMetricsReduced;
+import org.apache.ozhera.prometheus.all.client.binder.JvmGcMetricsReduced;
+import org.apache.ozhera.prometheus.all.client.binder.JvmMemoryMetricsReduced;
+import org.apache.ozhera.prometheus.all.client.binder.JvmThreadMetricsReduced;
 import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;

diff --git a/...prometheus/all/client/MetricsManager.java → ...prometheus/all/client/MetricsManager.java b/...prometheus/all/client/MetricsManager.java → ...prometheus/all/client/MetricsManager.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 /**
  * @author zhangxiaowei6
  */

diff --git a/...pin/prometheus/all/client/Prometheus.java → ...era/prometheus/all/client/Prometheus.java b/...pin/prometheus/all/client/Prometheus.java → ...era/prometheus/all/client/Prometheus.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 
 import io.micrometer.prometheus.PrometheusConfig;
 import io.micrometer.prometheus.PrometheusMeterRegistry;

diff --git a/...metheus/all/client/PrometheusCounter.java → ...metheus/all/client/PrometheusCounter.java b/...metheus/all/client/PrometheusCounter.java → ...metheus/all/client/PrometheusCounter.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 
 import io.prometheus.client.Counter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...rometheus/all/client/PrometheusGauge.java → ...rometheus/all/client/PrometheusGauge.java b/...rometheus/all/client/PrometheusGauge.java → ...rometheus/all/client/PrometheusGauge.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 
 import io.prometheus.client.Gauge;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...theus/all/client/PrometheusHistogram.java → ...theus/all/client/PrometheusHistogram.java b/...theus/all/client/PrometheusHistogram.java → ...theus/all/client/PrometheusHistogram.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 
 import io.prometheus.client.Histogram;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...upin/prometheus/all/client/XmCounter.java → ...hera/prometheus/all/client/XmCounter.java b/...upin/prometheus/all/client/XmCounter.java → ...hera/prometheus/all/client/XmCounter.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 /**
  * @author zhangxiaowei6
  */

diff --git a/...youpin/prometheus/all/client/XmGauge.java → ...ozhera/prometheus/all/client/XmGauge.java b/...youpin/prometheus/all/client/XmGauge.java → ...ozhera/prometheus/all/client/XmGauge.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 /**
  * @author zhangxiaowei6
  */

diff --git a/...in/prometheus/all/client/XmHistogram.java → ...ra/prometheus/all/client/XmHistogram.java b/...in/prometheus/all/client/XmHistogram.java → ...ra/prometheus/all/client/XmHistogram.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 /**
  * @author zhangxiaowei6
  */

diff --git a/...ent/binder/ClassLoaderMetricsReduced.java → ...ent/binder/ClassLoaderMetricsReduced.java b/...ent/binder/ClassLoaderMetricsReduced.java → ...ent/binder/ClassLoaderMetricsReduced.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client.binder;
+package org.apache.ozhera.prometheus.all.client.binder;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/...ll/client/binder/JvmGcMetricsReduced.java → ...ll/client/binder/JvmGcMetricsReduced.java b/...ll/client/binder/JvmGcMetricsReduced.java → ...ll/client/binder/JvmGcMetricsReduced.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client.binder;
+package org.apache.ozhera.prometheus.all.client.binder;
 
 import com.sun.management.GarbageCollectionNotificationInfo;
 import com.sun.management.GcInfo;

diff --git a/...lient/binder/JvmMemoryMetricsReduced.java → ...lient/binder/JvmMemoryMetricsReduced.java b/...lient/binder/JvmMemoryMetricsReduced.java → ...lient/binder/JvmMemoryMetricsReduced.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client.binder;
+package org.apache.ozhera.prometheus.all.client.binder;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/...lient/binder/JvmThreadMetricsReduced.java → ...lient/binder/JvmThreadMetricsReduced.java b/...lient/binder/JvmThreadMetricsReduced.java → ...lient/binder/JvmThreadMetricsReduced.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client.binder;
+package org.apache.ozhera.prometheus.all.client.binder;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/...prometheus/all/client/PrometheusTest.java → ...prometheus/all/client/PrometheusTest.java b/...prometheus/all/client/PrometheusTest.java → ...prometheus/all/client/PrometheusTest.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.youpin.prometheus.all.client;
+package org.apache.ozhera.prometheus.all.client;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/...arter/all/config/PrometheusConfigure.java → ...arter/all/config/PrometheusConfigure.java b/...arter/all/config/PrometheusConfigure.java → ...arter/all/config/PrometheusConfigure.java
@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.mione.prometheus.starter.all.config;
+package org.apache.ozhera.prometheus.starter.all.config;
 
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.client.naming.NacosNamingService;
 import com.sun.net.httpserver.HttpServer;
-import com.xiaomi.mione.prometheus.starter.all.exporter.HTTPServer;
-import com.xiaomi.mione.prometheus.starter.all.service.MilinePrometheusService;
-import com.xiaomi.youpin.prometheus.all.client.Metrics;
-import com.xiaomi.youpin.prometheus.all.client.Prometheus;
+import org.apache.ozhera.prometheus.starter.all.exporter.HTTPServer;
+import org.apache.ozhera.prometheus.starter.all.service.MilinePrometheusService;
+import org.apache.ozhera.prometheus.all.client.Metrics;
+import org.apache.ozhera.prometheus.all.client.Prometheus;
 import io.prometheus.client.CollectorRegistry;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/.../prometheus/starter/all/domain/Const.java → .../prometheus/starter/all/domain/Const.java b/.../prometheus/starter/all/domain/Const.java → .../prometheus/starter/all/domain/Const.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.mione.prometheus.starter.all.domain;
+package org.apache.ozhera.prometheus.starter.all.domain;
 
 /**
  * @Description

diff --git a/...heus/starter/all/exporter/HTTPServer.java → ...heus/starter/all/exporter/HTTPServer.java b/...heus/starter/all/exporter/HTTPServer.java → ...heus/starter/all/exporter/HTTPServer.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.mione.prometheus.starter.all.exporter;
+package org.apache.ozhera.prometheus.starter.all.exporter;
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;

diff --git a/...s/starter/all/factory/ServiceFactory.java → ...s/starter/all/factory/ServiceFactory.java b/...s/starter/all/factory/ServiceFactory.java → ...s/starter/all/factory/ServiceFactory.java
@@ -13,13 +13,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.mione.prometheus.starter.all.factory;
+package org.apache.ozhera.prometheus.starter.all.factory;
 
-import com.xiaomi.mione.prometheus.starter.all.service.MilinePrometheusService;
-import com.xiaomi.mione.prometheus.starter.all.service.PrometheusService;
+import org.apache.ozhera.prometheus.starter.all.service.MilinePrometheusService;
+import org.apache.ozhera.prometheus.starter.all.service.PrometheusService;
 import org.apache.commons.lang3.StringUtils;
 
-import com.xiaomi.mione.prometheus.starter.all.domain.Const ;
+import org.apache.ozhera.prometheus.starter.all.domain.Const;
 
 
 /**

diff --git a/.../all/service/MilinePrometheusService.java → .../all/service/MilinePrometheusService.java b/.../all/service/MilinePrometheusService.java → .../all/service/MilinePrometheusService.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.mione.prometheus.starter.all.service;
+package org.apache.ozhera.prometheus.starter.all.service;
 
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/...tarter/all/service/PrometheusService.java → ...tarter/all/service/PrometheusService.java b/...tarter/all/service/PrometheusService.java → ...tarter/all/service/PrometheusService.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.xiaomi.mione.prometheus.starter.all.service;
+package org.apache.ozhera.prometheus.starter.all.service;
 
 public abstract class PrometheusService {
 

diff --git a/readme/custom-tracking/custom-tracking.md b/readme/custom-tracking/custom-tracking.md
@@ -41,7 +41,7 @@ After a successful compilation, push the pom to the company's Maven repository,
    Just ensure that the initialization of the `PrometheusConfigure.init()` method is called before any monitoring points.
 
    ```java
-   import com.xiaomi.mione.prometheus.starter.all.config.PrometheusConfigure;
+   import config.org.apache.ozhera.prometheus.starter.all.PrometheusConfigure;
 
    PrometheusConfigure.init(nacosAddr, serverType);
     ```
@@ -70,7 +70,7 @@ Counter: An always-increasing counter. We can use it to record the frequency of
 #### 2) Code Example
 
 ```java
-import com.xiaomi.youpin.prometheus.all.client.Metrics;
+import org.apache.ozhera.prometheus.all.client.Metrics;
 
 Metrics.getInstance().newCounter("testCounter","methodName","url").with("ok","/test/ok").add(1, "ok","/test/ok");
 ```

diff --git a/readme/custom-tracking/custom-tracking_cn.md b/readme/custom-tracking/custom-tracking_cn.md
@@ -41,7 +41,7 @@ https://github.com/XiaoMi/ozhera/tree/master/prometheus-starter-all
     只要是在进行打点前完成初始化PrometheusConfigure.init()方法的调用即可。
 
     ```java
-    import com.xiaomi.mione.prometheus.starter.all.config.PrometheusConfigure;
+    import config.org.apache.ozhera.prometheus.starter.all.PrometheusConfigure;
 
     PrometheusConfigure.init(nacosAddr, serverType);
     ```
@@ -71,7 +71,7 @@ Counter：只增不减的计数器，我们可以在应用程序中记录某些
 #### 2）代码示例
 
 ```java
-import com.xiaomi.youpin.prometheus.all.client.Metrics;
+import org.apache.ozhera.prometheus.all.client.Metrics;
 
 Metrics.getInstance().newCounter("testCounter","methodName","url").with("ok","/test/ok").add(1, "ok","/test/ok");
 ```