From 1ab33f8969679b0b465c0747eb42d580da53e763 Mon Sep 17 00:00:00 2001 From: wtt <1136220284@qq.com> Date: Wed, 25 Sep 2024 11:31:58 +0800 Subject: [PATCH 1/3] refactor: update the package path of the startup class --- .../java/org/apache/ozhera/app/AppBootstrap.java | 4 ++-- .../ozhera/app/aop/OperateAppBaseInfoAspect.java | 2 +- .../exception/AppExceptionControllerAdvice.java | 2 +- .../src/main/resources/application.properties | 2 +- .../client/bootstrap/HeraDemoClientBootstrap.java | 4 ++-- .../client/service/DubboHealthServiceImpl.java | 2 +- .../demo/server/HeraDemoServerBootstrap.java | 3 +-- .../bootstrap/IntelligenceBootStrap.java | 2 +- .../ozhera/log/server/LogAgentServerBootstrap.java | 6 +++--- .../log/agent/bootstrap/MiLogAgentBootstrap.java | 2 +- .../log/agent/channel/AbstractChannelService.java | 9 ++++++--- .../manager/bootstrap/MiLogManagerBootstrap.java | 6 +++--- .../log/stream/bootstrap/MiLogStreamBootstrap.java | 2 +- .../monitor/bootstrap/MiMonitorBootstrap.java | 6 +++--- .../org/apache/ozhera/operator/HeraBootstrap.java | 2 +- .../agent/bootstrap/PrometheusAgentBootstrap.java | 4 ++-- .../java/org/apache/ozhera/webhook/Bootstrap.java | 2 +- pom.xml | 14 ++++++++------ .../etl/es/bootstrap/TraceEtlEsBootstrap.java | 6 +++--- .../bootstrap/TraceEtlManagerBootstrap.java | 6 +++--- .../nginx/bootstrap/TraceEtlNginxBootstrap.java | 2 +- .../trace/etl/bootstrap/TraceEtlBootstrap.java | 6 +++--- 22 files changed, 49 insertions(+), 45 deletions(-) diff --git a/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/AppBootstrap.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/AppBootstrap.java index 9283775cd..4faae7c41 100644 --- a/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/AppBootstrap.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/AppBootstrap.java @@ -33,8 +33,8 @@ */ @Slf4j @SpringBootApplication -@DubboComponentScan(basePackages = "com.xiaomi.mone.app") -@MapperScan("com.xiaomi.mone.app.dao") +@DubboComponentScan(basePackages = "org.apache.ozhera.app") +@MapperScan("org.apache.ozhera.app.dao") @EnableScheduling public class AppBootstrap { diff --git a/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/aop/OperateAppBaseInfoAspect.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/aop/OperateAppBaseInfoAspect.java index 14a8d6d62..b18af650e 100644 --- a/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/aop/OperateAppBaseInfoAspect.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/aop/OperateAppBaseInfoAspect.java @@ -47,7 +47,7 @@ @Slf4j public class OperateAppBaseInfoAspect { - private final String appGetResultDataPoint = "execution(* com.xiaomi.mone.app.service.impl.HeraAppBaseInfoServiceImpl.appBaseInfoOperate(..))"; + private final String appGetResultDataPoint = "execution(* org.apache.ozhera.app.service.impl.HeraAppBaseInfoServiceImpl.appBaseInfoOperate(..))"; @Value("${rocket.mq.hera.app.topic}") private String topic; diff --git a/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/exception/AppExceptionControllerAdvice.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/exception/AppExceptionControllerAdvice.java index c310ec116..fad58550c 100644 --- a/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/exception/AppExceptionControllerAdvice.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/exception/AppExceptionControllerAdvice.java @@ -33,7 +33,7 @@ * @date 2022/10/29 13:27 */ @Slf4j -@RestControllerAdvice(basePackages = "com.xiaomi.mone.app.controller") +@RestControllerAdvice(basePackages = "org.apache.ozhera.app.controller") public class AppExceptionControllerAdvice { @ExceptionHandler(value = MethodArgumentNotValidException.class) diff --git a/ozhera-app/app-server/src/main/resources/application.properties b/ozhera-app/app-server/src/main/resources/application.properties index 1bbca60f8..49170b7d6 100644 --- a/ozhera-app/app-server/src/main/resources/application.properties +++ b/ozhera-app/app-server/src/main/resources/application.properties @@ -10,7 +10,7 @@ spring.datasource.default.maxPoolSize=20 spring.datasource.default.minialPoolSize=10 mybatis-plus.mapper-locations=classpath:mapper/*.xml -mybatis-plus.type-aliases-package=com.xiaomi.mone.app.model +mybatis-plus.type-aliases-package=org.apache.ozhera.app.model mybatis-plus.configuration.map-underscore-to-camel-case=true mybatis-plus.global-config.db-config.id-type=auto #mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/bootstrap/HeraDemoClientBootstrap.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/bootstrap/HeraDemoClientBootstrap.java index 704202fe0..0b595f137 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/bootstrap/HeraDemoClientBootstrap.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/bootstrap/HeraDemoClientBootstrap.java @@ -26,8 +26,8 @@ * @author dingtao */ @EnableAutoConfiguration(exclude= {DataSourceAutoConfiguration.class}) -@ComponentScan(basePackages = {"com.xiaomi.mone.hera.demo.client"}) -@DubboComponentScan(basePackages = "com.xiaomi.mone.hera.demo.client") +@ComponentScan(basePackages = {"org.apache.ozhera.demo.client"}) +@DubboComponentScan(basePackages = "org.apache.ozhera.demo.client") @Slf4j public class HeraDemoClientBootstrap { diff --git a/ozhera-demo-client/ozhera-demo-client-service/src/main/java/org/apache/ozhera/demo/client/service/DubboHealthServiceImpl.java b/ozhera-demo-client/ozhera-demo-client-service/src/main/java/org/apache/ozhera/demo/client/service/DubboHealthServiceImpl.java index 760827579..a806fb62b 100644 --- a/ozhera-demo-client/ozhera-demo-client-service/src/main/java/org/apache/ozhera/demo/client/service/DubboHealthServiceImpl.java +++ b/ozhera-demo-client/ozhera-demo-client-service/src/main/java/org/apache/ozhera/demo/client/service/DubboHealthServiceImpl.java @@ -27,7 +27,7 @@ public class DubboHealthServiceImpl implements DubboHealthService { @Reference(group = "${dubbo.group}",version = "1.0",timeout = 3000,retries = 0,check = false) - private com.xiaomi.mone.hera.demo.server.service.DubboHealthService dubboHealthService; + private org.apache.ozhera.demo.server.service.DubboHealthService dubboHealthService; @Override public int remoteHealth(int size) { diff --git a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/HeraDemoServerBootstrap.java b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/HeraDemoServerBootstrap.java index a653b1e80..472158724 100644 --- a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/HeraDemoServerBootstrap.java +++ b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/HeraDemoServerBootstrap.java @@ -26,8 +26,7 @@ */ @Slf4j @SpringBootApplication -@ComponentScan(basePackages = {"com.xiaomi.mone.hera.demo.server"}) -@DubboComponentScan(basePackages = {"com.xiaomi.mone.hera.demo.server"}) +@DubboComponentScan(basePackages = {"org.apache.ozhera.demo.server"}) public class HeraDemoServerBootstrap { public static void main(String... args) { try { diff --git a/ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/bootstrap/IntelligenceBootStrap.java b/ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/bootstrap/IntelligenceBootStrap.java index c14f7b0f5..d44a0ca47 100644 --- a/ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/bootstrap/IntelligenceBootStrap.java +++ b/ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/bootstrap/IntelligenceBootStrap.java @@ -21,7 +21,7 @@ import org.springframework.context.annotation.ComponentScan; @EnableAutoConfiguration -@ComponentScan(basePackages = {"run.mone.hera.intelligence"}) +@ComponentScan(basePackages = {"org.apache.ozhera.intelligence"}) @Slf4j public class IntelligenceBootStrap { public static void main(String... args) { diff --git a/ozhera-log/log-agent-server/src/main/java/org/apache/ozhera/log/server/LogAgentServerBootstrap.java b/ozhera-log/log-agent-server/src/main/java/org/apache/ozhera/log/server/LogAgentServerBootstrap.java index b6bd1d5ab..4e1fc2041 100644 --- a/ozhera-log/log-agent-server/src/main/java/org/apache/ozhera/log/server/LogAgentServerBootstrap.java +++ b/ozhera-log/log-agent-server/src/main/java/org/apache/ozhera/log/server/LogAgentServerBootstrap.java @@ -19,13 +19,13 @@ import com.xiaomi.data.push.rpc.RpcCmd; import com.xiaomi.data.push.rpc.RpcServer; import com.xiaomi.data.push.rpc.common.Pair; +import com.xiaomi.youpin.docean.Ioc; +import lombok.extern.slf4j.Slf4j; import org.apache.ozhera.log.common.Config; import org.apache.ozhera.log.common.Constant; import org.apache.ozhera.log.server.porcessor.AgentCollectProgressProcessor; import org.apache.ozhera.log.server.porcessor.AgentConfigProcessor; import org.apache.ozhera.log.server.porcessor.PingProcessor; -import com.xiaomi.youpin.docean.Ioc; -import lombok.extern.slf4j.Slf4j; import java.io.IOException; @@ -56,7 +56,7 @@ public static void main(String[] args) throws IOException { rpcServer.start(); Ioc.ins().putBean(rpcServer); - Ioc.ins().init("com.xiaomi.mone", "com.xiaomi.youpin"); + Ioc.ins().init("com.xiaomi.mone", "com.xiaomi.youpin", "org.apache.ozhera.log.server"); log.info("log server start finish"); } } diff --git a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/bootstrap/MiLogAgentBootstrap.java b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/bootstrap/MiLogAgentBootstrap.java index 79c62e895..fc5d759f7 100644 --- a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/bootstrap/MiLogAgentBootstrap.java +++ b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/bootstrap/MiLogAgentBootstrap.java @@ -60,7 +60,7 @@ public static void main(String[] args) throws IOException { client.waitStarted(); log.info("create rpc client finish"); Aop.ins().init(Maps.newLinkedHashMap()); - Ioc.ins().putBean(client).init("com.xiaomi.mone.log.agent", "com.xiaomi.youpin.docean"); + Ioc.ins().putBean(client).init("org.apache.ozhera.log.agent", "com.xiaomi.youpin.docean"); //Because the client life cycle is advanced, the processor needs to be re-registered here client.registerProcessor(); System.in.read(); diff --git a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/AbstractChannelService.java b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/AbstractChannelService.java index 5af65e77e..817fb456f 100644 --- a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/AbstractChannelService.java +++ b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/AbstractChannelService.java @@ -15,8 +15,10 @@ */ package org.apache.ozhera.log.agent.channel; +import cn.hutool.core.io.FileUtil; import com.xiaomi.mone.file.ReadResult; import com.xiaomi.mone.file.common.FileInfoCache; +import lombok.extern.slf4j.Slf4j; import org.apache.ozhera.log.agent.channel.memory.ChannelMemory; import org.apache.ozhera.log.agent.common.ChannelUtil; import org.apache.ozhera.log.agent.input.Input; @@ -24,7 +26,6 @@ import org.apache.ozhera.log.api.model.meta.LogPattern; import org.apache.ozhera.log.api.model.msg.LineMessage; import org.apache.ozhera.log.utils.NetUtil; -import lombok.extern.slf4j.Slf4j; import java.util.HashMap; import java.util.List; @@ -152,7 +153,7 @@ private Map buildFileProgressMap(List directory, String matchExpress) { // Add a shutdown hook to gracefully shutdown FileInfoCache Runtime.getRuntime().addShutdownHook(new Thread(() -> { - log.info("wildcardGraceShutdown Shutdown,directory:{},express:{}", GSON.toJson(directory), matchExpress); + log.info("wildcardGraceShutdown Shutdown,directory:{},express:{},cacheSize:{}", GSON.toJson(directory), matchExpress, FileInfoCache.ins().caches().size()); FileInfoCache.ins().shutdown(); })); } @@ -192,7 +193,9 @@ protected void updateChannelMemory(ChannelMemory channelMemory, String fileName, if (null != readResult.get().getFileMaxPointer()) { fileProgress.setFileMaxPointer(readResult.get().getFileMaxPointer()); } - fileProgress.setUnixFileNode(ChannelUtil.buildUnixFileNode(fileName)); + if (FileUtil.exist(fileName)) { + fileProgress.setUnixFileNode(ChannelUtil.buildUnixFileNode(fileName)); + } fileProgress.setPodType(channelDefine.getPodType()); fileProgress.setCtTime(ct); } diff --git a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/bootstrap/MiLogManagerBootstrap.java b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/bootstrap/MiLogManagerBootstrap.java index 8ee2c6204..5efdde94e 100644 --- a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/bootstrap/MiLogManagerBootstrap.java +++ b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/bootstrap/MiLogManagerBootstrap.java @@ -15,8 +15,6 @@ */ package org.apache.ozhera.log.manager.bootstrap; -import org.apache.ozhera.log.common.Config; -import org.apache.ozhera.log.manager.controller.interceptor.HttpRequestInterceptor; import com.xiaomi.youpin.docean.Aop; import com.xiaomi.youpin.docean.Ioc; import com.xiaomi.youpin.docean.anno.RequestMapping; @@ -25,6 +23,8 @@ import com.xiaomi.youpin.docean.config.HttpServerConfig; import com.xiaomi.youpin.docean.mvc.DoceanHttpServer; import lombok.extern.slf4j.Slf4j; +import org.apache.ozhera.log.common.Config; +import org.apache.ozhera.log.manager.controller.interceptor.HttpRequestInterceptor; import java.util.LinkedHashMap; @@ -45,7 +45,7 @@ public static void main(String[] args) throws InterruptedException { Aop.ins().init(m); Ioc.ins().putBean(Cons.AUTO_FIND_IMPL, "true") - .init("com.xiaomi.mone", "com.xiaomi.youpin"); + .init("com.xiaomi.mone", "com.xiaomi.youpin", "org.apache.ozhera.log.manager"); Config ins = Config.ins(); int port = Integer.parseInt(ins.get("serverPort", "")); diff --git a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/bootstrap/MiLogStreamBootstrap.java b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/bootstrap/MiLogStreamBootstrap.java index 95642defe..8f7790f19 100644 --- a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/bootstrap/MiLogStreamBootstrap.java +++ b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/bootstrap/MiLogStreamBootstrap.java @@ -49,7 +49,7 @@ public static void main(String[] args) { private static void initializeApplication() { OkHttpClient okHttpClient = getOkHttpClient(); Ioc.ins().putBean(okHttpClient) - .init("com.xiaomi.mone.log.stream", "com.xiaomi.youpin.docean"); + .init("org.apache.ozhera.log.stream", "com.xiaomi.youpin.docean"); } private static void startHealthCheckTask() { diff --git a/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/bootstrap/MiMonitorBootstrap.java b/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/bootstrap/MiMonitorBootstrap.java index e84bb9782..84dbb9e0c 100644 --- a/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/bootstrap/MiMonitorBootstrap.java +++ b/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/bootstrap/MiMonitorBootstrap.java @@ -25,9 +25,9 @@ @Slf4j @EnableAutoConfiguration -@ComponentScan(basePackages = {"com.xiaomi.mone.monitor"}) -@DubboComponentScan(basePackages = "com.xiaomi.mone.monitor") -@ServletComponentScan("com.xiaomi.mone.monitor.filter") +@ComponentScan(basePackages = {"org.apache.ozhera.monitor"}) +@DubboComponentScan(basePackages = "org.apache.ozhera.monitor") +@ServletComponentScan("org.apache.ozhera.monitor.filter") public class MiMonitorBootstrap { public static void main(String[] args) throws InterruptedException { diff --git a/ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/HeraBootstrap.java b/ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/HeraBootstrap.java index 6b70406c1..0318e6375 100644 --- a/ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/HeraBootstrap.java +++ b/ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/HeraBootstrap.java @@ -27,7 +27,7 @@ public class HeraBootstrap { public static void main(String[] args) throws InterruptedException { - Ioc.ins().init("run.mone.docean.plugin","com.xiaomi.youpin.docean.plugin","run.mone.hera.operator"); + Ioc.ins().init("run.mone.docean.plugin","com.xiaomi.youpin.docean.plugin","org.apache.ozhera.operator"); //Mvc.ins(); Mvc.ins().getMvcConfig().setResponseOriginalValue(true); diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java index 552fceec9..ce074fa39 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java @@ -27,8 +27,8 @@ * @author dingtao */ @EnableAutoConfiguration -@ComponentScan(basePackages = {"com.xiaomi.youpin.prometheus.agent", "com.xiaomi.youpin"}) -@DubboComponentScan(basePackages = "com.xiaomi.youpin.prometheus.agent") +@ComponentScan(basePackages = {"org.apache.ozhera.prometheus.agent", "com.xiaomi.youpin"}) +@DubboComponentScan(basePackages = "org.apache.ozhera.prometheus.agent") @Slf4j public class PrometheusAgentBootstrap { private static final Logger logger = LoggerFactory.getLogger(PrometheusAgentBootstrap.class); diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/Bootstrap.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/Bootstrap.java index 6d91f1120..8b8d6e327 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/Bootstrap.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/Bootstrap.java @@ -37,7 +37,7 @@ * @author dingtao */ @EnableAutoConfiguration -@ComponentScan(basePackages = {"run.mone.hera.webhook"}) +@ComponentScan(basePackages = {"org.apache.ozhera.webhook"}) @Slf4j public class Bootstrap { diff --git a/pom.xml b/pom.xml index 60e84027e..9d9dc0200 100644 --- a/pom.xml +++ b/pom.xml @@ -1058,14 +1058,16 @@ - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + central + maven-release-virtual + https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual + + snapshots + snapshots + https://pkgs.d.xiaomi.net/artifactory/snapshots + \ No newline at end of file diff --git a/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java index 321807f04..b133799fd 100644 --- a/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java @@ -26,9 +26,9 @@ * @author dingtao */ @EnableAutoConfiguration -@ComponentScan(basePackages = {"com.xiaomi.hera.trace.etl", "com.xiaomi.data.push.redis", "run.mone.trace.etl"}) -@DubboComponentScan(basePackages = "com.xiaomi.hera.trace.etl.es.dubbo") -@MapperScan("com.xiaomi.hera.trace.etl.mapper") +@ComponentScan(basePackages = {"org.apache.ozhera.trace.etl.es", "com.xiaomi.data.push.redis", "run.mone.trace.etl"}) +@DubboComponentScan(basePackages = "org.apache.ozhera.trace.etl.es.dubbo") +@MapperScan("org.apache.ozhera.trace.etl.mapper") @Slf4j public class TraceEtlEsBootstrap { diff --git a/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java index c63fbd1bc..1e4a16333 100644 --- a/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java @@ -25,9 +25,9 @@ * @author dingtao */ @EnableAutoConfiguration -@ComponentScan(basePackages = {"com.xiaomi.hera.trace.etl", "run.mone.trace.etl"}) -@DubboComponentScan(basePackages = "com.xiaomi.hera.trace.etl") -@MapperScan("com.xiaomi.hera.trace.etl.mapper") +@ComponentScan(basePackages = {"org.apache.ozhera.trace.etl", "run.mone.trace.etl"}) +@DubboComponentScan(basePackages = "org.apache.ozhera.trace.etl") +@MapperScan("org.apache.ozhera.trace.etl.mapper") public class TraceEtlManagerBootstrap { public static void main(String... args) { diff --git a/trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java b/trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java index 5e65a1577..325a05220 100644 --- a/trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java +++ b/trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java @@ -26,7 +26,7 @@ * @author dingtao */ @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) -@ComponentScan(basePackages = {"com.xiaomi.hera.trace.etl.nginx"}) +@ComponentScan(basePackages = {"org.apache.ozhera.trace.etl.nginx"}) @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class}) @Slf4j public class TraceEtlNginxBootstrap { diff --git a/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/bootstrap/TraceEtlBootstrap.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/bootstrap/TraceEtlBootstrap.java index d7035d34d..443fd7f5e 100644 --- a/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/bootstrap/TraceEtlBootstrap.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/bootstrap/TraceEtlBootstrap.java @@ -26,9 +26,9 @@ * @author dingtao */ @EnableAutoConfiguration -@ComponentScan(basePackages = {"com.xiaomi.hera.trace.etl", "com.xiaomi.data.push.redis", "run.mone.trace.etl"}) -@DubboComponentScan(basePackages = "com.xiaomi.hera.trace.etl.dubbo") -@MapperScan("com.xiaomi.hera.trace.etl.mapper") +@ComponentScan(basePackages = {"org.apache.ozhera.trace.etl", "com.xiaomi.data.push.redis", "run.mone.trace.etl"}) +@DubboComponentScan(basePackages = "org.apache.ozhera.trace.etl.dubbo") +@MapperScan("org.apache.ozhera.trace.etl.mapper") @Slf4j public class TraceEtlBootstrap { From 2511e85d644464028cc6f97545fbd4ac176dbbe7 Mon Sep 17 00:00:00 2001 From: wtt <1136220284@qq.com> Date: Wed, 25 Sep 2024 19:00:55 +0800 Subject: [PATCH 2/3] refactor: update maven version --- .../ozhera-demo-client-service/pom.xml | 2 +- ozhera-intelligence/pom.xml | 38 +++++++++---------- pom.xml | 14 +++---- .../prometheus-diy-starter/pom.xml | 2 +- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/ozhera-demo-client/ozhera-demo-client-service/pom.xml b/ozhera-demo-client/ozhera-demo-client-service/pom.xml index f47036fa9..c0356072d 100644 --- a/ozhera-demo-client/ozhera-demo-client-service/pom.xml +++ b/ozhera-demo-client/ozhera-demo-client-service/pom.xml @@ -71,7 +71,7 @@ - run.mone + org.apache.ozhera ozhera-demo-server-api diff --git a/ozhera-intelligence/pom.xml b/ozhera-intelligence/pom.xml index 460802b2f..47015f393 100644 --- a/ozhera-intelligence/pom.xml +++ b/ozhera-intelligence/pom.xml @@ -24,7 +24,7 @@ 21 5.3.29 1.0.1-jdk21 - 1.0.0 + 2.0.0 UTF-8 ~ @@ -130,24 +130,24 @@ - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - deploy - - sign - - - gpg - your-gpg-key - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9d9dc0200..60e84027e 100644 --- a/pom.xml +++ b/pom.xml @@ -1058,16 +1058,14 @@ - - central - maven-release-virtual - https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual - - snapshots - snapshots - https://pkgs.d.xiaomi.net/artifactory/snapshots + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + \ No newline at end of file diff --git a/prometheus-starter-all/prometheus-diy-starter/pom.xml b/prometheus-starter-all/prometheus-diy-starter/pom.xml index afa2d5f8d..df9d72feb 100644 --- a/prometheus-starter-all/prometheus-diy-starter/pom.xml +++ b/prometheus-starter-all/prometheus-diy-starter/pom.xml @@ -17,7 +17,7 @@ org.apache.ozhera prometheus-diy-client - 0.0.1-opensource-jdk21 + ${prometheus-all.version} From f5f4bf3191b68445023249eb51ec2d65a6140e8a Mon Sep 17 00:00:00 2001 From: wtt <1136220284@qq.com> Date: Wed, 25 Sep 2024 19:06:15 +0800 Subject: [PATCH 3/3] refactor: upgrade version --- ozhera-intelligence/pom.xml | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ozhera-intelligence/pom.xml b/ozhera-intelligence/pom.xml index 47015f393..cbd2bb344 100644 --- a/ozhera-intelligence/pom.xml +++ b/ozhera-intelligence/pom.xml @@ -24,7 +24,7 @@ 21 5.3.29 1.0.1-jdk21 - 2.0.0 + 2.0.0-SNAPSHOT UTF-8 ~ @@ -130,24 +130,24 @@ - - - - - - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + deploy + + sign + + + gpg + your-gpg-key + + + + \ No newline at end of file