From 5a15fad683baa392ec3f1d7bef8953e5099106c1 Mon Sep 17 00:00:00 2001 From: zhangzhiyong Date: Fri, 13 Sep 2024 12:34:12 +0800 Subject: [PATCH] refactor: switch the orginal package path from com.xiaomi.mone to org.apache.ozhera #457 --- .../demo/client/config/PrometheusConfiguration.java | 2 +- .../hera/demo/client/controller/TestController.java | 2 +- .../apache/ozhera}/prometheus/all/client/Metrics.java | 10 +++++----- .../ozhera}/prometheus/all/client/MetricsManager.java | 2 +- .../ozhera}/prometheus/all/client/Prometheus.java | 2 +- .../prometheus/all/client/PrometheusCounter.java | 2 +- .../ozhera}/prometheus/all/client/PrometheusGauge.java | 2 +- .../prometheus/all/client/PrometheusHistogram.java | 2 +- .../ozhera}/prometheus/all/client/XmCounter.java | 2 +- .../apache/ozhera}/prometheus/all/client/XmGauge.java | 2 +- .../ozhera}/prometheus/all/client/XmHistogram.java | 2 +- .../all/client/binder/ClassLoaderMetricsReduced.java | 2 +- .../all/client/binder/JvmGcMetricsReduced.java | 2 +- .../all/client/binder/JvmMemoryMetricsReduced.java | 2 +- .../all/client/binder/JvmThreadMetricsReduced.java | 2 +- .../ozhera}/prometheus/all/client/PrometheusTest.java | 2 +- .../starter/all/config/PrometheusConfigure.java | 10 +++++----- .../ozhera}/prometheus/starter/all/domain/Const.java | 2 +- .../prometheus/starter/all/exporter/HTTPServer.java | 2 +- .../prometheus/starter/all/factory/ServiceFactory.java | 8 ++++---- .../starter/all/service/MilinePrometheusService.java | 2 +- .../starter/all/service/PrometheusService.java | 2 +- readme/custom-tracking/custom-tracking.md | 4 ++-- readme/custom-tracking/custom-tracking_cn.md | 4 ++-- 24 files changed, 37 insertions(+), 37 deletions(-) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/Metrics.java (93%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/MetricsManager.java (96%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/Prometheus.java (99%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/PrometheusCounter.java (97%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/PrometheusGauge.java (98%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/PrometheusHistogram.java (97%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/XmCounter.java (95%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/XmGauge.java (95%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/XmHistogram.java (95%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/binder/ClassLoaderMetricsReduced.java (97%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/binder/JvmGcMetricsReduced.java (99%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/binder/JvmMemoryMetricsReduced.java (98%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/binder/JvmThreadMetricsReduced.java (97%) rename prometheus-starter-all/prometheus-diy-client/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/PrometheusTest.java (98%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/config/PrometheusConfigure.java (92%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/domain/Const.java (93%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/exporter/HTTPServer.java (99%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/factory/ServiceFactory.java (81%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/service/MilinePrometheusService.java (96%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/service/PrometheusService.java (94%) diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java index 95aabdc24..59e7f6a43 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java +++ b/ozhera-demo-client/ozhera-demo-client-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/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java index d31e88ad1..a8cbbb206 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java +++ b/ozhera-demo-client/ozhera-demo-client-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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Metrics.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Metrics.java similarity index 93% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Metrics.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Metrics.java index 6e35cdd24..0de54200a 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Metrics.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/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-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/MetricsManager.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/MetricsManager.java similarity index 96% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/MetricsManager.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/MetricsManager.java index 28392f711..e3faee259 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/MetricsManager.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Prometheus.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Prometheus.java similarity index 99% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Prometheus.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Prometheus.java index 21968406e..5de0a7a4b 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Prometheus.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusCounter.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusCounter.java similarity index 97% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusCounter.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusCounter.java index 768a865c5..5ec3243a1 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusCounter.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusGauge.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusGauge.java similarity index 98% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusGauge.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusGauge.java index 3edf2c071..64a80ff02 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusGauge.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusHistogram.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusHistogram.java similarity index 97% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusHistogram.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusHistogram.java index 5cd466570..12f71c749 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusHistogram.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmCounter.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmCounter.java similarity index 95% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmCounter.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmCounter.java index 14a18c8b4..036114415 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmCounter.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmGauge.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmGauge.java similarity index 95% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmGauge.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmGauge.java index cac9ac226..6ef097eba 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmGauge.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmHistogram.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmHistogram.java similarity index 95% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmHistogram.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmHistogram.java index 3554945a0..29e65fbf4 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmHistogram.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/ClassLoaderMetricsReduced.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/ClassLoaderMetricsReduced.java similarity index 97% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/ClassLoaderMetricsReduced.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/ClassLoaderMetricsReduced.java index a3c02c21b..b9bc25de7 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/ClassLoaderMetricsReduced.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmGcMetricsReduced.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmGcMetricsReduced.java similarity index 99% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmGcMetricsReduced.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmGcMetricsReduced.java index 8478d8c75..224cfe166 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmGcMetricsReduced.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmMemoryMetricsReduced.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmMemoryMetricsReduced.java similarity index 98% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmMemoryMetricsReduced.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmMemoryMetricsReduced.java index f21b21d91..082d6dd6c 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmMemoryMetricsReduced.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/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/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmThreadMetricsReduced.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmThreadMetricsReduced.java similarity index 97% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmThreadMetricsReduced.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmThreadMetricsReduced.java index 9438f7bde..ade431a65 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmThreadMetricsReduced.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/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-starter-all/prometheus-diy-client/src/test/java/com/xiaomi/youpin/prometheus/all/client/PrometheusTest.java b/prometheus-starter-all/prometheus-diy-client/src/test/java/org/apache/ozhera/prometheus/all/client/PrometheusTest.java similarity index 98% rename from prometheus-starter-all/prometheus-diy-client/src/test/java/com/xiaomi/youpin/prometheus/all/client/PrometheusTest.java rename to prometheus-starter-all/prometheus-diy-client/src/test/java/org/apache/ozhera/prometheus/all/client/PrometheusTest.java index a5b3a7e94..601f3e316 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/test/java/com/xiaomi/youpin/prometheus/all/client/PrometheusTest.java +++ b/prometheus-starter-all/prometheus-diy-client/src/test/java/org/apache/ozhera/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/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/config/PrometheusConfigure.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/config/PrometheusConfigure.java similarity index 92% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/config/PrometheusConfigure.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/config/PrometheusConfigure.java index 9d9c9b336..5d60f9944 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/config/PrometheusConfigure.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/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/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/domain/Const.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/domain/Const.java similarity index 93% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/domain/Const.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/domain/Const.java index 5de8da292..6760673b0 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/domain/Const.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/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/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/exporter/HTTPServer.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/exporter/HTTPServer.java similarity index 99% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/exporter/HTTPServer.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/exporter/HTTPServer.java index 7f35a29d1..368fccc38 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/exporter/HTTPServer.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/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/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/factory/ServiceFactory.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/factory/ServiceFactory.java similarity index 81% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/factory/ServiceFactory.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/factory/ServiceFactory.java index 3c982b49c..b4929f39a 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/factory/ServiceFactory.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/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/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/MilinePrometheusService.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/MilinePrometheusService.java similarity index 96% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/MilinePrometheusService.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/MilinePrometheusService.java index 343be62d1..6fa0ccc23 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/MilinePrometheusService.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/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/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/PrometheusService.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/PrometheusService.java similarity index 94% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/PrometheusService.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/PrometheusService.java index 4a7083563..4868a8597 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/PrometheusService.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/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 index d29839f92..41d466984 100644 --- 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 index 3344f4c46..d9749b0f0 100644 --- 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"); ```