Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: update trace-etl module change run.mone to org.apache #457 #481

Merged
merged 1 commit into from
Sep 24, 2024
Merged

refactor: update trace-etl module change run.mone to org.apache #457 #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...lient/api/service/DubboHealthService.java → ...lient/api/service/DubboHealthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.api.service;
package org.apache.ozhera.demo.client.api.service;


import run.mone.common.Result;
Expand Down
2 changes: 1 addition & 1 deletion ozhera-demo-client/ozhera-demo-client-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<version>2.7.15</version>

<configuration>
<mainClass>com.xiaomi.mone.hera.demo.client.bootstrap.HeraDemoClientBootstrap</mainClass>
<mainClass>org.apache.ozhera.demo.client.bootstrap.HeraDemoClientBootstrap</mainClass>
</configuration>
<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion ...nt/bootstrap/HeraDemoClientBootstrap.java → ...nt/bootstrap/HeraDemoClientBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.bootstrap;
package org.apache.ozhera.demo.client.bootstrap;

import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan;
Expand Down
2 changes: 1 addition & 1 deletion ...emo/client/config/DubboConfiguration.java → ...emo/client/config/DubboConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.config;
package org.apache.ozhera.demo.client.config;

import com.google.common.collect.Maps;
import org.apache.dubbo.config.ApplicationConfig;
Expand Down
2 changes: 1 addition & 1 deletion ...emo/client/config/NacosConfiguration.java → ...emo/client/config/NacosConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.config;
package org.apache.ozhera.demo.client.config;

import com.alibaba.nacos.api.annotation.NacosProperties;
import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig;
Expand Down
2 changes: 1 addition & 1 deletion ...lient/config/PrometheusConfiguration.java → ...lient/config/PrometheusConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.config;
package org.apache.ozhera.demo.client.config;

import org.apache.ozhera.prometheus.starter.all.config.PrometheusConfigure;
import org.springframework.beans.factory.annotation.Value;
Expand Down
2 changes: 1 addition & 1 deletion .../hera/demo/client/config/RedisConfig.java → ...zhera/demo/client/config/RedisConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.config;
package org.apache.ozhera.demo.client.config;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
Expand Down
8 changes: 4 additions & 4 deletions ...emo/client/controller/TestController.java → ...emo/client/controller/TestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.controller;
package org.apache.ozhera.demo.client.controller;

import com.xiaomi.hera.trace.annotation.Trace;
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 org.apache.ozhera.demo.client.api.service.DubboHealthService;
import org.apache.ozhera.demo.client.grpc.GrpcClientService;
import org.apache.ozhera.demo.client.util.HttpClientUtil;
import org.apache.ozhera.prometheus.all.client.Metrics;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.client.methods.CloseableHttpResponse;
Expand Down
2 changes: 1 addition & 1 deletion ...a/demo/client/grpc/GrpcClientService.java → ...a/demo/client/grpc/GrpcClientService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.grpc;
package org.apache.ozhera.demo.client.grpc;


import net.devh.boot.grpc.client.inject.GrpcClient;
Expand Down
2 changes: 1 addition & 1 deletion ...hera/demo/client/util/HttpClientUtil.java → ...hera/demo/client/util/HttpClientUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.util;
package org.apache.ozhera.demo.client.util;

import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig;
Expand Down
4 changes: 2 additions & 2 deletions ...lient/service/DubboHealthServiceImpl.java → ...lient/service/DubboHealthServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.client.service;
package org.apache.ozhera.demo.client.service;

import com.xiaomi.hera.trace.annotation.Trace;
import com.xiaomi.mone.hera.demo.client.api.service.DubboHealthService;
import org.apache.ozhera.demo.client.api.service.DubboHealthService;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.annotation.Service;
Expand Down
2 changes: 1 addition & 1 deletion ...mo/server/service/DubboHealthService.java → ...mo/server/service/DubboHealthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.server.service;
package org.apache.ozhera.demo.server.service;


import run.mone.common.Result;
Expand Down
2 changes: 1 addition & 1 deletion .../demo/server/HeraDemoServerBootstrap.java → .../demo/server/HeraDemoServerBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.server;
package org.apache.ozhera.demo.server;

import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan;
Expand Down
2 changes: 1 addition & 1 deletion ...emo/server/config/DubboConfiguration.java → ...emo/server/config/DubboConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.server.config;
package org.apache.ozhera.demo.server.config;

import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
Expand Down
2 changes: 1 addition & 1 deletion ...emo/server/config/NacosConfiguration.java → ...emo/server/config/NacosConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.server.config;
package org.apache.ozhera.demo.server.config;

import com.alibaba.nacos.api.annotation.NacosProperties;
import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig;
Expand Down
0 .../hera/demo/server/grpc/MyServiceImpl.java → ...zhera/demo/server/grpc/MyServiceImpl.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...erver/service/DubboHealthServiceImpl.java → ...erver/service/DubboHealthServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.mone.hera.demo.server.service;
package org.apache.ozhera.demo.server.service;

import org.apache.dubbo.config.annotation.Service;
import org.slf4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ozhera-intelligence/ozhera-intelligence-domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-intelligence</artifactId>
<version>1.0.0</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>ozhera-intelligence-domain</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ozhera-intelligence/ozhera-intelligence-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-intelligence</artifactId>
<version>1.0.0</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>ozhera-intelligence-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ozhera-intelligence/ozhera-intelligence-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-intelligence</artifactId>
<version>1.0.0</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>ozhera-intelligence-service</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ozhera-intelligence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>

