This is an automated email from the ASF dual-hosted git repository. gaoxihui pushed a commit to branch fix-xiaomi-ref in repository https://gitbox.apache.org/repos/asf/ozhera.git
commit b9d704eccdb522ce3f686e163661db43e30400d5 Author: gaoxihui <[email protected]> AuthorDate: Tue Apr 1 14:57:31 2025 +0800 fix: repair the historical legacy xiaomi path and information references --- README.md | 2 +- dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile | 1 - dist/sql/mysql/ozhera.sql | 4 ++-- dist/sql/postgre/ozhera.sql | 4 ++-- .../org/apache/ozhera/demo/client/grpc/GrpcClientService.java | 4 ++-- .../ozhera-demo-client-server/src/main/proto/MyService.proto | 4 ++-- .../ozhera-demo-server-server/src/main/proto/MyService.proto | 4 ++-- .../ozhera-demo-server-server/src/main/resources/Dockerfile | 1 - .../apache/ozhera/log/manager/model/bo/MiddlewareAddParam.java | 2 +- .../ozhera/log/manager/model/bo/MiddlewareQueryParam.java | 2 +- .../src/main/resources/generatorConfig.xml | 10 +++++----- .../ozhera-prometheus-agent-server/Dockerfile | 1 - .../src/main/resources/Dockerfile | 1 - readme/custom-tracking/custom-tracking.md | 2 +- readme/custom-tracking/custom-tracking_cn.md | 2 +- .../org/apache/ozhera/trace/etl/domain/ErrorTraceMessage.java | 2 +- .../hera => org/apache/ozhera}/trace/etl/es/AtomicTest.java | 2 +- .../apache/ozhera}/trace/etl/test/FastWriter.java | 2 +- .../apache/ozhera}/trace/etl/test/TestConsumer.java | 2 +- .../apache/ozhera}/trace/etl/test/WriterTest.java | 2 +- .../youpin => org/apache/ozhera}/trace/etl/test/Test.java | 2 +- 21 files changed, 26 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 3c0451d2..b02ac21e 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ ## What is Apache OzHera(Incubating)? -Apache OzHera(Incubating) is an Application Observable Platform in the Cloud Native Era. open-sourced by the R&D efficiency team of Xiaomi-China region. Centered around applications, it integrates metrics monitoring, link tracing, logging, and alerts. It achieves a seamless connection and interaction from metrics to tracing to logging. Moreover, Apache OzHera(Incubating) offers a comprehensive monitoring dashboard featuring application health status lists, application metric boards, inte [...] +Apache OzHera(Incubating) is an Application Observable Platform in the Cloud Native Era. Centered around applications, it integrates metrics monitoring, link tracing, logging, and alerts. It achieves a seamless connection and interaction from metrics to tracing to logging. Moreover, Apache OzHera(Incubating) offers a comprehensive monitoring dashboard featuring application health status lists, application metric boards, interface overviews, application overviews, gateway overviews, etc., [...] --- diff --git a/dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile b/dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile index 30036ec1..35cd35b4 100644 --- a/dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile +++ b/dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile @@ -14,7 +14,6 @@ # limitations under the License. FROM openjdk:21-jdk-bookworm -MAINTAINER [email protected] RUN mkdir -p /home/work/prometheus-agent/ RUN mkdir -p /home/work/log/prometheus-agent/ ARG SRC_PATH diff --git a/dist/sql/mysql/ozhera.sql b/dist/sql/mysql/ozhera.sql index d4f4c08b..843d0706 100644 --- a/dist/sql/mysql/ozhera.sql +++ b/dist/sql/mysql/ozhera.sql @@ -254,7 +254,7 @@ CREATE TABLE `app_monitor` `id` int(11) NOT NULL AUTO_INCREMENT, `project_id` int(11) DEFAULT NULL COMMENT 'project_id', `iam_tree_id` int(11) DEFAULT NULL COMMENT 'iamTreeId', - `iam_tree_type` int(3) DEFAULT NULL COMMENT 'iam type，0:TPC、1:XiaoMI IAM', + `iam_tree_type` int(3) DEFAULT NULL COMMENT 'iam type，0:TPC、1:IAM', `project_name` varchar(255) DEFAULT NULL COMMENT 'project_name', `app_source` int(8) DEFAULT '0' COMMENT 'app_source 0-opensource', `owner` varchar(128) DEFAULT NULL COMMENT 'owner', @@ -381,7 +381,7 @@ CREATE TABLE `hera_app_base_info` ( `platform_type` int NOT NULL COMMENT 'platform type', `app_sign_id` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT 'app sign id', `iam_tree_id` int NULL DEFAULT NULL COMMENT 'iam_tree_id(The alarm interface is necessary.)', - `iam_tree_type` int(3) NOT NULL COMMENT 'iam type，0:TPC、1:XIAOMI IAM', + `iam_tree_type` int(3) NOT NULL COMMENT 'iam type，0:TPC、1: IAM', `envs_map` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'envs list', `auto_capacity` int NULL DEFAULT NULL COMMENT 'auto capacity 1 yes，0 no', `status` int NULL DEFAULT NULL COMMENT 'status', diff --git a/dist/sql/postgre/ozhera.sql b/dist/sql/postgre/ozhera.sql index 79815d0c..9ec294b6 100644 --- a/dist/sql/postgre/ozhera.sql +++ b/dist/sql/postgre/ozhera.sql @@ -358,7 +358,7 @@ CREATE TABLE "app_monitor" ); COMMENT ON COLUMN "app_monitor"."project_id" IS 'project_id'; COMMENT ON COLUMN "app_monitor"."iam_tree_id" IS 'iamTreeId'; -COMMENT ON COLUMN "app_monitor"."iam_tree_type" IS 'iam type，0:TPC、1:XiaoMI IAM'; +COMMENT ON COLUMN "app_monitor"."iam_tree_type" IS 'iam type，0:TPC、1:IAM'; COMMENT ON COLUMN "app_monitor"."project_name" IS 'project_name'; COMMENT ON COLUMN "app_monitor"."app_source" IS 'app_source 0-opensource'; COMMENT ON COLUMN "app_monitor"."owner" IS 'owner'; @@ -551,7 +551,7 @@ COMMENT ON COLUMN "hera_app_base_info"."app_language" IS 'language type'; COMMENT ON COLUMN "hera_app_base_info"."platform_type" IS 'platform type'; COMMENT ON COLUMN "hera_app_base_info"."app_sign_id" IS 'app sign id'; COMMENT ON COLUMN "hera_app_base_info"."iam_tree_id" IS 'iam_tree_id(The alarm interface is necessary.)'; -COMMENT ON COLUMN "hera_app_base_info"."iam_tree_type" IS 'iam type，0:TPC、1:XIAOMI IAM'; +COMMENT ON COLUMN "hera_app_base_info"."iam_tree_type" IS 'iam type，0:TPC、1:IAM'; COMMENT ON COLUMN "hera_app_base_info"."envs_map" IS 'envs list'; COMMENT ON COLUMN "hera_app_base_info"."auto_capacity" IS 'auto capacity 1 yes，0 no'; COMMENT ON COLUMN "hera_app_base_info"."status" IS 'status'; diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/grpc/GrpcClientService.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/grpc/GrpcClientService.java index e57c10c2..cbebc679 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/grpc/GrpcClientService.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/grpc/GrpcClientService.java @@ -22,8 +22,8 @@ package org.apache.ozhera.demo.client.grpc; import net.devh.boot.grpc.client.inject.GrpcClient; import org.springframework.stereotype.Service; -import com.xiaomi.mone.hera.demo.grpc.MyServiceGrpc; -import com.xiaomi.mone.hera.demo.grpc.HelloRequest; +import org.apache.ozhera.demo.grpc.MyServiceGrpc; +import org.apache.ozhera.demo.grpc.HelloRequest; @Service public class GrpcClientService { diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/proto/MyService.proto b/ozhera-demo-client/ozhera-demo-client-server/src/main/proto/MyService.proto index 1d0b0853..b95bc0ff 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/proto/MyService.proto +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/proto/MyService.proto @@ -19,10 +19,10 @@ syntax = "proto3"; -package com.xiaomi.mone.hera.demo.grpc; +package org.apache.ozhera.demo.grpc; option java_multiple_files = true; -option java_package = "com.xiaomi.mone.hera.demo.grpc"; +option java_package = "org.apache.ozhera.demo.grpc"; option java_outer_classname = "HelloWorldProto"; // The greeting service definition. diff --git a/ozhera-demo-server/ozhera-demo-server-server/src/main/proto/MyService.proto b/ozhera-demo-server/ozhera-demo-server-server/src/main/proto/MyService.proto index 1d0b0853..b95bc0ff 100644 --- a/ozhera-demo-server/ozhera-demo-server-server/src/main/proto/MyService.proto +++ b/ozhera-demo-server/ozhera-demo-server-server/src/main/proto/MyService.proto @@ -19,10 +19,10 @@ syntax = "proto3"; -package com.xiaomi.mone.hera.demo.grpc; +package org.apache.ozhera.demo.grpc; option java_multiple_files = true; -option java_package = "com.xiaomi.mone.hera.demo.grpc"; +option java_package = "org.apache.ozhera.demo.grpc"; option java_outer_classname = "HelloWorldProto"; // The greeting service definition. diff --git a/ozhera-demo-server/ozhera-demo-server-server/src/main/resources/Dockerfile b/ozhera-demo-server/ozhera-demo-server-server/src/main/resources/Dockerfile index a3c2a5d9..654f2406 100644 --- a/ozhera-demo-server/ozhera-demo-server-server/src/main/resources/Dockerfile +++ b/ozhera-demo-server/ozhera-demo-server-server/src/main/resources/Dockerfile @@ -14,7 +14,6 @@ # limitations under the License. FROM miserver -MAINTAINER [email protected] RUN mkdir -p /home/work/zxw_test2/ RUN mkdir -p /home/work/log/zxw_test2/ COPY zxw_test2-server-null-SNAPSHOT.jar /home/work/zxw_test2/ diff --git a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/MiddlewareAddParam.java b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/MiddlewareAddParam.java index bc442215..1da9f71d 100644 --- a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/MiddlewareAddParam.java +++ b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/MiddlewareAddParam.java @@ -32,7 +32,7 @@ import java.util.List; @Data public class MiddlewareAddParam implements Serializable { /** - * com.xiaomi.mone.log.api.enums.MiddlewareEnum.code + * org.apache.ozhera.log.api.enums.MiddlewareEnum.code */ private Integer type; diff --git a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/MiddlewareQueryParam.java b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/MiddlewareQueryParam.java index dcad442c..3b856445 100644 --- a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/MiddlewareQueryParam.java +++ b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/MiddlewareQueryParam.java @@ -32,7 +32,7 @@ import java.util.List; @Data public class MiddlewareQueryParam extends MilogPageParam implements Serializable { /** - * com.xiaomi.mone.log.api.enums.MiddlewareEnum + * org.apache.ozhera.log.api.enums.MiddlewareEnum */ private List<?> types; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/resources/generatorConfig.xml b/ozhera-monitor/ozhera-monitor-service/src/main/resources/generatorConfig.xml index 1f1371c4..f9cf0e21 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/resources/generatorConfig.xml +++ b/ozhera-monitor/ozhera-monitor-service/src/main/resources/generatorConfig.xml @@ -60,8 +60,8 @@ <!-- 生成实体类地址 --> <javaModelGenerator targetPackage="org.apache.ozhera.monitor.dao.model" targetProject="src/main/java"> - <!--<javaModelGenerator targetPackage="com.xiaomi.mone.monitor.dao.model.cat" targetProject="src/main/java">--> - <!--<javaModelGenerator targetPackage="com.xiaomi.data.push.dao.model" targetProject="/data/workspace/java/web-service/user-profile-push/src/main/java">--> + <!--<javaModelGenerator targetPackage="org.apache.ozhera.monitor.dao.model.cat" targetProject="src/main/java">--> + <!--<javaModelGenerator targetPackage="org.apache.ozhera.push.dao.model" targetProject="/data/workspace/java/web-service/user-profile-push/src/main/java">--> <!-- 从数据库返回的值被清理前后的空格 --> <property name="trimStrings" value="true"/> <!-- enableSubPackages:是否让schema作为包的后缀 --> @@ -70,15 +70,15 @@ <!-- 生成mapper xml文件 --> <sqlMapGenerator targetPackage="org.apache.ozhera.monitor.mapper" targetProject="src/main/resources/"> - <!-- <sqlMapGenerator targetPackage="com.xiaomi.cat.dao.mapper" targetProject="src/main/resources/">--> + <!-- <sqlMapGenerator targetPackage="org.apache.ozhera.cat.dao.mapper" targetProject="src/main/resources/">--> <!-- enableSubPackages:是否让schema作为包的后缀 --> <property name="enableSubPackages" value="false"/> </sqlMapGenerator> <!-- 生成mapper xml对应Client--> <javaClientGenerator targetPackage="org.apache.ozhera.monitor.mapper" targetProject="src/main/java" type="XMLMAPPER"> - <!--<javaClientGenerator targetPackage="com.xiaomi.mone.monitor.dao.cat" targetProject="src/main/java" type="XMLMAPPER">--> - <!--<javaClientGenerator targetPackage="com.xiaomi.data.push.dao.mapper" targetProject="/data/workspace/java/web-service/user-profile-push/src/main/java" type="XMLMAPPER">--> + <!--<javaClientGenerator targetPackage="org.apache.ozhera.monitor.dao.cat" targetProject="src/main/java" type="XMLMAPPER">--> + <!--<javaClientGenerator targetPackage="org.apache.ozhera.data.push.dao.mapper" targetProject="/data/workspace/java/web-service/user-profile-push/src/main/java" type="XMLMAPPER">--> <!-- enableSubPackages:是否让schema作为包的后缀 --> <property name="enableSubPackages" value="false"/> </javaClientGenerator> diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/Dockerfile b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/Dockerfile index dda1836c..f7718d91 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/Dockerfile +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/Dockerfile @@ -14,7 +14,6 @@ # limitations under the License. FROM openjdk:21-jdk-bookworm -MAINTAINER [email protected] RUN mkdir -p /home/work/prometheus-agent/ RUN mkdir -p /home/work/log/prometheus-agent/ ARG SRC_PATH diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/resources/Dockerfile b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/resources/Dockerfile index bbe48be7..d5e8de04 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/resources/Dockerfile +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/resources/Dockerfile @@ -14,7 +14,6 @@ # limitations under the License. FROM openjdk:8-jre -MAINTAINER [email protected] RUN mkdir -p /home/work/prometheus-agent/ RUN mkdir -p /home/work/log/prometheus-agent/ COPY prometheus-agent-server-1.0.0-SNAPSHOT.jar /home/work/prometheus-agent/ diff --git a/readme/custom-tracking/custom-tracking.md b/readme/custom-tracking/custom-tracking.md index faab86fb..4a1d2fcc 100644 --- a/readme/custom-tracking/custom-tracking.md +++ b/readme/custom-tracking/custom-tracking.md @@ -27,7 +27,7 @@ Bold **Important** content is key, please read carefully. Download the open-source code: -https://github.com/XiaoMi/ozhera/tree/master/prometheus-starter-all +https://github.com/apache/ozhera/tree/master/prometheus-starter-all After a successful compilation, push the pom to the company's Maven repository, or refer to the local Maven repository for debugging. diff --git a/readme/custom-tracking/custom-tracking_cn.md b/readme/custom-tracking/custom-tracking_cn.md index d1aad20c..3b344d74 100644 --- a/readme/custom-tracking/custom-tracking_cn.md +++ b/readme/custom-tracking/custom-tracking_cn.md @@ -27,7 +27,7 @@ 下载开源代码： -https://github.com/XiaoMi/ozhera/tree/master/prometheus-starter-all +https://github.com/apache/ozhera/tree/master/prometheus-starter-all 编译成功之后，将pom推送到公司Maven仓库，或引用本地Maven仓库进行调试。 diff --git a/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/ErrorTraceMessage.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/ErrorTraceMessage.java index c1be16d3..fe15ae1f 100644 --- a/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/ErrorTraceMessage.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/ErrorTraceMessage.java @@ -41,7 +41,7 @@ public class ErrorTraceMessage { /** * HTTP Request: The URI of the request, e.g., /ok. - * Dubbo Request: The service/method of the request, e.g., com.xiaomi.member.provider.MemberService/getMemberById. + * Dubbo Request: The service/method of the request, e.g., org.apache.ozhera.member.provider.MemberService/getMemberById. * Redis Request: The Redis command key, truncated to the first two hundred characters, e.g., MGET key1 key2 key3.... * MySQL Request: The SQL query truncated to the first two hundred characters, e.g., select id, name, gender from user where .... */ diff --git a/trace-etl/trace-etl-es/src/test/java/com/xiaomi/hera/trace/etl/es/AtomicTest.java b/trace-etl/trace-etl-es/src/test/java/org/apache/ozhera/trace/etl/es/AtomicTest.java similarity index 96% rename from trace-etl/trace-etl-es/src/test/java/com/xiaomi/hera/trace/etl/es/AtomicTest.java rename to trace-etl/trace-etl-es/src/test/java/org/apache/ozhera/trace/etl/es/AtomicTest.java index 84441041..43e2820d 100644 --- a/trace-etl/trace-etl-es/src/test/java/com/xiaomi/hera/trace/etl/es/AtomicTest.java +++ b/trace-etl/trace-etl-es/src/test/java/org/apache/ozhera/trace/etl/es/AtomicTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.xiaomi.hera.trace.etl.es; +package org.apache.ozhera.trace.etl.es; import org.junit.Assert; import org.junit.Test; diff --git a/trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/FastWriter.java b/trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/FastWriter.java similarity index 98% rename from trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/FastWriter.java rename to trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/FastWriter.java index 8ac6928c..6d6de68b 100644 --- a/trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/FastWriter.java +++ b/trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/FastWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.xiaomi.youpin.trace.etl.test; +package org.apache.ozhera.trace.etl.test; import org.apache.commons.lang3.tuple.Pair; diff --git a/trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/TestConsumer.java b/trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/TestConsumer.java similarity index 95% rename from trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/TestConsumer.java rename to trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/TestConsumer.java index 13fe2d1a..a6c2dcf2 100644 --- a/trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/TestConsumer.java +++ b/trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/TestConsumer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.xiaomi.youpin.trace.etl.test; +package org.apache.ozhera.trace.etl.test; /** * @Description diff --git a/trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/WriterTest.java b/trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/WriterTest.java similarity index 99% rename from trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/WriterTest.java rename to trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/WriterTest.java index eb4b33a6..b47b5813 100644 --- a/trace-etl/trace-etl-server/src/test/java/com/xiaomi/youpin/trace/etl/test/WriterTest.java +++ b/trace-etl/trace-etl-server/src/test/java/org/apache/ozhera/trace/etl/test/WriterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.xiaomi.youpin.trace.etl.test; +package org.apache.ozhera.trace.etl.test; import com.google.common.base.Strings; import lombok.SneakyThrows; diff --git a/trace-etl/trace-etl-service/src/test/java/com/xiaomi/youpin/trace/etl/test/Test.java b/trace-etl/trace-etl-service/src/test/java/org/apache/ozhera/trace/etl/test/Test.java similarity index 95% rename from trace-etl/trace-etl-service/src/test/java/com/xiaomi/youpin/trace/etl/test/Test.java rename to trace-etl/trace-etl-service/src/test/java/org/apache/ozhera/trace/etl/test/Test.java index 6937e051..c42956ca 100644 --- a/trace-etl/trace-etl-service/src/test/java/com/xiaomi/youpin/trace/etl/test/Test.java +++ b/trace-etl/trace-etl-service/src/test/java/org/apache/ozhera/trace/etl/test/Test.java @@ -17,7 +17,7 @@ * under the License. */ -package com.xiaomi.youpin.trace.etl.test; +package org.apache.ozhera.trace.etl.test; public class Test { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