<artifactId>ozhera-intelligence</artifactId>
<version>1.0.0</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
9 changes: 4 additions & 5 deletions trace-etl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<parent>
<groupId>run.mone</groupId>
<artifactId>ozhera</artifactId>
<version>1.4.0-jdk21-SNAPSHOT</version>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>run.mone</groupId>
<artifactId>trace-etl</artifactId>
<version>1.0.1-jdk21</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
6 changes: 3 additions & 3 deletions trace-etl/trace-etl-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

<parent>
<artifactId>trace-etl</artifactId>
<groupId>run.mone</groupId>
<version>1.0.1-jdk21</version>
<groupId>org.apache.ozhera</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@

<dependencies>
<dependency>
<groupId>run.mone</groupId>
<groupId>org.apache.ozhera</groupId>
<artifactId>trace-etl-domain</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
18 changes: 9 additions & 9 deletions ...ce/etl/api/service/DataSourceService.java → ...ce/etl/api/service/DataSourceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.api.service;

import com.xiaomi.hera.trace.etl.domain.DriverDomain;
import com.xiaomi.hera.trace.etl.domain.ErrorTraceMessage;
import com.xiaomi.hera.trace.etl.domain.tracequery.Trace;
import com.xiaomi.hera.trace.etl.domain.tracequery.TraceIdQueryVo;
import com.xiaomi.hera.trace.etl.domain.tracequery.TraceListQueryVo;
import com.xiaomi.hera.trace.etl.domain.tracequery.TraceOperationsVo;
import com.xiaomi.hera.trace.etl.domain.tracequery.TraceQueryResult;
package org.apache.ozhera.trace.etl.api.service;

import org.apache.ozhera.trace.etl.domain.DriverDomain;
import org.apache.ozhera.trace.etl.domain.ErrorTraceMessage;
import org.apache.ozhera.trace.etl.domain.tracequery.Trace;
import org.apache.ozhera.trace.etl.domain.tracequery.TraceIdQueryVo;
import org.apache.ozhera.trace.etl.domain.tracequery.TraceListQueryVo;
import org.apache.ozhera.trace.etl.domain.tracequery.TraceOperationsVo;
import org.apache.ozhera.trace.etl.domain.tracequery.TraceQueryResult;
import org.apache.ozhera.tspandata.TSpanData;

import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions .../etl/api/service/HeraMetaDataService.java → .../etl/api/service/HeraMetaDataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.api.service;
package org.apache.ozhera.trace.etl.api.service;


import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataModel;
import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataQuery;
import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataModel;
import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataQuery;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion .../trace/etl/api/service/IEnterManager.java → .../trace/etl/api/service/IEnterManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.api.service;
package org.apache.ozhera.trace.etl.api.service;

import java.util.concurrent.atomic.AtomicInteger;

Expand Down
2 changes: 1 addition & 1 deletion ...etl/api/service/IMetricsParseService.java → ...etl/api/service/IMetricsParseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.api.service;
package org.apache.ozhera.trace.etl.api.service;

import org.apache.ozhera.tspandata.TSpanData;

Expand Down
4 changes: 2 additions & 2 deletions ...ra/trace/etl/api/service/MQExtension.java → ...ra/trace/etl/api/service/MQExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.api.service;
package org.apache.ozhera.trace.etl.api.service;

import com.xiaomi.hera.trace.etl.bo.MqConfig;
import org.apache.ozhera.trace.etl.bo.MqConfig;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions ...race/etl/api/service/TraceEtlService.java → ...race/etl/api/service/TraceEtlService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.api.service;
package org.apache.ozhera.trace.etl.api.service;

import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig;
import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig;

public interface TraceEtlService {

Expand Down
4 changes: 2 additions & 2 deletions .../etl/api/service/TraceManagerService.java → .../etl/api/service/TraceManagerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.api.service;
package org.apache.ozhera.trace.etl.api.service;

import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig;
import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig;
import com.xiaomi.youpin.infra.rpc.Result;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...om/xiaomi/hera/trace/etl/bo/MqConfig.java → .../apache/ozhera/trace/etl/bo/MqConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.bo;
package org.apache.ozhera.trace.etl.bo;

import lombok.Data;

Expand Down
4 changes: 2 additions & 2 deletions trace-etl/trace-etl-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

<parent>
<artifactId>trace-etl</artifactId>
<groupId>run.mone</groupId>
<version>1.0.1-jdk21</version>
<groupId>org.apache.ozhera</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ...iaomi/hera/trace/etl/common/HashUtil.java → ...che/ozhera/trace/etl/common/HashUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.common;
package org.apache.ozhera.trace.etl.common;

import com.google.common.hash.HashCode;
import com.google.common.hash.Hashing;
Expand Down
2 changes: 1 addition & 1 deletion .../hera/trace/etl/common/TimeConverter.java → ...zhera/trace/etl/common/TimeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.common;
package org.apache.ozhera.trace.etl.common;

import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
Expand Down
6 changes: 3 additions & 3 deletions trace-etl/trace-etl-dao/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>trace-etl</artifactId>
<groupId>run.mone</groupId>
<version>1.0.1-jdk21</version>
<groupId>org.apache.ozhera</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>trace-etl-dao</artifactId>

<dependencies>
<dependency>
<groupId>run.mone</groupId>
<groupId>org.apache.ozhera</groupId>
<artifactId>trace-etl-domain</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions .../trace/etl/mapper/HeraMetaDataMapper.java → .../trace/etl/mapper/HeraMetaDataMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xiaomi.hera.trace.etl.mapper;
package org.apache.ozhera.trace.etl.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaData;
import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaData;
import org.apache.ibatis.annotations.Mapper;

@Mapper
Expand Down
Loading
Loading