From 0fd595bfa22e3bb6d865d5db740e3e8900e64782 Mon Sep 17 00:00:00 2001 From: psxjoy Date: Sun, 15 Sep 2024 02:13:18 +0800 Subject: [PATCH] refactor: update trace-etl module change run.mone to org.apache --- .../api/service/DubboHealthService.java | 2 +- .../ozhera-demo-client-server/pom.xml | 2 +- .../bootstrap/HeraDemoClientBootstrap.java | 2 +- .../client/config/DubboConfiguration.java | 2 +- .../client/config/NacosConfiguration.java | 2 +- .../config/PrometheusConfiguration.java | 2 +- .../demo/client/config/RedisConfig.java | 2 +- .../client/controller/TestController.java | 8 ++--- .../demo/client/grpc/GrpcClientService.java | 2 +- .../demo/client/util/HttpClientUtil.java | 2 +- .../service/DubboHealthServiceImpl.java | 4 +-- .../server/service/DubboHealthService.java | 2 +- .../demo/server/HeraDemoServerBootstrap.java | 2 +- .../server/config/DubboConfiguration.java | 2 +- .../server/config/NacosConfiguration.java | 2 +- .../demo/server/grpc/MyServiceImpl.java | 0 .../service/DubboHealthServiceImpl.java | 2 +- .../ozhera-intelligence-domain/pom.xml | 2 +- .../ozhera-intelligence-server/pom.xml | 2 +- .../ozhera-intelligence-service/pom.xml | 2 +- ozhera-intelligence/pom.xml | 2 +- trace-etl/pom.xml | 9 +++--- trace-etl/trace-etl-api/pom.xml | 6 ++-- .../etl/api/service/DataSourceService.java | 18 +++++------ .../etl/api/service/HeraMetaDataService.java | 6 ++-- .../trace/etl/api/service/IEnterManager.java | 2 +- .../etl/api/service/IMetricsParseService.java | 2 +- .../trace/etl/api/service/MQExtension.java | 4 +-- .../etl/api/service/TraceEtlService.java | 4 +-- .../etl/api/service/TraceManagerService.java | 4 +-- .../apache/ozhera}/trace/etl/bo/MqConfig.java | 2 +- trace-etl/trace-etl-common/pom.xml | 4 +-- .../ozhera}/trace/etl/common/HashUtil.java | 2 +- .../trace/etl/common/TimeConverter.java | 2 +- trace-etl/trace-etl-dao/pom.xml | 6 ++-- .../trace/etl/mapper/HeraMetaDataMapper.java | 4 +-- .../etl/mapper/HeraTraceEtlConfigMapper.java | 4 +-- trace-etl/trace-etl-domain/pom.xml | 4 +-- .../trace/etl/domain/DriverDomain.java | 2 +- .../trace/etl/domain/ErrorTraceMessage.java | 2 +- .../trace/etl/domain/HeraTraceConfigVo.java | 2 +- .../trace/etl/domain/HeraTraceEtlConfig.java | 2 +- .../trace/etl/domain/JaegerTracerDomain.java | 2 +- .../trace/etl/domain/MetricsParseResult.java | 2 +- .../trace/etl/domain/NginxJaegerDomain.java | 2 +- .../ozhera}/trace/etl/domain/PageData.java | 2 +- .../ozhera}/trace/etl/domain/PagerVo.java | 2 +- .../etl/domain/jaegeres/JaegerAttrType.java | 2 +- .../etl/domain/jaegeres/JaegerAttribute.java | 2 +- .../etl/domain/jaegeres/JaegerESDomain.java | 2 +- .../trace/etl/domain/jaegeres/JaegerLogs.java | 2 +- .../etl/domain/jaegeres/JaegerProcess.java | 2 +- .../etl/domain/jaegeres/JaegerRefType.java | 2 +- .../etl/domain/jaegeres/JaegerReferences.java | 2 +- .../etl/domain/metadata/HeraMetaData.java | 2 +- .../domain/metadata/HeraMetaDataMessage.java | 2 +- .../domain/metadata/HeraMetaDataModel.java | 2 +- .../etl/domain/metadata/HeraMetaDataPort.java | 2 +- .../metadata/HeraMetaDataPortModel.java | 2 +- .../domain/metadata/HeraMetaDataQuery.java | 2 +- .../etl/domain/metadata/HeraMetaDataType.java | 2 +- .../trace/etl/domain/tracequery/Span.java | 10 +++---- .../trace/etl/domain/tracequery/Trace.java | 4 +-- .../etl/domain/tracequery/TraceIdQueryVo.java | 2 +- .../domain/tracequery/TraceListQueryVo.java | 2 +- .../domain/tracequery/TraceOperationsVo.java | 2 +- .../domain/tracequery/TraceQueryResult.java | 2 +- trace-etl/trace-etl-es/pom.xml | 16 +++++----- .../etl/es/bootstrap/TraceEtlEsBootstrap.java | 2 +- .../trace/etl/es/config/DataSourceConfig.java | 2 +- .../etl/es/config/DubboConfiguration.java | 2 +- .../etl/es/config/NacosConfiguration.java | 2 +- .../etl/es/config/ServiceConfiguration.java | 8 ++--- .../trace/etl/es/config/TraceConfig.java | 8 ++--- .../etl/es/consumer/ConsumerService.java | 20 ++++++------- .../trace/etl/es/consumer/FilterService.java | 16 +++++----- .../es/consumer/KafkaTraceSpanConsumer.java | 10 +++---- .../consumer/RocketMQTraceSpanConsumer.java | 10 +++---- .../trace/etl/es/domain/FilterResult.java | 2 +- .../trace/etl/es/domain/FutureRequest.java | 2 +- .../trace/etl/es/domain/LocalStorages.java | 2 +- .../etl/es/dubbo/TraceEtlServiceImpl.java | 8 ++--- .../trace/etl/es/queue/DiskStoreService.java | 2 +- .../queue/impl/RocksdbStoreServiceImpl.java | 4 +-- .../trace/etl/es/queue/impl/TeSnowFlake.java | 4 +-- .../util/bloomfilter/BloomFilterHelper.java | 2 +- .../bloomfilter/TraceIdRedisBloomUtil.java | 2 +- .../trace/etl/es/util/pool/ConsumerPool.java | 2 +- .../etl/es/util/redis/RedisClientUtil.java | 2 +- trace-etl/trace-etl-extensions/pom.xml | 5 ++-- .../trace-etl-doris-extension/pom.xml | 6 ++-- .../doris/DorisDataSourceService.java | 18 +++++------ .../extension/doris/QueryDorisService.java | 26 ++++++++-------- .../extension/doris/WriteDorisService.java | 30 +++++++++---------- .../extension/doris/config/DorisConfig.java | 10 +++---- .../domain/HeraErrorSlowTraceColumn.java | 2 +- .../doris/domain/HeraTraceDriverColumn.java | 2 +- .../doris/domain/HeraTraceServiceColumn.java | 2 +- .../doris/domain/HeraTraceSpanColumn.java | 2 +- .../doris/domain/HeraTraceTable.java | 2 +- .../trace-etl-es-extension/pom.xml | 6 ++-- .../etl/extension/es/EsDataSourceService.java | 18 +++++------ .../trace/etl/extension/es/EsTraceUtil.java | 2 +- .../etl/extension/es/QueryEsService.java | 18 +++++------ .../etl/extension/es/WriteEsService.java | 24 +++++++-------- .../etl/extension/es/config/EsConfig.java | 2 +- .../extension/es/config/EsProcessConfig.java | 12 ++++---- .../trace-etl-kafka-extension/pom.xml | 8 ++--- .../extension/kafka/BeanInitConfigure.java | 2 +- .../etl/extension/kafka/KafkaConfigure.java | 4 +-- .../extension/kafka/KafkaConfigure9092.java | 4 +-- .../extension/kafka/KafkaConfigure9093.java | 4 +-- .../extension/kafka/KafkaConfigure9094.java | 4 +-- .../etl/extension/kafka/KafkaExtension.java | 6 ++-- .../trace/etl/extension/kafka/VpcType.java | 2 +- .../trace-etl-rocketmq-extension/pom.xml | 8 ++--- .../rocketmq/ClientMessageQueue.java | 4 +-- .../rocketmq/ClientMessageQueueWrapper.java | 2 +- .../extension/rocketmq/RocketMQExtension.java | 6 ++-- trace-etl/trace-etl-manager/pom.xml | 10 +++---- .../bootstrap/TraceEtlManagerBootstrap.java | 2 +- .../etl/manager/config/DataSourceConfig.java | 2 +- .../manager/config/DubboConfiguration.java | 2 +- .../manager/config/FilterConfiguration.java | 4 +-- .../manager/config/NacosConfiguration.java | 2 +- .../manager/config/ServiceConfiguration.java | 10 +++---- .../manager/controller/ManagerController.java | 10 +++---- .../manager/controller/TraceController.java | 12 ++++---- .../dubbo/TraceManagerServiceImpl.java | 10 +++---- .../manager/filter/RequestHeaderFilter.java | 2 +- trace-etl/trace-etl-metadata/pom.xml | 10 +++---- .../bootstrap/TraceEtlMetadataBootstrap.java | 2 +- .../etl/metadata/config/DataSourceConfig.java | 2 +- .../metadata/config/DubboConfiguration.java | 2 +- .../metadata/config/NacosConfiguration.java | 2 +- .../dubbo/HeraMetaDataServiceImpl.java | 14 ++++----- .../mq/KafkaHeraMetaDataConsumer.java | 22 +++++++------- .../mq/RocketMQHeraMetaDataConsumer.java | 22 +++++++------- .../trace/etl/metadata/util/Const.java | 2 +- trace-etl/trace-etl-nginx/pom.xml | 8 ++--- .../bootstrap/TraceEtlNginxBootstrap.java | 2 +- .../etl/nginx/parser/NginxLogToTraceBase.java | 8 ++--- trace-etl/trace-etl-server/pom.xml | 14 ++++----- .../etl/bootstrap/TraceEtlBootstrap.java | 2 +- .../trace/etl/config/DataSourceConfig.java | 2 +- .../trace/etl/config/DubboConfiguration.java | 2 +- .../trace/etl/config/NacosConfiguration.java | 2 +- .../etl/config/ServiceConfiguration.java | 8 ++--- .../ozhera}/trace/etl/config/TraceConfig.java | 8 ++--- .../trace/etl/constant/LocalStorages.java | 2 +- .../ozhera}/trace/etl/constant/LockUtil.java | 2 +- .../trace/etl/constant/MetricsName.java | 2 +- .../ozhera}/trace/etl/constant/SpanKind.java | 2 +- .../ozhera}/trace/etl/constant/SpanType.java | 2 +- .../trace/etl/consumer/DataCacheService.java | 2 +- .../trace/etl/consumer/EnterManager.java | 4 +-- .../etl/consumer/KafkaConsumerService.java | 12 ++++---- .../etl/consumer/MetricsParseService.java | 26 ++++++++-------- .../trace/etl/consumer/MutiMetricsCall.java | 2 +- .../etl/consumer/RocketMQConsumerService.java | 12 ++++---- .../trace/etl/dubbo/TraceEtlServiceImpl.java | 8 ++--- .../trace/etl/util/nacos/NacosClientUtil.java | 2 +- .../trace/etl/util/prometheus/HTTPServer.java | 6 ++-- trace-etl/trace-etl-service/pom.xml | 12 ++++---- .../trace/etl/service/HeraContextService.java | 2 +- .../trace/etl/service/ManagerService.java | 8 ++--- .../trace/etl/service/RedisService.java | 2 +- .../service/impl/HeraContextServiceImpl.java | 4 +-- .../etl/service/impl/ManagerServiceImpl.java | 16 +++++----- .../etl/service/impl/RedisServiceImpl.java | 4 +-- .../ozhera}/trace/etl/util/ExecutorUtil.java | 2 +- .../ozhera}/trace/etl/util/MessageUtil.java | 2 +- .../ozhera}/trace/etl/util/ThriftUtil.java | 2 +- .../ozhera}/trace/etl/util/TraceUtil.java | 2 +- .../etl/util/convert/HeraMetaDataConvert.java | 8 ++--- .../convert/HeraMetaDataPortModelConvert.java | 6 ++-- .../trace/etl/util/pool/AsyncNotify.java | 2 +- 177 files changed, 462 insertions(+), 462 deletions(-) rename ozhera-demo-client/ozhera-demo-client-api/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/api/service/DubboHealthService.java (93%) rename ozhera-demo-client/ozhera-demo-client-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/bootstrap/HeraDemoClientBootstrap.java (96%) rename ozhera-demo-client/ozhera-demo-client-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/config/DubboConfiguration.java (97%) rename ozhera-demo-client/ozhera-demo-client-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/config/NacosConfiguration.java (95%) rename ozhera-demo-client/ozhera-demo-client-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/config/PrometheusConfiguration.java (96%) rename ozhera-demo-client/ozhera-demo-client-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/config/RedisConfig.java (97%) rename ozhera-demo-client/ozhera-demo-client-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/controller/TestController.java (95%) rename ozhera-demo-client/ozhera-demo-client-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/grpc/GrpcClientService.java (97%) rename ozhera-demo-client/ozhera-demo-client-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/util/HttpClientUtil.java (98%) rename ozhera-demo-client/ozhera-demo-client-service/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/client/service/DubboHealthServiceImpl.java (93%) rename ozhera-demo-server/ozhera-demo-server-api/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/server/service/DubboHealthService.java (94%) rename ozhera-demo-server/ozhera-demo-server-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/server/HeraDemoServerBootstrap.java (97%) rename ozhera-demo-server/ozhera-demo-server-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/server/config/DubboConfiguration.java (98%) rename ozhera-demo-server/ozhera-demo-server-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/server/config/NacosConfiguration.java (95%) rename ozhera-demo-server/ozhera-demo-server-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/server/grpc/MyServiceImpl.java (100%) rename ozhera-demo-server/ozhera-demo-server-server/src/main/java/{com/xiaomi/mone/hera => org/apache/ozhera}/demo/server/service/DubboHealthServiceImpl.java (96%) rename trace-etl/trace-etl-api/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/api/service/DataSourceService.java (70%) rename trace-etl/trace-etl-api/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/api/service/HeraMetaDataService.java (82%) rename trace-etl/trace-etl-api/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/api/service/IEnterManager.java (94%) rename trace-etl/trace-etl-api/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/api/service/IMetricsParseService.java (94%) rename trace-etl/trace-etl-api/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/api/service/MQExtension.java (92%) rename trace-etl/trace-etl-api/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/api/service/TraceEtlService.java (87%) rename trace-etl/trace-etl-api/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/api/service/TraceManagerService.java (88%) rename trace-etl/trace-etl-api/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/bo/MqConfig.java (96%) rename trace-etl/trace-etl-common/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/common/HashUtil.java (96%) rename trace-etl/trace-etl-common/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/common/TimeConverter.java (99%) rename trace-etl/trace-etl-dao/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/mapper/HeraMetaDataMapper.java (87%) rename trace-etl/trace-etl-dao/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/mapper/HeraTraceEtlConfigMapper.java (94%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/DriverDomain.java (97%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/ErrorTraceMessage.java (99%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/HeraTraceConfigVo.java (97%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/HeraTraceEtlConfig.java (99%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/JaegerTracerDomain.java (99%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/MetricsParseResult.java (98%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/NginxJaegerDomain.java (98%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/PageData.java (96%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/PagerVo.java (95%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/jaegeres/JaegerAttrType.java (94%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/jaegeres/JaegerAttribute.java (95%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/jaegeres/JaegerESDomain.java (98%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/jaegeres/JaegerLogs.java (95%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/jaegeres/JaegerProcess.java (95%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/jaegeres/JaegerRefType.java (93%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/jaegeres/JaegerReferences.java (95%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/metadata/HeraMetaData.java (97%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/metadata/HeraMetaDataMessage.java (95%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/metadata/HeraMetaDataModel.java (97%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/metadata/HeraMetaDataPort.java (94%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/metadata/HeraMetaDataPortModel.java (95%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/metadata/HeraMetaDataQuery.java (95%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/metadata/HeraMetaDataType.java (94%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/tracequery/Span.java (91%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/tracequery/Trace.java (93%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/tracequery/TraceIdQueryVo.java (96%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/tracequery/TraceListQueryVo.java (98%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/tracequery/TraceOperationsVo.java (96%) rename trace-etl/trace-etl-domain/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/domain/tracequery/TraceQueryResult.java (96%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java (96%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/config/DataSourceConfig.java (98%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/config/DubboConfiguration.java (98%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/config/NacosConfiguration.java (95%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/config/ServiceConfiguration.java (82%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/config/TraceConfig.java (93%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/consumer/ConsumerService.java (96%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/consumer/FilterService.java (91%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/consumer/KafkaTraceSpanConsumer.java (92%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java (92%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/domain/FilterResult.java (97%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/domain/FutureRequest.java (98%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/domain/LocalStorages.java (96%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/dubbo/TraceEtlServiceImpl.java (85%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/queue/DiskStoreService.java (94%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/queue/impl/RocksdbStoreServiceImpl.java (98%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/queue/impl/TeSnowFlake.java (97%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/util/bloomfilter/BloomFilterHelper.java (97%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/util/bloomfilter/TraceIdRedisBloomUtil.java (98%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/util/pool/ConsumerPool.java (96%) rename trace-etl/trace-etl-es/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/es/util/redis/RedisClientUtil.java (98%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/DorisDataSourceService.java (78%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/QueryDorisService.java (93%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/WriteDorisService.java (92%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/config/DorisConfig.java (84%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/domain/HeraErrorSlowTraceColumn.java (95%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/domain/HeraTraceDriverColumn.java (94%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/domain/HeraTraceServiceColumn.java (93%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/domain/HeraTraceSpanColumn.java (95%) rename trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/doris/domain/HeraTraceTable.java (94%) rename trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/es/EsDataSourceService.java (78%) rename trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/es/EsTraceUtil.java (97%) rename trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/es/QueryEsService.java (96%) rename trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/es/WriteEsService.java (92%) rename trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/es/config/EsConfig.java (97%) rename trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/es/config/EsProcessConfig.java (91%) rename trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/kafka/BeanInitConfigure.java (96%) rename trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/kafka/KafkaConfigure.java (90%) rename trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/kafka/KafkaConfigure9092.java (97%) rename trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/kafka/KafkaConfigure9093.java (98%) rename trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/kafka/KafkaConfigure9094.java (98%) rename trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/kafka/KafkaExtension.java (97%) rename trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/kafka/VpcType.java (93%) rename trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/rocketmq/ClientMessageQueue.java (97%) rename trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/rocketmq/ClientMessageQueueWrapper.java (98%) rename trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/extension/rocketmq/RocketMQExtension.java (97%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java (96%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/config/DataSourceConfig.java (98%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/config/DubboConfiguration.java (97%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/config/FilterConfiguration.java (94%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/config/NacosConfiguration.java (95%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/config/ServiceConfiguration.java (81%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/controller/ManagerController.java (94%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/controller/TraceController.java (83%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/dubbo/TraceManagerServiceImpl.java (81%) rename trace-etl/trace-etl-manager/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/manager/filter/RequestHeaderFilter.java (97%) rename trace-etl/trace-etl-metadata/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/metadata/bootstrap/TraceEtlMetadataBootstrap.java (96%) rename trace-etl/trace-etl-metadata/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/metadata/config/DataSourceConfig.java (98%) rename trace-etl/trace-etl-metadata/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/metadata/config/DubboConfiguration.java (97%) rename trace-etl/trace-etl-metadata/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/metadata/config/NacosConfiguration.java (95%) rename trace-etl/trace-etl-metadata/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/metadata/dubbo/HeraMetaDataServiceImpl.java (86%) rename trace-etl/trace-etl-metadata/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/metadata/mq/KafkaHeraMetaDataConsumer.java (92%) rename trace-etl/trace-etl-metadata/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/metadata/mq/RocketMQHeraMetaDataConsumer.java (92%) rename trace-etl/trace-etl-metadata/src/main/java/{run/mone => org/apache/ozhera}/trace/etl/metadata/util/Const.java (94%) rename trace-etl/trace-etl-nginx/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java (96%) rename trace-etl/trace-etl-nginx/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/nginx/parser/NginxLogToTraceBase.java (97%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/bootstrap/TraceEtlBootstrap.java (97%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/config/DataSourceConfig.java (98%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/config/DubboConfiguration.java (98%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/config/NacosConfiguration.java (96%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/config/ServiceConfiguration.java (82%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/config/TraceConfig.java (91%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/constant/LocalStorages.java (93%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/constant/LockUtil.java (93%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/constant/MetricsName.java (98%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/constant/SpanKind.java (95%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/constant/SpanType.java (96%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/consumer/DataCacheService.java (99%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/consumer/EnterManager.java (92%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/consumer/KafkaConsumerService.java (91%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/consumer/MetricsParseService.java (98%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/consumer/MutiMetricsCall.java (97%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/consumer/RocketMQConsumerService.java (90%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/dubbo/TraceEtlServiceImpl.java (85%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/nacos/NacosClientUtil.java (98%) rename trace-etl/trace-etl-server/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/prometheus/HTTPServer.java (98%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/service/HeraContextService.java (95%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/service/ManagerService.java (85%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/service/RedisService.java (95%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/service/impl/HeraContextServiceImpl.java (93%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/service/impl/ManagerServiceImpl.java (92%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/service/impl/RedisServiceImpl.java (98%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/ExecutorUtil.java (98%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/MessageUtil.java (97%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/ThriftUtil.java (97%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/TraceUtil.java (99%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/convert/HeraMetaDataConvert.java (82%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/convert/HeraMetaDataPortModelConvert.java (85%) rename trace-etl/trace-etl-service/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/trace/etl/util/pool/AsyncNotify.java (96%) diff --git a/ozhera-demo-client/ozhera-demo-client-api/src/main/java/com/xiaomi/mone/hera/demo/client/api/service/DubboHealthService.java b/ozhera-demo-client/ozhera-demo-client-api/src/main/java/org/apache/ozhera/demo/client/api/service/DubboHealthService.java similarity index 93% rename from ozhera-demo-client/ozhera-demo-client-api/src/main/java/com/xiaomi/mone/hera/demo/client/api/service/DubboHealthService.java rename to ozhera-demo-client/ozhera-demo-client-api/src/main/java/org/apache/ozhera/demo/client/api/service/DubboHealthService.java index cbc7650a8..ba538219b 100644 --- a/ozhera-demo-client/ozhera-demo-client-api/src/main/java/com/xiaomi/mone/hera/demo/client/api/service/DubboHealthService.java +++ b/ozhera-demo-client/ozhera-demo-client-api/src/main/java/org/apache/ozhera/demo/client/api/service/DubboHealthService.java @@ -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; diff --git a/ozhera-demo-client/ozhera-demo-client-server/pom.xml b/ozhera-demo-client/ozhera-demo-client-server/pom.xml index f0c5777a4..5317eed4b 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/pom.xml +++ b/ozhera-demo-client/ozhera-demo-client-server/pom.xml @@ -146,7 +146,7 @@ 2.7.15 - com.xiaomi.mone.hera.demo.client.bootstrap.HeraDemoClientBootstrap + org.apache.ozhera.demo.client.bootstrap.HeraDemoClientBootstrap diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/bootstrap/HeraDemoClientBootstrap.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/bootstrap/HeraDemoClientBootstrap.java similarity index 96% rename from ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/bootstrap/HeraDemoClientBootstrap.java rename to ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/bootstrap/HeraDemoClientBootstrap.java index fadca6113..704202fe0 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/bootstrap/HeraDemoClientBootstrap.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/bootstrap/HeraDemoClientBootstrap.java @@ -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; diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/DubboConfiguration.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/DubboConfiguration.java similarity index 97% rename from ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/DubboConfiguration.java rename to ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/DubboConfiguration.java index c69ff6854..00e08499b 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/DubboConfiguration.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/DubboConfiguration.java @@ -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; diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/NacosConfiguration.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/NacosConfiguration.java similarity index 95% rename from ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/NacosConfiguration.java rename to ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/NacosConfiguration.java index 00bc2953a..674eb0813 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/NacosConfiguration.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/NacosConfiguration.java @@ -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; 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/org/apache/ozhera/demo/client/config/PrometheusConfiguration.java similarity index 96% rename from ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java rename to ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/PrometheusConfiguration.java index 59e7f6a43..9e2df4682 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/org/apache/ozhera/demo/client/config/PrometheusConfiguration.java @@ -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; diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/RedisConfig.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/RedisConfig.java similarity index 97% rename from ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/RedisConfig.java rename to ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/RedisConfig.java index 789d12336..40ba26d59 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/RedisConfig.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/config/RedisConfig.java @@ -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; 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/org/apache/ozhera/demo/client/controller/TestController.java similarity index 95% rename from ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java rename to ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/controller/TestController.java index a8cbbb206..bc3ca6ece 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/org/apache/ozhera/demo/client/controller/TestController.java @@ -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; diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/grpc/GrpcClientService.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/grpc/GrpcClientService.java similarity index 97% rename from ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/grpc/GrpcClientService.java rename to ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/grpc/GrpcClientService.java index 2fedae7ee..807819fc2 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/grpc/GrpcClientService.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/grpc/GrpcClientService.java @@ -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; diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/util/HttpClientUtil.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/util/HttpClientUtil.java similarity index 98% rename from ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/util/HttpClientUtil.java rename to ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/util/HttpClientUtil.java index 631d7bc9b..edab76801 100755 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/util/HttpClientUtil.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/org/apache/ozhera/demo/client/util/HttpClientUtil.java @@ -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; diff --git a/ozhera-demo-client/ozhera-demo-client-service/src/main/java/com/xiaomi/mone/hera/demo/client/service/DubboHealthServiceImpl.java b/ozhera-demo-client/ozhera-demo-client-service/src/main/java/org/apache/ozhera/demo/client/service/DubboHealthServiceImpl.java similarity index 93% rename from ozhera-demo-client/ozhera-demo-client-service/src/main/java/com/xiaomi/mone/hera/demo/client/service/DubboHealthServiceImpl.java rename to ozhera-demo-client/ozhera-demo-client-service/src/main/java/org/apache/ozhera/demo/client/service/DubboHealthServiceImpl.java index 449e2d9e3..760827579 100644 --- a/ozhera-demo-client/ozhera-demo-client-service/src/main/java/com/xiaomi/mone/hera/demo/client/service/DubboHealthServiceImpl.java +++ b/ozhera-demo-client/ozhera-demo-client-service/src/main/java/org/apache/ozhera/demo/client/service/DubboHealthServiceImpl.java @@ -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; diff --git a/ozhera-demo-server/ozhera-demo-server-api/src/main/java/com/xiaomi/mone/hera/demo/server/service/DubboHealthService.java b/ozhera-demo-server/ozhera-demo-server-api/src/main/java/org/apache/ozhera/demo/server/service/DubboHealthService.java similarity index 94% rename from ozhera-demo-server/ozhera-demo-server-api/src/main/java/com/xiaomi/mone/hera/demo/server/service/DubboHealthService.java rename to ozhera-demo-server/ozhera-demo-server-api/src/main/java/org/apache/ozhera/demo/server/service/DubboHealthService.java index 7019b8db4..55447feca 100644 --- a/ozhera-demo-server/ozhera-demo-server-api/src/main/java/com/xiaomi/mone/hera/demo/server/service/DubboHealthService.java +++ b/ozhera-demo-server/ozhera-demo-server-api/src/main/java/org/apache/ozhera/demo/server/service/DubboHealthService.java @@ -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; diff --git a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/HeraDemoServerBootstrap.java b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/HeraDemoServerBootstrap.java similarity index 97% rename from ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/HeraDemoServerBootstrap.java rename to ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/HeraDemoServerBootstrap.java index 4fc8a658c..a653b1e80 100644 --- a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/HeraDemoServerBootstrap.java +++ b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/HeraDemoServerBootstrap.java @@ -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; diff --git a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/config/DubboConfiguration.java b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/config/DubboConfiguration.java similarity index 98% rename from ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/config/DubboConfiguration.java rename to ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/config/DubboConfiguration.java index 689d04850..4d1b2f121 100644 --- a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/config/DubboConfiguration.java +++ b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/config/DubboConfiguration.java @@ -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; diff --git a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/config/NacosConfiguration.java b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/config/NacosConfiguration.java similarity index 95% rename from ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/config/NacosConfiguration.java rename to ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/config/NacosConfiguration.java index 5bb9482e3..4b4db1368 100644 --- a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/config/NacosConfiguration.java +++ b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/config/NacosConfiguration.java @@ -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; diff --git a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/grpc/MyServiceImpl.java b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/grpc/MyServiceImpl.java similarity index 100% rename from ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/grpc/MyServiceImpl.java rename to ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/grpc/MyServiceImpl.java diff --git a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/service/DubboHealthServiceImpl.java b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/service/DubboHealthServiceImpl.java similarity index 96% rename from ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/service/DubboHealthServiceImpl.java rename to ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/service/DubboHealthServiceImpl.java index 25dfe6607..693c13e1f 100644 --- a/ozhera-demo-server/ozhera-demo-server-server/src/main/java/com/xiaomi/mone/hera/demo/server/service/DubboHealthServiceImpl.java +++ b/ozhera-demo-server/ozhera-demo-server-server/src/main/java/org/apache/ozhera/demo/server/service/DubboHealthServiceImpl.java @@ -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; diff --git a/ozhera-intelligence/ozhera-intelligence-domain/pom.xml b/ozhera-intelligence/ozhera-intelligence-domain/pom.xml index 47ea01371..c10fbbef0 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/pom.xml +++ b/ozhera-intelligence/ozhera-intelligence-domain/pom.xml @@ -6,7 +6,7 @@ org.apache.ozhera ozhera-intelligence - 1.0.0 + 2.0.0-SNAPSHOT ozhera-intelligence-domain diff --git a/ozhera-intelligence/ozhera-intelligence-server/pom.xml b/ozhera-intelligence/ozhera-intelligence-server/pom.xml index 2b2f1ffa7..8cb9ce881 100644 --- a/ozhera-intelligence/ozhera-intelligence-server/pom.xml +++ b/ozhera-intelligence/ozhera-intelligence-server/pom.xml @@ -6,7 +6,7 @@ org.apache.ozhera ozhera-intelligence - 1.0.0 + 2.0.0-SNAPSHOT ozhera-intelligence-server diff --git a/ozhera-intelligence/ozhera-intelligence-service/pom.xml b/ozhera-intelligence/ozhera-intelligence-service/pom.xml index 4d8799f15..2500d21f7 100644 --- a/ozhera-intelligence/ozhera-intelligence-service/pom.xml +++ b/ozhera-intelligence/ozhera-intelligence-service/pom.xml @@ -6,7 +6,7 @@ org.apache.ozhera ozhera-intelligence - 1.0.0 + 2.0.0-SNAPSHOT ozhera-intelligence-service diff --git a/ozhera-intelligence/pom.xml b/ozhera-intelligence/pom.xml index a09432ce4..460802b2f 100644 --- a/ozhera-intelligence/pom.xml +++ b/ozhera-intelligence/pom.xml @@ -10,7 +10,7 @@ ozhera-intelligence - 1.0.0 + 2.0.0-SNAPSHOT pom diff --git a/trace-etl/pom.xml b/trace-etl/pom.xml index 0b2a1ec8d..763ef9d7a 100644 --- a/trace-etl/pom.xml +++ b/trace-etl/pom.xml @@ -4,15 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT 4.0.0 - run.mone trace-etl - 1.0.1-jdk21 + 2.0.0-SNAPSHOT pom diff --git a/trace-etl/trace-etl-api/pom.xml b/trace-etl/trace-etl-api/pom.xml index b23e876a3..a3d64d2bc 100644 --- a/trace-etl/trace-etl-api/pom.xml +++ b/trace-etl/trace-etl-api/pom.xml @@ -5,8 +5,8 @@ trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 @@ -15,7 +15,7 @@ - run.mone + org.apache.ozhera trace-etl-domain ${project.parent.version} diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/DataSourceService.java b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/DataSourceService.java similarity index 70% rename from trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/DataSourceService.java rename to trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/DataSourceService.java index 0a68763e9..23c5f224e 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/DataSourceService.java +++ b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/DataSourceService.java @@ -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; diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/HeraMetaDataService.java b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/HeraMetaDataService.java similarity index 82% rename from trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/HeraMetaDataService.java rename to trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/HeraMetaDataService.java index d685ad9ba..8b35dc559 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/HeraMetaDataService.java +++ b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/HeraMetaDataService.java @@ -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; diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IEnterManager.java b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/IEnterManager.java similarity index 94% rename from trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IEnterManager.java rename to trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/IEnterManager.java index a25b1feed..f04c72ab4 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IEnterManager.java +++ b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/IEnterManager.java @@ -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; diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IMetricsParseService.java b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/IMetricsParseService.java similarity index 94% rename from trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IMetricsParseService.java rename to trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/IMetricsParseService.java index 5d3d834a7..c4b81d930 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IMetricsParseService.java +++ b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/IMetricsParseService.java @@ -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; diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/MQExtension.java b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/MQExtension.java similarity index 92% rename from trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/MQExtension.java rename to trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/MQExtension.java index 30fb5fd50..d404317b4 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/MQExtension.java +++ b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/MQExtension.java @@ -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; diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/TraceEtlService.java b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/TraceEtlService.java similarity index 87% rename from trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/TraceEtlService.java rename to trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/TraceEtlService.java index aa84c0eeb..1bd19fc34 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/TraceEtlService.java +++ b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/TraceEtlService.java @@ -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 { diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/TraceManagerService.java b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/TraceManagerService.java similarity index 88% rename from trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/TraceManagerService.java rename to trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/TraceManagerService.java index 398c935b0..17dfcb331 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/TraceManagerService.java +++ b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/api/service/TraceManagerService.java @@ -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; diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/bo/MqConfig.java b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/bo/MqConfig.java similarity index 96% rename from trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/bo/MqConfig.java rename to trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/bo/MqConfig.java index 7e8c82eb2..cf490bc8b 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/bo/MqConfig.java +++ b/trace-etl/trace-etl-api/src/main/java/org/apache/ozhera/trace/etl/bo/MqConfig.java @@ -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; diff --git a/trace-etl/trace-etl-common/pom.xml b/trace-etl/trace-etl-common/pom.xml index 7435729c1..a0dc381dd 100644 --- a/trace-etl/trace-etl-common/pom.xml +++ b/trace-etl/trace-etl-common/pom.xml @@ -5,8 +5,8 @@ trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 diff --git a/trace-etl/trace-etl-common/src/main/java/com/xiaomi/hera/trace/etl/common/HashUtil.java b/trace-etl/trace-etl-common/src/main/java/org/apache/ozhera/trace/etl/common/HashUtil.java similarity index 96% rename from trace-etl/trace-etl-common/src/main/java/com/xiaomi/hera/trace/etl/common/HashUtil.java rename to trace-etl/trace-etl-common/src/main/java/org/apache/ozhera/trace/etl/common/HashUtil.java index b0666a6e7..758adb50e 100644 --- a/trace-etl/trace-etl-common/src/main/java/com/xiaomi/hera/trace/etl/common/HashUtil.java +++ b/trace-etl/trace-etl-common/src/main/java/org/apache/ozhera/trace/etl/common/HashUtil.java @@ -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; diff --git a/trace-etl/trace-etl-common/src/main/java/com/xiaomi/hera/trace/etl/common/TimeConverter.java b/trace-etl/trace-etl-common/src/main/java/org/apache/ozhera/trace/etl/common/TimeConverter.java similarity index 99% rename from trace-etl/trace-etl-common/src/main/java/com/xiaomi/hera/trace/etl/common/TimeConverter.java rename to trace-etl/trace-etl-common/src/main/java/org/apache/ozhera/trace/etl/common/TimeConverter.java index f4933d492..963377d09 100644 --- a/trace-etl/trace-etl-common/src/main/java/com/xiaomi/hera/trace/etl/common/TimeConverter.java +++ b/trace-etl/trace-etl-common/src/main/java/org/apache/ozhera/trace/etl/common/TimeConverter.java @@ -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; diff --git a/trace-etl/trace-etl-dao/pom.xml b/trace-etl/trace-etl-dao/pom.xml index 1e5dbabfc..243251b50 100644 --- a/trace-etl/trace-etl-dao/pom.xml +++ b/trace-etl/trace-etl-dao/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 @@ -13,7 +13,7 @@ - run.mone + org.apache.ozhera trace-etl-domain ${project.parent.version} diff --git a/trace-etl/trace-etl-dao/src/main/java/com/xiaomi/hera/trace/etl/mapper/HeraMetaDataMapper.java b/trace-etl/trace-etl-dao/src/main/java/org/apache/ozhera/trace/etl/mapper/HeraMetaDataMapper.java similarity index 87% rename from trace-etl/trace-etl-dao/src/main/java/com/xiaomi/hera/trace/etl/mapper/HeraMetaDataMapper.java rename to trace-etl/trace-etl-dao/src/main/java/org/apache/ozhera/trace/etl/mapper/HeraMetaDataMapper.java index 345e9e67d..9a9d87cec 100644 --- a/trace-etl/trace-etl-dao/src/main/java/com/xiaomi/hera/trace/etl/mapper/HeraMetaDataMapper.java +++ b/trace-etl/trace-etl-dao/src/main/java/org/apache/ozhera/trace/etl/mapper/HeraMetaDataMapper.java @@ -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 diff --git a/trace-etl/trace-etl-dao/src/main/java/com/xiaomi/hera/trace/etl/mapper/HeraTraceEtlConfigMapper.java b/trace-etl/trace-etl-dao/src/main/java/org/apache/ozhera/trace/etl/mapper/HeraTraceEtlConfigMapper.java similarity index 94% rename from trace-etl/trace-etl-dao/src/main/java/com/xiaomi/hera/trace/etl/mapper/HeraTraceEtlConfigMapper.java rename to trace-etl/trace-etl-dao/src/main/java/org/apache/ozhera/trace/etl/mapper/HeraTraceEtlConfigMapper.java index bf30115e2..ce9ff3ee4 100644 --- a/trace-etl/trace-etl-dao/src/main/java/com/xiaomi/hera/trace/etl/mapper/HeraTraceEtlConfigMapper.java +++ b/trace-etl/trace-etl-dao/src/main/java/org/apache/ozhera/trace/etl/mapper/HeraTraceEtlConfigMapper.java @@ -13,11 +13,11 @@ * 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.github.pagehelper.Page; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/trace-etl/trace-etl-domain/pom.xml b/trace-etl/trace-etl-domain/pom.xml index 5e876f8c9..c7f79abda 100644 --- a/trace-etl/trace-etl-domain/pom.xml +++ b/trace-etl/trace-etl-domain/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/DriverDomain.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/DriverDomain.java similarity index 97% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/DriverDomain.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/DriverDomain.java index 19f1d2f17..bb4c3a99c 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/DriverDomain.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/DriverDomain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; /** * @Description diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/ErrorTraceMessage.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/ErrorTraceMessage.java similarity index 99% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/ErrorTraceMessage.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/ErrorTraceMessage.java index 672afc282..1a47d63e5 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/ErrorTraceMessage.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/ErrorTraceMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; public class ErrorTraceMessage { /** diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/HeraTraceConfigVo.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/HeraTraceConfigVo.java similarity index 97% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/HeraTraceConfigVo.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/HeraTraceConfigVo.java index 507907a8c..1caedcb3c 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/HeraTraceConfigVo.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/HeraTraceConfigVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; /** * @Description diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/HeraTraceEtlConfig.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/HeraTraceEtlConfig.java similarity index 99% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/HeraTraceEtlConfig.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/HeraTraceEtlConfig.java index 017b00aa5..a758a37d8 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/HeraTraceEtlConfig.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/HeraTraceEtlConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; import java.io.Serializable; import java.util.Date; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/JaegerTracerDomain.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/JaegerTracerDomain.java similarity index 99% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/JaegerTracerDomain.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/JaegerTracerDomain.java index 608da73cb..8779a53d8 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/JaegerTracerDomain.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/JaegerTracerDomain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; import org.apache.commons.lang3.StringUtils; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/MetricsParseResult.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/MetricsParseResult.java similarity index 98% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/MetricsParseResult.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/MetricsParseResult.java index 1bfb559bc..dc606372e 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/MetricsParseResult.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/MetricsParseResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; /** * @Description diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/NginxJaegerDomain.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/NginxJaegerDomain.java similarity index 98% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/NginxJaegerDomain.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/NginxJaegerDomain.java index e0c9353a8..5a44bc21a 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/NginxJaegerDomain.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/NginxJaegerDomain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; /** * @Description diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/PageData.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/PageData.java similarity index 96% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/PageData.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/PageData.java index a5fa29bc7..5feabaeb9 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/PageData.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/PageData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; public class PageData{ diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/PagerVo.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/PagerVo.java similarity index 95% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/PagerVo.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/PagerVo.java index 58dc54bc2..d62f4ad04 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/PagerVo.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/PagerVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain; +package org.apache.ozhera.trace.etl.domain; /** * @Description diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerAttrType.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerAttrType.java similarity index 94% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerAttrType.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerAttrType.java index e3c798db9..d312cda40 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerAttrType.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerAttrType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.jaegeres; +package org.apache.ozhera.trace.etl.domain.jaegeres; public class JaegerAttrType { diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerAttribute.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerAttribute.java similarity index 95% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerAttribute.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerAttribute.java index afe324334..efe4c1e5b 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerAttribute.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerAttribute.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.jaegeres; +package org.apache.ozhera.trace.etl.domain.jaegeres; public class JaegerAttribute { private String key; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerESDomain.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerESDomain.java similarity index 98% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerESDomain.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerESDomain.java index 37dde33a4..08bd3732f 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerESDomain.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerESDomain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.jaegeres; +package org.apache.ozhera.trace.etl.domain.jaegeres; import java.util.List; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerLogs.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerLogs.java similarity index 95% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerLogs.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerLogs.java index 6001ee45e..90bd1a954 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerLogs.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerLogs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.jaegeres; +package org.apache.ozhera.trace.etl.domain.jaegeres; import java.util.List; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerProcess.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerProcess.java similarity index 95% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerProcess.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerProcess.java index f1f4755f0..24d1f2040 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerProcess.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerProcess.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.jaegeres; +package org.apache.ozhera.trace.etl.domain.jaegeres; import java.util.List; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerRefType.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerRefType.java similarity index 93% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerRefType.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerRefType.java index f9ffcdae5..5bb76c871 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerRefType.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerRefType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.jaegeres; +package org.apache.ozhera.trace.etl.domain.jaegeres; public class JaegerRefType { public static final String CHILD_OF = "CHILD_OF"; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerReferences.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerReferences.java similarity index 95% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerReferences.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerReferences.java index 568dd04c9..e06f46bd1 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/jaegeres/JaegerReferences.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/jaegeres/JaegerReferences.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.jaegeres; +package org.apache.ozhera.trace.etl.domain.jaegeres; public class JaegerReferences { private String traceID; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaData.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaData.java similarity index 97% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaData.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaData.java index 7fd62dfc6..8f7606c13 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaData.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.metadata; +package org.apache.ozhera.trace.etl.domain.metadata; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataMessage.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataMessage.java similarity index 95% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataMessage.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataMessage.java index 5ab313d10..0f686c6e3 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataMessage.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.metadata; +package org.apache.ozhera.trace.etl.domain.metadata; import lombok.Data; import lombok.ToString; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataModel.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataModel.java similarity index 97% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataModel.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataModel.java index bb48cfd47..e4fc9900c 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataModel.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.metadata; +package org.apache.ozhera.trace.etl.domain.metadata; import lombok.AllArgsConstructor; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataPort.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataPort.java similarity index 94% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataPort.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataPort.java index 028196fd6..9a1782fe9 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataPort.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataPort.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.metadata; +package org.apache.ozhera.trace.etl.domain.metadata; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataPortModel.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataPortModel.java similarity index 95% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataPortModel.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataPortModel.java index 743656fdc..78f797c56 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataPortModel.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataPortModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.metadata; +package org.apache.ozhera.trace.etl.domain.metadata; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataQuery.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataQuery.java similarity index 95% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataQuery.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataQuery.java index 47f15d390..58c0d1309 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataQuery.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.metadata; +package org.apache.ozhera.trace.etl.domain.metadata; import lombok.Data; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataType.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataType.java similarity index 94% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataType.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataType.java index 7da4bba4f..ca64864ee 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/metadata/HeraMetaDataType.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/metadata/HeraMetaDataType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.metadata; +package org.apache.ozhera.trace.etl.domain.metadata; /** * @Author dingtao diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/Span.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/Span.java similarity index 91% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/Span.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/Span.java index 45903542f..cf27de072 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/Span.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/Span.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.tracequery; +package org.apache.ozhera.trace.etl.domain.tracequery; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttribute; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerLogs; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerProcess; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerReferences; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerAttribute; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerLogs; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerProcess; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerReferences; import java.util.List; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/Trace.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/Trace.java similarity index 93% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/Trace.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/Trace.java index 9646728b0..f1284ac41 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/Trace.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/Trace.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.tracequery; +package org.apache.ozhera.trace.etl.domain.tracequery; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerProcess; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerProcess; import java.util.List; import java.util.Map; diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceIdQueryVo.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceIdQueryVo.java similarity index 96% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceIdQueryVo.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceIdQueryVo.java index b31e3af92..bc1c4aa38 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceIdQueryVo.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceIdQueryVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.tracequery; +package org.apache.ozhera.trace.etl.domain.tracequery; /** * @Description diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceListQueryVo.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceListQueryVo.java similarity index 98% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceListQueryVo.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceListQueryVo.java index a6ba19bfa..598757f04 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceListQueryVo.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceListQueryVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.tracequery; +package org.apache.ozhera.trace.etl.domain.tracequery; /** * @Description diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceOperationsVo.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceOperationsVo.java similarity index 96% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceOperationsVo.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceOperationsVo.java index 2af070999..970672ce5 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceOperationsVo.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceOperationsVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.tracequery; +package org.apache.ozhera.trace.etl.domain.tracequery; /** * @Description diff --git a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceQueryResult.java b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceQueryResult.java similarity index 96% rename from trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceQueryResult.java rename to trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceQueryResult.java index 5ccce09c9..f9b176798 100644 --- a/trace-etl/trace-etl-domain/src/main/java/com/xiaomi/hera/trace/etl/domain/tracequery/TraceQueryResult.java +++ b/trace-etl/trace-etl-domain/src/main/java/org/apache/ozhera/trace/etl/domain/tracequery/TraceQueryResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.domain.tracequery; +package org.apache.ozhera.trace.etl.domain.tracequery; /** * @Description diff --git a/trace-etl/trace-etl-es/pom.xml b/trace-etl/trace-etl-es/pom.xml index f50ec3905..5c75252cc 100644 --- a/trace-etl/trace-etl-es/pom.xml +++ b/trace-etl/trace-etl-es/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ - run.mone + org.apache.ozhera trace-etl-service ${project.parent.version} @@ -51,22 +51,22 @@ - run.mone + org.apache.ozhera trace-etl-kafka-extension ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-rocketmq-extension ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-doris-extension ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-es-extension ${project.parent.version} @@ -88,7 +88,7 @@ spring-boot-maven-plugin 2.7.15 - com.xiaomi.hera.trace.etl.es.bootstrap.TraceEtlEsBootstrap + org.apache.ozhera.trace.etl.es.bootstrap.TraceEtlEsBootstrap diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java similarity index 96% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java index 0569ae744..321807f04 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/bootstrap/TraceEtlEsBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.bootstrap; +package org.apache.ozhera.trace.etl.es.bootstrap; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/DataSourceConfig.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/DataSourceConfig.java similarity index 98% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/DataSourceConfig.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/DataSourceConfig.java index 184140cc7..0d2e515cf 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/DataSourceConfig.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/DataSourceConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.config; +package org.apache.ozhera.trace.etl.es.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.mchange.v2.c3p0.ComboPooledDataSource; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/DubboConfiguration.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/DubboConfiguration.java similarity index 98% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/DubboConfiguration.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/DubboConfiguration.java index 1cb9d3c9a..342fde2d3 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/DubboConfiguration.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/DubboConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.config; +package org.apache.ozhera.trace.etl.es.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.collect.Maps; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/NacosConfiguration.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/NacosConfiguration.java similarity index 95% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/NacosConfiguration.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/NacosConfiguration.java index b53779a65..f42c6add9 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/NacosConfiguration.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/NacosConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.config; +package org.apache.ozhera.trace.etl.es.config; import com.alibaba.nacos.api.annotation.NacosProperties; import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/ServiceConfiguration.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/ServiceConfiguration.java similarity index 82% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/ServiceConfiguration.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/ServiceConfiguration.java index 2a1b45d5d..02eec64aa 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/ServiceConfiguration.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/ServiceConfiguration.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.config; +package org.apache.ozhera.trace.etl.es.config; -import com.xiaomi.hera.trace.etl.mapper.HeraTraceEtlConfigMapper; -import com.xiaomi.hera.trace.etl.service.ManagerService; -import com.xiaomi.hera.trace.etl.service.impl.ManagerServiceImpl; +import org.apache.ozhera.trace.etl.mapper.HeraTraceEtlConfigMapper; +import org.apache.ozhera.trace.etl.service.ManagerService; +import org.apache.ozhera.trace.etl.service.impl.ManagerServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/TraceConfig.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/TraceConfig.java similarity index 93% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/TraceConfig.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/TraceConfig.java index 64f5db98b..b8918505e 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/config/TraceConfig.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/config/TraceConfig.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.config; +package org.apache.ozhera.trace.etl.es.config; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.domain.HeraTraceConfigVo; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.service.ManagerService; +import org.apache.ozhera.trace.etl.domain.HeraTraceConfigVo; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.service.ManagerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/ConsumerService.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/ConsumerService.java similarity index 96% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/ConsumerService.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/ConsumerService.java index 2394e2e2a..30cca1c50 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/ConsumerService.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/ConsumerService.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.consumer; +package org.apache.ozhera.trace.etl.es.consumer; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.base.Joiner; -import com.xiaomi.hera.trace.etl.api.service.DataSourceService; -import com.xiaomi.hera.trace.etl.es.domain.FilterResult; -import com.xiaomi.hera.trace.etl.es.domain.LocalStorages; -import com.xiaomi.hera.trace.etl.es.queue.impl.RocksdbStoreServiceImpl; -import com.xiaomi.hera.trace.etl.es.queue.impl.TeSnowFlake; -import com.xiaomi.hera.trace.etl.es.util.bloomfilter.TraceIdRedisBloomUtil; -import com.xiaomi.hera.trace.etl.util.ExecutorUtil; -import com.xiaomi.hera.trace.etl.util.MessageUtil; -import com.xiaomi.hera.trace.etl.util.ThriftUtil; +import org.apache.ozhera.trace.etl.api.service.DataSourceService; +import org.apache.ozhera.trace.etl.es.domain.FilterResult; +import org.apache.ozhera.trace.etl.es.domain.LocalStorages; +import org.apache.ozhera.trace.etl.es.queue.impl.RocksdbStoreServiceImpl; +import org.apache.ozhera.trace.etl.es.queue.impl.TeSnowFlake; +import org.apache.ozhera.trace.etl.es.util.bloomfilter.TraceIdRedisBloomUtil; +import org.apache.ozhera.trace.etl.util.ExecutorUtil; +import org.apache.ozhera.trace.etl.util.MessageUtil; +import org.apache.ozhera.trace.etl.util.ThriftUtil; import org.apache.ozhera.tspandata.TAttributeKey; import org.apache.ozhera.tspandata.TAttributes; import org.apache.ozhera.tspandata.TSpanData; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/FilterService.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/FilterService.java similarity index 91% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/FilterService.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/FilterService.java index b395da09b..1e235108d 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/FilterService.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/FilterService.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.consumer; +package org.apache.ozhera.trace.etl.es.consumer; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.common.HashUtil; -import com.xiaomi.hera.trace.etl.service.HeraContextService; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.es.config.TraceConfig; -import com.xiaomi.hera.trace.etl.es.domain.FilterResult; -import com.xiaomi.hera.trace.etl.es.util.bloomfilter.TraceIdRedisBloomUtil; -import com.xiaomi.hera.trace.etl.util.MessageUtil; +import org.apache.ozhera.trace.etl.common.HashUtil; +import org.apache.ozhera.trace.etl.service.HeraContextService; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.es.config.TraceConfig; +import org.apache.ozhera.trace.etl.es.domain.FilterResult; +import org.apache.ozhera.trace.etl.es.util.bloomfilter.TraceIdRedisBloomUtil; +import org.apache.ozhera.trace.etl.util.MessageUtil; import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java similarity index 92% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java index 9df146347..1a169481d 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.consumer; +package org.apache.ozhera.trace.etl.es.consumer; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.api.service.MQExtension; -import com.xiaomi.hera.trace.etl.bo.MqConfig; -import com.xiaomi.hera.trace.etl.es.util.pool.ConsumerPool; -import com.xiaomi.hera.trace.etl.util.ThriftUtil; +import org.apache.ozhera.trace.etl.api.service.MQExtension; +import org.apache.ozhera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.es.util.pool.ConsumerPool; +import org.apache.ozhera.trace.etl.util.ThriftUtil; import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java similarity index 92% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java index 161274f26..f8d54d546 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.consumer; +package org.apache.ozhera.trace.etl.es.consumer; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.api.service.MQExtension; -import com.xiaomi.hera.trace.etl.bo.MqConfig; -import com.xiaomi.hera.trace.etl.es.util.pool.ConsumerPool; -import com.xiaomi.hera.trace.etl.util.ThriftUtil; +import org.apache.ozhera.trace.etl.api.service.MQExtension; +import org.apache.ozhera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.es.util.pool.ConsumerPool; +import org.apache.ozhera.trace.etl.util.ThriftUtil; import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQClientException; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FilterResult.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/FilterResult.java similarity index 97% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FilterResult.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/FilterResult.java index e3b38488b..e143cfe40 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FilterResult.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/FilterResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.domain; +package org.apache.ozhera.trace.etl.es.domain; /** * @Description diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FutureRequest.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/FutureRequest.java similarity index 98% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FutureRequest.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/FutureRequest.java index 1a92e2ea0..aa6ff147b 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FutureRequest.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/FutureRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.domain; +package org.apache.ozhera.trace.etl.es.domain; import org.apache.ozhera.tspandata.TSpanData; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/LocalStorages.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/LocalStorages.java similarity index 96% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/LocalStorages.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/LocalStorages.java index 42a4afa68..b6bbcf7d9 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/LocalStorages.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/domain/LocalStorages.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.domain; +package org.apache.ozhera.trace.etl.es.domain; import java.util.concurrent.atomic.AtomicLong; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/dubbo/TraceEtlServiceImpl.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/dubbo/TraceEtlServiceImpl.java similarity index 85% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/dubbo/TraceEtlServiceImpl.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/dubbo/TraceEtlServiceImpl.java index f01e6d089..42e0c0ff8 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/dubbo/TraceEtlServiceImpl.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/dubbo/TraceEtlServiceImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.dubbo; +package org.apache.ozhera.trace.etl.es.dubbo; -import com.xiaomi.hera.trace.etl.api.service.TraceEtlService; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.es.config.TraceConfig; +import org.apache.ozhera.trace.etl.api.service.TraceEtlService; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.es.config.TraceConfig; import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/DiskStoreService.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/DiskStoreService.java similarity index 94% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/DiskStoreService.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/DiskStoreService.java index 8de652239..41651d3ad 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/DiskStoreService.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/DiskStoreService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.queue; +package org.apache.ozhera.trace.etl.es.queue; /** * @author shanwb diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/impl/RocksdbStoreServiceImpl.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/impl/RocksdbStoreServiceImpl.java similarity index 98% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/impl/RocksdbStoreServiceImpl.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/impl/RocksdbStoreServiceImpl.java index 3d3e73d9e..805815f94 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/impl/RocksdbStoreServiceImpl.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/impl/RocksdbStoreServiceImpl.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.queue.impl; +package org.apache.ozhera.trace.etl.es.queue.impl; -import com.xiaomi.hera.trace.etl.es.queue.DiskStoreService; +import org.apache.ozhera.trace.etl.es.queue.DiskStoreService; import org.rocksdb.CompactionStyle; import org.rocksdb.CompressionType; import org.rocksdb.InfoLogLevel; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/impl/TeSnowFlake.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/impl/TeSnowFlake.java similarity index 97% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/impl/TeSnowFlake.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/impl/TeSnowFlake.java index 77375fb0e..6cb9866e8 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/queue/impl/TeSnowFlake.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/queue/impl/TeSnowFlake.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.queue.impl; +package org.apache.ozhera.trace.etl.es.queue.impl; import com.alibaba.fastjson.JSONObject; import com.xiaomi.data.push.common.SnowFlake; -import com.xiaomi.hera.trace.etl.es.util.redis.RedisClientUtil; +import org.apache.ozhera.trace.etl.es.util.redis.RedisClientUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.InitializingBean; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/bloomfilter/BloomFilterHelper.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/bloomfilter/BloomFilterHelper.java similarity index 97% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/bloomfilter/BloomFilterHelper.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/bloomfilter/BloomFilterHelper.java index e5ad65f81..49d172f92 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/bloomfilter/BloomFilterHelper.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/bloomfilter/BloomFilterHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.util.bloomfilter; +package org.apache.ozhera.trace.etl.es.util.bloomfilter; import com.google.common.base.Preconditions; import com.google.common.hash.Funnel; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/bloomfilter/TraceIdRedisBloomUtil.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/bloomfilter/TraceIdRedisBloomUtil.java similarity index 98% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/bloomfilter/TraceIdRedisBloomUtil.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/bloomfilter/TraceIdRedisBloomUtil.java index 7e3c64e20..f07cab427 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/bloomfilter/TraceIdRedisBloomUtil.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/bloomfilter/TraceIdRedisBloomUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.util.bloomfilter; +package org.apache.ozhera.trace.etl.es.util.bloomfilter; import com.google.common.hash.BloomFilter; import com.google.common.hash.Funnel; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/pool/ConsumerPool.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/pool/ConsumerPool.java similarity index 96% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/pool/ConsumerPool.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/pool/ConsumerPool.java index 3059cc41a..88cc4d66f 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/pool/ConsumerPool.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/pool/ConsumerPool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.util.pool; +package org.apache.ozhera.trace.etl.es.util.pool; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/redis/RedisClientUtil.java b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/redis/RedisClientUtil.java similarity index 98% rename from trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/redis/RedisClientUtil.java rename to trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/redis/RedisClientUtil.java index 1eaa8fce6..be7a4c850 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/util/redis/RedisClientUtil.java +++ b/trace-etl/trace-etl-es/src/main/java/org/apache/ozhera/trace/etl/es/util/redis/RedisClientUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.es.util.redis; +package org.apache.ozhera.trace.etl.es.util.redis; import com.alibaba.nacos.api.config.annotation.NacosValue; import lombok.extern.slf4j.Slf4j; diff --git a/trace-etl/trace-etl-extensions/pom.xml b/trace-etl/trace-etl-extensions/pom.xml index eb386ff8b..33a8bc544 100644 --- a/trace-etl/trace-etl-extensions/pom.xml +++ b/trace-etl/trace-etl-extensions/pom.xml @@ -4,12 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera + 2.0.0-SNAPSHOT trace-etl - 1.0.1-jdk21 trace-etl-extensions + 2.0.0-SNAPSHOT pom trace-etl-rocketmq-extension diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/pom.xml b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/pom.xml index dee2b8cb3..73b91e6ad 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/pom.xml +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera trace-etl-extensions - 1.0.1-jdk21 + 2.0.0-SNAPSHOT trace-etl-doris-extension @@ -19,7 +19,7 @@ - run.mone + org.apache.ozhera trace-etl-service ${project.parent.version} diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/DorisDataSourceService.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/DorisDataSourceService.java similarity index 78% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/DorisDataSourceService.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/DorisDataSourceService.java index 795d81d73..225421789 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/DorisDataSourceService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/DorisDataSourceService.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris; +package org.apache.ozhera.trace.etl.extension.doris; -import com.xiaomi.hera.trace.etl.api.service.DataSourceService; -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; +import org.apache.ozhera.trace.etl.api.service.DataSourceService; +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 org.springframework.beans.factory.annotation.Autowired; diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/QueryDorisService.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/QueryDorisService.java similarity index 93% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/QueryDorisService.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/QueryDorisService.java index cef5ccfc8..a2173417d 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/QueryDorisService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/QueryDorisService.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris; +package org.apache.ozhera.trace.etl.extension.doris; import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import com.xiaomi.hera.trace.etl.common.TimeConverter; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttribute; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerLogs; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerProcess; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerReferences; -import com.xiaomi.hera.trace.etl.domain.tracequery.Span; -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.TraceQueryResult; +import org.apache.ozhera.trace.etl.common.TimeConverter; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerAttribute; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerLogs; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerProcess; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerReferences; +import org.apache.ozhera.trace.etl.domain.tracequery.Span; +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.TraceQueryResult; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import run.mone.doris.DorisService; -import run.mone.trace.etl.extension.doris.domain.HeraTraceSpanColumn; -import run.mone.trace.etl.extension.doris.domain.HeraTraceTable; +import org.apache.ozhera.trace.etl.extension.doris.domain.HeraTraceSpanColumn; +import org.apache.ozhera.trace.etl.extension.doris.domain.HeraTraceTable; import java.io.IOException; import java.lang.reflect.Type; diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/WriteDorisService.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/WriteDorisService.java similarity index 92% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/WriteDorisService.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/WriteDorisService.java index 696a0f517..32d954e85 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/WriteDorisService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/WriteDorisService.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris; +package org.apache.ozhera.trace.etl.extension.doris; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.gson.Gson; -import com.xiaomi.hera.trace.etl.domain.DriverDomain; -import com.xiaomi.hera.trace.etl.domain.ErrorTraceMessage; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttrType; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttribute; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerLogs; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerProcess; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerRefType; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerReferences; -import com.xiaomi.hera.trace.etl.util.MessageUtil; +import org.apache.ozhera.trace.etl.domain.DriverDomain; +import org.apache.ozhera.trace.etl.domain.ErrorTraceMessage; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerAttrType; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerAttribute; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerLogs; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerProcess; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerRefType; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerReferences; +import org.apache.ozhera.trace.etl.util.MessageUtil; import org.apache.ozhera.tspandata.TAttributeKey; import org.apache.ozhera.tspandata.TAttributes; import org.apache.ozhera.tspandata.TEvent; @@ -39,11 +39,11 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import run.mone.doris.DorisService; -import run.mone.trace.etl.extension.doris.domain.HeraErrorSlowTraceColumn; -import run.mone.trace.etl.extension.doris.domain.HeraTraceDriverColumn; -import run.mone.trace.etl.extension.doris.domain.HeraTraceServiceColumn; -import run.mone.trace.etl.extension.doris.domain.HeraTraceSpanColumn; -import run.mone.trace.etl.extension.doris.domain.HeraTraceTable; +import org.apache.ozhera.trace.etl.extension.doris.domain.HeraErrorSlowTraceColumn; +import org.apache.ozhera.trace.etl.extension.doris.domain.HeraTraceDriverColumn; +import org.apache.ozhera.trace.etl.extension.doris.domain.HeraTraceServiceColumn; +import org.apache.ozhera.trace.etl.extension.doris.domain.HeraTraceSpanColumn; +import org.apache.ozhera.trace.etl.extension.doris.domain.HeraTraceTable; import java.util.ArrayList; import java.util.Arrays; diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/config/DorisConfig.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/config/DorisConfig.java similarity index 84% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/config/DorisConfig.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/config/DorisConfig.java index e0e5e4725..a684b7c8a 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/config/DorisConfig.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/config/DorisConfig.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris.config; +package org.apache.ozhera.trace.etl.extension.doris.config; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.api.service.DataSourceService; +import org.apache.ozhera.trace.etl.api.service.DataSourceService; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import run.mone.doris.DorisService; -import run.mone.trace.etl.extension.doris.DorisDataSourceService; -import run.mone.trace.etl.extension.doris.QueryDorisService; -import run.mone.trace.etl.extension.doris.WriteDorisService; +import org.apache.ozhera.trace.etl.extension.doris.DorisDataSourceService; +import org.apache.ozhera.trace.etl.extension.doris.QueryDorisService; +import org.apache.ozhera.trace.etl.extension.doris.WriteDorisService; @Configuration @ConditionalOnProperty(value="storage.type", havingValue = "doris") diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraErrorSlowTraceColumn.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraErrorSlowTraceColumn.java similarity index 95% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraErrorSlowTraceColumn.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraErrorSlowTraceColumn.java index e0e633a6a..5e251216f 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraErrorSlowTraceColumn.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraErrorSlowTraceColumn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris.domain; +package org.apache.ozhera.trace.etl.extension.doris.domain; public class HeraErrorSlowTraceColumn { public static final String TRACE_ID = "traceId"; diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceDriverColumn.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceDriverColumn.java similarity index 94% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceDriverColumn.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceDriverColumn.java index 11d40f53f..f5154cd43 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceDriverColumn.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceDriverColumn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris.domain; +package org.apache.ozhera.trace.etl.extension.doris.domain; public class HeraTraceDriverColumn { diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceServiceColumn.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceServiceColumn.java similarity index 93% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceServiceColumn.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceServiceColumn.java index 1a8d1a33e..a64feb0a5 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceServiceColumn.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceServiceColumn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris.domain; +package org.apache.ozhera.trace.etl.extension.doris.domain; public class HeraTraceServiceColumn { diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceSpanColumn.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceSpanColumn.java similarity index 95% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceSpanColumn.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceSpanColumn.java index d222cf837..82e96090b 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceSpanColumn.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceSpanColumn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris.domain; +package org.apache.ozhera.trace.etl.extension.doris.domain; public class HeraTraceSpanColumn { public static final String duration = "duration"; diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceTable.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceTable.java similarity index 94% rename from trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceTable.java rename to trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceTable.java index 2fcf2f05b..68a295cbe 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/domain/HeraTraceTable.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/org/apache/ozhera/trace/etl/extension/doris/domain/HeraTraceTable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.doris.domain; +package org.apache.ozhera.trace.etl.extension.doris.domain; public class HeraTraceTable { diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/pom.xml b/trace-etl/trace-etl-extensions/trace-etl-es-extension/pom.xml index 40e2ad5d4..1157af906 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/pom.xml +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera trace-etl-extensions - 1.0.1-jdk21 + 2.0.0-SNAPSHOT trace-etl-es-extension @@ -19,7 +19,7 @@ - run.mone + org.apache.ozhera trace-etl-service ${project.parent.version} diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsDataSourceService.java b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/EsDataSourceService.java similarity index 78% rename from trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsDataSourceService.java rename to trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/EsDataSourceService.java index 6c9876e79..06d964c5c 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsDataSourceService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/EsDataSourceService.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.es; +package org.apache.ozhera.trace.etl.extension.es; -import com.xiaomi.hera.trace.etl.api.service.DataSourceService; -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; +import org.apache.ozhera.trace.etl.api.service.DataSourceService; +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 org.springframework.beans.factory.annotation.Autowired; diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsTraceUtil.java b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/EsTraceUtil.java similarity index 97% rename from trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsTraceUtil.java rename to trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/EsTraceUtil.java index aabb1d580..8dd525489 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsTraceUtil.java +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/EsTraceUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.es; +package org.apache.ozhera.trace.etl.extension.es; import com.alibaba.fastjson.JSONObject; import com.xiaomi.mone.es.EsProcessor; diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/QueryEsService.java b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/QueryEsService.java similarity index 96% rename from trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/QueryEsService.java rename to trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/QueryEsService.java index 7cf9f8148..c85d0cb99 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/QueryEsService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/QueryEsService.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.es; +package org.apache.ozhera.trace.etl.extension.es; import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import com.xiaomi.hera.trace.etl.common.TimeConverter; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttribute; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerProcess; -import com.xiaomi.hera.trace.etl.domain.tracequery.Span; -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.TraceQueryResult; +import org.apache.ozhera.trace.etl.common.TimeConverter; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerAttribute; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerProcess; +import org.apache.ozhera.trace.etl.domain.tracequery.Span; +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.TraceQueryResult; import com.xiaomi.mone.es.EsClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/WriteEsService.java b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/WriteEsService.java similarity index 92% rename from trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/WriteEsService.java rename to trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/WriteEsService.java index aff9084eb..5deeaa68b 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/WriteEsService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/WriteEsService.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.es; +package org.apache.ozhera.trace.etl.extension.es; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.xiaomi.hera.trace.etl.domain.DriverDomain; -import com.xiaomi.hera.trace.etl.domain.ErrorTraceMessage; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttrType; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttribute; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerESDomain; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerLogs; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerProcess; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerRefType; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerReferences; -import com.xiaomi.hera.trace.etl.util.ExecutorUtil; -import com.xiaomi.hera.trace.etl.util.MessageUtil; +import org.apache.ozhera.trace.etl.domain.DriverDomain; +import org.apache.ozhera.trace.etl.domain.ErrorTraceMessage; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerAttrType; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerAttribute; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerESDomain; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerLogs; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerProcess; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerRefType; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerReferences; +import org.apache.ozhera.trace.etl.util.ExecutorUtil; +import org.apache.ozhera.trace.etl.util.MessageUtil; import org.apache.ozhera.tspandata.TAttributeKey; import org.apache.ozhera.tspandata.TAttributes; import org.apache.ozhera.tspandata.TEvent; diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/config/EsConfig.java b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/config/EsConfig.java similarity index 97% rename from trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/config/EsConfig.java rename to trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/config/EsConfig.java index f9416fad1..d5b0b3b63 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/config/EsConfig.java +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/config/EsConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.es.config; +package org.apache.ozhera.trace.etl.extension.es.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.xiaomi.mone.es.EsClient; diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/config/EsProcessConfig.java b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/config/EsProcessConfig.java similarity index 91% rename from trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/config/EsProcessConfig.java rename to trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/config/EsProcessConfig.java index fd5fbfc00..0669bec13 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/config/EsProcessConfig.java +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/org/apache/ozhera/trace/etl/extension/es/config/EsProcessConfig.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.es.config; +package org.apache.ozhera.trace.etl.extension.es.config; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.api.service.DataSourceService; +import org.apache.ozhera.trace.etl.api.service.DataSourceService; import com.xiaomi.mone.es.EsClient; import com.xiaomi.mone.es.EsProcessor; import com.xiaomi.mone.es.ProcessorConf; @@ -27,10 +27,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import run.mone.trace.etl.extension.es.EsDataSourceService; -import run.mone.trace.etl.extension.es.EsTraceUtil; -import run.mone.trace.etl.extension.es.QueryEsService; -import run.mone.trace.etl.extension.es.WriteEsService; +import org.apache.ozhera.trace.etl.extension.es.EsDataSourceService; +import org.apache.ozhera.trace.etl.extension.es.EsTraceUtil; +import org.apache.ozhera.trace.etl.extension.es.QueryEsService; +import org.apache.ozhera.trace.etl.extension.es.WriteEsService; import javax.annotation.Resource; diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/pom.xml b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/pom.xml index 2a978b622..2516a4c81 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/pom.xml +++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera trace-etl-extensions - 1.0.1-jdk21 + 2.0.0-SNAPSHOT trace-etl-kafka-extension @@ -31,13 +31,13 @@ - run.mone + org.apache.ozhera trace-etl-api ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-service ${project.parent.version} diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/BeanInitConfigure.java b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/BeanInitConfigure.java similarity index 96% rename from trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/BeanInitConfigure.java rename to trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/BeanInitConfigure.java index e77287dd5..bcf6ace86 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/BeanInitConfigure.java +++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/BeanInitConfigure.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.kafka; +package org.apache.ozhera.trace.etl.extension.kafka; import com.alibaba.nacos.api.config.annotation.NacosValue; import org.springframework.context.annotation.Bean; diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure.java b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure.java similarity index 90% rename from trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure.java rename to trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure.java index 3f0b31b91..04dce22da 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure.java +++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.kafka; +package org.apache.ozhera.trace.etl.extension.kafka; -import com.xiaomi.hera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.bo.MqConfig; import org.apache.kafka.clients.consumer.ConsumerRecords; import java.util.Properties; diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9092.java b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9092.java similarity index 97% rename from trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9092.java rename to trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9092.java index 9b100bad4..396c5bd21 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9092.java +++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9092.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.kafka; +package org.apache.ozhera.trace.etl.extension.kafka; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.bo.MqConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9093.java b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9093.java similarity index 98% rename from trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9093.java rename to trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9093.java index 028694b42..b9d065691 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9093.java +++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9093.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.kafka; +package org.apache.ozhera.trace.etl.extension.kafka; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.bo.MqConfig; import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9094.java b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9094.java similarity index 98% rename from trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9094.java rename to trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9094.java index 557b09b3d..9c0b36054 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaConfigure9094.java +++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaConfigure9094.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.kafka; +package org.apache.ozhera.trace.etl.extension.kafka; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.bo.MqConfig; import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaExtension.java b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaExtension.java similarity index 97% rename from trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaExtension.java rename to trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaExtension.java index d546368eb..6d0091720 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/KafkaExtension.java +++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/KafkaExtension.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.kafka; +package org.apache.ozhera.trace.etl.extension.kafka; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.api.service.MQExtension; -import com.xiaomi.hera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.api.service.MQExtension; +import org.apache.ozhera.trace.etl.bo.MqConfig; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.consumer.ConsumerRecords; diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/VpcType.java b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/VpcType.java similarity index 93% rename from trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/VpcType.java rename to trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/VpcType.java index aab042b52..bdd8831ed 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/run/mone/trace/etl/extension/kafka/VpcType.java +++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/src/main/java/org/apache/ozhera/trace/etl/extension/kafka/VpcType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.kafka; +package org.apache.ozhera.trace.etl.extension.kafka; public class VpcType { diff --git a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/pom.xml b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/pom.xml index ff9617675..887581ec6 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/pom.xml +++ b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera trace-etl-extensions - 1.0.1-jdk21 + 2.0.0-SNAPSHOT trace-etl-rocketmq-extension @@ -32,13 +32,13 @@ - run.mone + org.apache.ozhera trace-etl-api ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-service ${project.parent.version} diff --git a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/ClientMessageQueue.java b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/ClientMessageQueue.java similarity index 97% rename from trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/ClientMessageQueue.java rename to trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/ClientMessageQueue.java index b04835e20..bd5dd0308 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/ClientMessageQueue.java +++ b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/ClientMessageQueue.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.rocketmq; +package org.apache.ozhera.trace.etl.extension.rocketmq; -import com.xiaomi.hera.trace.etl.common.HashUtil; +import org.apache.ozhera.trace.etl.common.HashUtil; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.common.message.MessageQueue; diff --git a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/ClientMessageQueueWrapper.java b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/ClientMessageQueueWrapper.java similarity index 98% rename from trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/ClientMessageQueueWrapper.java rename to trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/ClientMessageQueueWrapper.java index 9bd8f308e..718a4f84e 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/ClientMessageQueueWrapper.java +++ b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/ClientMessageQueueWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.rocketmq; +package org.apache.ozhera.trace.etl.extension.rocketmq; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.common.message.MessageExt; diff --git a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/RocketMQExtension.java b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/RocketMQExtension.java similarity index 97% rename from trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/RocketMQExtension.java rename to trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/RocketMQExtension.java index 7dde0e298..9350ef3b1 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/run/mone/trace/etl/extension/rocketmq/RocketMQExtension.java +++ b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/src/main/java/org/apache/ozhera/trace/etl/extension/rocketmq/RocketMQExtension.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.extension.rocketmq; +package org.apache.ozhera.trace.etl.extension.rocketmq; -import com.xiaomi.hera.trace.etl.api.service.MQExtension; -import com.xiaomi.hera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.api.service.MQExtension; +import org.apache.ozhera.trace.etl.bo.MqConfig; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; diff --git a/trace-etl/trace-etl-manager/pom.xml b/trace-etl/trace-etl-manager/pom.xml index b38019faa..80bd389ca 100644 --- a/trace-etl/trace-etl-manager/pom.xml +++ b/trace-etl/trace-etl-manager/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 @@ -14,12 +14,12 @@ - run.mone + org.apache.ozhera trace-etl-doris-extension ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-es-extension ${project.parent.version} @@ -54,7 +54,7 @@ spring-boot-maven-plugin 2.7.15 - com.xiaomi.hera.trace.etl.manager.bootstrap.TraceEtlManagerBootstrap + org.apache.ozhera.trace.etl.manager.bootstrap.TraceEtlManagerBootstrap diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java similarity index 96% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java index 1d662c72a..c63fbd1bc 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/bootstrap/TraceEtlManagerBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.bootstrap; +package org.apache.ozhera.trace.etl.manager.bootstrap; import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; import org.mybatis.spring.annotation.MapperScan; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/DataSourceConfig.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/DataSourceConfig.java similarity index 98% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/DataSourceConfig.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/DataSourceConfig.java index 7f35b8758..b92ec154e 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/DataSourceConfig.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/DataSourceConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.config; +package org.apache.ozhera.trace.etl.manager.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.mchange.v2.c3p0.ComboPooledDataSource; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/DubboConfiguration.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/DubboConfiguration.java similarity index 97% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/DubboConfiguration.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/DubboConfiguration.java index 8ec639546..d0d9f818a 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/DubboConfiguration.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/DubboConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.config; +package org.apache.ozhera.trace.etl.manager.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.collect.Maps; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/FilterConfiguration.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/FilterConfiguration.java similarity index 94% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/FilterConfiguration.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/FilterConfiguration.java index cf3fdba49..e365586bf 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/FilterConfiguration.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/FilterConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.config; +package org.apache.ozhera.trace.etl.manager.config; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.manager.filter.RequestHeaderFilter; +import org.apache.ozhera.trace.etl.manager.filter.RequestHeaderFilter; import com.xiaomi.mone.tpc.login.filter.HttpReqUserFilter; import com.xiaomi.mone.tpc.login.util.ConstUtil; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/NacosConfiguration.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/NacosConfiguration.java similarity index 95% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/NacosConfiguration.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/NacosConfiguration.java index 8d98941de..a0f6fa52e 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/NacosConfiguration.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/NacosConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.config; +package org.apache.ozhera.trace.etl.manager.config; import com.alibaba.nacos.api.annotation.NacosProperties; import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/ServiceConfiguration.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/ServiceConfiguration.java similarity index 81% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/ServiceConfiguration.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/ServiceConfiguration.java index f82512d59..a691c771c 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/config/ServiceConfiguration.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/config/ServiceConfiguration.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.config; +package org.apache.ozhera.trace.etl.manager.config; -import com.xiaomi.hera.trace.etl.api.service.TraceEtlService; -import com.xiaomi.hera.trace.etl.mapper.HeraTraceEtlConfigMapper; -import com.xiaomi.hera.trace.etl.service.ManagerService; -import com.xiaomi.hera.trace.etl.service.impl.ManagerServiceImpl; +import org.apache.ozhera.trace.etl.api.service.TraceEtlService; +import org.apache.ozhera.trace.etl.mapper.HeraTraceEtlConfigMapper; +import org.apache.ozhera.trace.etl.service.ManagerService; +import org.apache.ozhera.trace.etl.service.impl.ManagerServiceImpl; import org.apache.dubbo.config.annotation.Reference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/controller/ManagerController.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/controller/ManagerController.java similarity index 94% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/controller/ManagerController.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/controller/ManagerController.java index fadd79e22..c1986f4eb 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/controller/ManagerController.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/controller/ManagerController.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.controller; +package org.apache.ozhera.trace.etl.manager.controller; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.domain.HeraTraceConfigVo; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.domain.PagerVo; -import com.xiaomi.hera.trace.etl.service.ManagerService; +import org.apache.ozhera.trace.etl.domain.HeraTraceConfigVo; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.domain.PagerVo; +import org.apache.ozhera.trace.etl.service.ManagerService; import com.xiaomi.mone.tpc.login.util.UserUtil; import com.xiaomi.mone.tpc.login.vo.AuthUserVo; import com.xiaomi.youpin.infra.rpc.Result; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/controller/TraceController.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/controller/TraceController.java similarity index 83% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/controller/TraceController.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/controller/TraceController.java index 06e09da75..d1cd9c485 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/controller/TraceController.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/controller/TraceController.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.controller; +package org.apache.ozhera.trace.etl.manager.controller; -import com.xiaomi.hera.trace.etl.api.service.DataSourceService; -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; +import org.apache.ozhera.trace.etl.api.service.DataSourceService; +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 lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/dubbo/TraceManagerServiceImpl.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/dubbo/TraceManagerServiceImpl.java similarity index 81% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/dubbo/TraceManagerServiceImpl.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/dubbo/TraceManagerServiceImpl.java index 543b3d1e0..31b6f00d1 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/dubbo/TraceManagerServiceImpl.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/dubbo/TraceManagerServiceImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.dubbo; +package org.apache.ozhera.trace.etl.manager.dubbo; -import com.xiaomi.hera.trace.etl.api.service.TraceManagerService; -import com.xiaomi.hera.trace.etl.domain.HeraTraceConfigVo; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.service.ManagerService; +import org.apache.ozhera.trace.etl.api.service.TraceManagerService; +import org.apache.ozhera.trace.etl.domain.HeraTraceConfigVo; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.service.ManagerService; import com.xiaomi.youpin.infra.rpc.Result; import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; diff --git a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/filter/RequestHeaderFilter.java b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/filter/RequestHeaderFilter.java similarity index 97% rename from trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/filter/RequestHeaderFilter.java rename to trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/filter/RequestHeaderFilter.java index 9eceeb79a..2e2ae2131 100644 --- a/trace-etl/trace-etl-manager/src/main/java/com/xiaomi/hera/trace/etl/manager/filter/RequestHeaderFilter.java +++ b/trace-etl/trace-etl-manager/src/main/java/org/apache/ozhera/trace/etl/manager/filter/RequestHeaderFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.manager.filter; +package org.apache.ozhera.trace.etl.manager.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/trace-etl/trace-etl-metadata/pom.xml b/trace-etl/trace-etl-metadata/pom.xml index a489295aa..063dfedb8 100644 --- a/trace-etl/trace-etl-metadata/pom.xml +++ b/trace-etl/trace-etl-metadata/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone trace-etl - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT trace-etl-metadata @@ -19,13 +19,13 @@ - run.mone + org.apache.ozhera trace-etl-kafka-extension ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-rocketmq-extension ${project.parent.version} @@ -47,7 +47,7 @@ spring-boot-maven-plugin 2.7.15 - run.mone.trace.etl.metadata.bootstrap.TraceEtlMetadataBootstrap + org.apache.ozhera.trace.etl.metadata.bootstrap.TraceEtlMetadataBootstrap diff --git a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/bootstrap/TraceEtlMetadataBootstrap.java b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/bootstrap/TraceEtlMetadataBootstrap.java similarity index 96% rename from trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/bootstrap/TraceEtlMetadataBootstrap.java rename to trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/bootstrap/TraceEtlMetadataBootstrap.java index 2b1a87bf8..9f78d90b9 100644 --- a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/bootstrap/TraceEtlMetadataBootstrap.java +++ b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/bootstrap/TraceEtlMetadataBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.metadata.bootstrap; +package org.apache.ozhera.trace.etl.metadata.bootstrap; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; diff --git a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/DataSourceConfig.java b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/DataSourceConfig.java similarity index 98% rename from trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/DataSourceConfig.java rename to trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/DataSourceConfig.java index 2592635f9..2ce3b6e29 100644 --- a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/DataSourceConfig.java +++ b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/DataSourceConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package run.mone.trace.etl.metadata.config; +package org.apache.ozhera.trace.etl.metadata.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.mchange.v2.c3p0.ComboPooledDataSource; diff --git a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/DubboConfiguration.java b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/DubboConfiguration.java similarity index 97% rename from trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/DubboConfiguration.java rename to trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/DubboConfiguration.java index 71f9633cf..704c754e2 100644 --- a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/DubboConfiguration.java +++ b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/DubboConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.metadata.config; +package org.apache.ozhera.trace.etl.metadata.config; import org.apache.dubbo.config.ApplicationConfig; import org.apache.dubbo.config.ProtocolConfig; diff --git a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/NacosConfiguration.java b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/NacosConfiguration.java similarity index 95% rename from trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/NacosConfiguration.java rename to trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/NacosConfiguration.java index 24f69b13d..be600d629 100644 --- a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/config/NacosConfiguration.java +++ b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/config/NacosConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.metadata.config; +package org.apache.ozhera.trace.etl.metadata.config; import com.alibaba.nacos.api.annotation.NacosProperties; import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig; diff --git a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/dubbo/HeraMetaDataServiceImpl.java b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/dubbo/HeraMetaDataServiceImpl.java similarity index 86% rename from trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/dubbo/HeraMetaDataServiceImpl.java rename to trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/dubbo/HeraMetaDataServiceImpl.java index 324147e83..f6bd0edb6 100644 --- a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/dubbo/HeraMetaDataServiceImpl.java +++ b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/dubbo/HeraMetaDataServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.metadata.dubbo; +package org.apache.ozhera.trace.etl.metadata.dubbo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.xiaomi.hera.trace.etl.api.service.HeraMetaDataService; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaData; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataModel; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataQuery; -import com.xiaomi.hera.trace.etl.mapper.HeraMetaDataMapper; -import com.xiaomi.hera.trace.etl.util.convert.HeraMetaDataConvert; +import org.apache.ozhera.trace.etl.api.service.HeraMetaDataService; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaData; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataModel; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataQuery; +import org.apache.ozhera.trace.etl.mapper.HeraMetaDataMapper; +import org.apache.ozhera.trace.etl.util.convert.HeraMetaDataConvert; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Service; diff --git a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/mq/KafkaHeraMetaDataConsumer.java b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/mq/KafkaHeraMetaDataConsumer.java similarity index 92% rename from trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/mq/KafkaHeraMetaDataConsumer.java rename to trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/mq/KafkaHeraMetaDataConsumer.java index 7d9239e21..e3c526ffd 100644 --- a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/mq/KafkaHeraMetaDataConsumer.java +++ b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/mq/KafkaHeraMetaDataConsumer.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.metadata.mq; +package org.apache.ozhera.trace.etl.metadata.mq; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.google.gson.Gson; -import com.xiaomi.hera.trace.etl.api.service.HeraMetaDataService; -import com.xiaomi.hera.trace.etl.api.service.MQExtension; -import com.xiaomi.hera.trace.etl.bo.MqConfig; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaData; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataMessage; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataPortModel; -import com.xiaomi.hera.trace.etl.mapper.HeraMetaDataMapper; -import com.xiaomi.hera.trace.etl.service.RedisService; -import com.xiaomi.hera.trace.etl.util.convert.HeraMetaDataConvert; +import org.apache.ozhera.trace.etl.api.service.HeraMetaDataService; +import org.apache.ozhera.trace.etl.api.service.MQExtension; +import org.apache.ozhera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaData; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataMessage; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataPortModel; +import org.apache.ozhera.trace.etl.mapper.HeraMetaDataMapper; +import org.apache.ozhera.trace.etl.service.RedisService; +import org.apache.ozhera.trace.etl.util.convert.HeraMetaDataConvert; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -36,7 +36,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; -import run.mone.trace.etl.metadata.util.Const; +import org.apache.ozhera.trace.etl.metadata.util.Const; import javax.annotation.PostConstruct; import java.lang.reflect.Field; diff --git a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/mq/RocketMQHeraMetaDataConsumer.java b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/mq/RocketMQHeraMetaDataConsumer.java similarity index 92% rename from trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/mq/RocketMQHeraMetaDataConsumer.java rename to trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/mq/RocketMQHeraMetaDataConsumer.java index 932bf1cf0..9daf5c2f5 100644 --- a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/mq/RocketMQHeraMetaDataConsumer.java +++ b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/mq/RocketMQHeraMetaDataConsumer.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.metadata.mq; +package org.apache.ozhera.trace.etl.metadata.mq; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.google.gson.Gson; -import com.xiaomi.hera.trace.etl.api.service.HeraMetaDataService; -import com.xiaomi.hera.trace.etl.api.service.MQExtension; -import com.xiaomi.hera.trace.etl.bo.MqConfig; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaData; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataMessage; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataPortModel; -import com.xiaomi.hera.trace.etl.mapper.HeraMetaDataMapper; -import com.xiaomi.hera.trace.etl.service.RedisService; -import com.xiaomi.hera.trace.etl.util.convert.HeraMetaDataConvert; +import org.apache.ozhera.trace.etl.api.service.HeraMetaDataService; +import org.apache.ozhera.trace.etl.api.service.MQExtension; +import org.apache.ozhera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaData; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataMessage; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataPortModel; +import org.apache.ozhera.trace.etl.mapper.HeraMetaDataMapper; +import org.apache.ozhera.trace.etl.service.RedisService; +import org.apache.ozhera.trace.etl.util.convert.HeraMetaDataConvert; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.message.MessageExt; @@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; -import run.mone.trace.etl.metadata.util.Const; +import org.apache.ozhera.trace.etl.metadata.util.Const; import javax.annotation.PostConstruct; import java.lang.reflect.Field; diff --git a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/util/Const.java b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/util/Const.java similarity index 94% rename from trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/util/Const.java rename to trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/util/Const.java index 2ebaffe3b..7004d1af2 100644 --- a/trace-etl/trace-etl-metadata/src/main/java/run/mone/trace/etl/metadata/util/Const.java +++ b/trace-etl/trace-etl-metadata/src/main/java/org/apache/ozhera/trace/etl/metadata/util/Const.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.trace.etl.metadata.util; +package org.apache.ozhera.trace.etl.metadata.util; public class Const { public static final String SYNC_DATA_LOCK_REDIS_KEY = "hera_meta_data_sync"; diff --git a/trace-etl/trace-etl-nginx/pom.xml b/trace-etl/trace-etl-nginx/pom.xml index ccb67da83..f230fa3bf 100644 --- a/trace-etl/trace-etl-nginx/pom.xml +++ b/trace-etl/trace-etl-nginx/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 @@ -16,7 +16,7 @@ trace-etl-service - run.mone + org.apache.ozhera ${project.parent.version} @@ -48,7 +48,7 @@ spring-boot-maven-plugin 2.7.15 - com.xiaomi.hera.trace.etl.nginx.bootstrap.TraceEtlNginxBootstrap + org.apache.ozhera.trace.etl.nginx.bootstrap.TraceEtlNginxBootstrap diff --git a/trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java b/trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java similarity index 96% rename from trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java rename to trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java index bc59cdc82..5e65a1577 100644 --- a/trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java +++ b/trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/bootstrap/TraceEtlNginxBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.nginx.bootstrap; +package org.apache.ozhera.trace.etl.nginx.bootstrap; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; diff --git a/trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/parser/NginxLogToTraceBase.java b/trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/parser/NginxLogToTraceBase.java similarity index 97% rename from trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/parser/NginxLogToTraceBase.java rename to trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/parser/NginxLogToTraceBase.java index 083ed318a..654576222 100644 --- a/trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/parser/NginxLogToTraceBase.java +++ b/trace-etl/trace-etl-nginx/src/main/java/org/apache/ozhera/trace/etl/nginx/parser/NginxLogToTraceBase.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.nginx.parser; +package org.apache.ozhera.trace.etl.nginx.parser; import com.alibaba.fastjson.JSONObject; -import com.xiaomi.hera.trace.etl.domain.NginxJaegerDomain; -import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttrType; -import com.xiaomi.hera.trace.etl.util.ThriftUtil; +import org.apache.ozhera.trace.etl.domain.NginxJaegerDomain; +import org.apache.ozhera.trace.etl.domain.jaegeres.JaegerAttrType; +import org.apache.ozhera.trace.etl.util.ThriftUtil; import org.apache.ozhera.tspandata.TAttributeKey; import org.apache.ozhera.tspandata.TAttributeType; import org.apache.ozhera.tspandata.TAttributes; diff --git a/trace-etl/trace-etl-server/pom.xml b/trace-etl/trace-etl-server/pom.xml index e3dd64c07..f7d771a79 100644 --- a/trace-etl/trace-etl-server/pom.xml +++ b/trace-etl/trace-etl-server/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 @@ -20,25 +20,25 @@ - run.mone + org.apache.ozhera trace-etl-kafka-extension ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-rocketmq-extension ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-doris-extension ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-es-extension ${project.parent.version} @@ -86,7 +86,7 @@ spring-boot-maven-plugin 2.7.15 - com.xiaomi.hera.trace.etl.bootstrap.TraceEtlBootstrap + org.apache.ozhera.trace.etl.bootstrap.TraceEtlBootstrap diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/bootstrap/TraceEtlBootstrap.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/bootstrap/TraceEtlBootstrap.java similarity index 97% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/bootstrap/TraceEtlBootstrap.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/bootstrap/TraceEtlBootstrap.java index c3f913552..d7035d34d 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/bootstrap/TraceEtlBootstrap.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/bootstrap/TraceEtlBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.bootstrap; +package org.apache.ozhera.trace.etl.bootstrap; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/DataSourceConfig.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/DataSourceConfig.java similarity index 98% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/DataSourceConfig.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/DataSourceConfig.java index 56f20522c..1cfb7313a 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/DataSourceConfig.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/DataSourceConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.config; +package org.apache.ozhera.trace.etl.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.mchange.v2.c3p0.ComboPooledDataSource; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/DubboConfiguration.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/DubboConfiguration.java similarity index 98% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/DubboConfiguration.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/DubboConfiguration.java index d2d0d472d..1d15db860 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/DubboConfiguration.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/DubboConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.config; +package org.apache.ozhera.trace.etl.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.collect.Maps; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/NacosConfiguration.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/NacosConfiguration.java similarity index 96% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/NacosConfiguration.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/NacosConfiguration.java index 08c3d4e1d..facb75300 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/NacosConfiguration.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/NacosConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.config; +package org.apache.ozhera.trace.etl.config; import com.alibaba.nacos.api.annotation.NacosProperties; import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/ServiceConfiguration.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/ServiceConfiguration.java similarity index 82% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/ServiceConfiguration.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/ServiceConfiguration.java index eedc7ef15..540260cee 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/ServiceConfiguration.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/ServiceConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.config; +package org.apache.ozhera.trace.etl.config; -import com.xiaomi.hera.trace.etl.mapper.HeraTraceEtlConfigMapper; -import com.xiaomi.hera.trace.etl.service.ManagerService; -import com.xiaomi.hera.trace.etl.service.impl.ManagerServiceImpl; +import org.apache.ozhera.trace.etl.mapper.HeraTraceEtlConfigMapper; +import org.apache.ozhera.trace.etl.service.ManagerService; +import org.apache.ozhera.trace.etl.service.impl.ManagerServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/TraceConfig.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/TraceConfig.java similarity index 91% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/TraceConfig.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/TraceConfig.java index af2e57409..83dc7b3f8 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/config/TraceConfig.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/config/TraceConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.config; +package org.apache.ozhera.trace.etl.config; -import com.xiaomi.hera.trace.etl.domain.HeraTraceConfigVo; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.service.ManagerService; +import org.apache.ozhera.trace.etl.domain.HeraTraceConfigVo; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.service.ManagerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/LocalStorages.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/LocalStorages.java similarity index 93% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/LocalStorages.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/LocalStorages.java index e21cb9ac9..81c58fa6a 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/LocalStorages.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/LocalStorages.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.constant; +package org.apache.ozhera.trace.etl.constant; public class LocalStorages { diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/LockUtil.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/LockUtil.java similarity index 93% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/LockUtil.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/LockUtil.java index 57da8f721..aa6864c88 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/LockUtil.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/LockUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.constant; +package org.apache.ozhera.trace.etl.constant; public class LockUtil { public static final Object lock = new Object(); diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/MetricsName.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/MetricsName.java similarity index 98% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/MetricsName.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/MetricsName.java index 386a370e3..33d67e133 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/MetricsName.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/MetricsName.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.constant; +package org.apache.ozhera.trace.etl.constant; /** * @Description diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/SpanKind.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/SpanKind.java similarity index 95% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/SpanKind.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/SpanKind.java index 4203a7edf..2bc3b3a4e 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/SpanKind.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/SpanKind.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.constant; +package org.apache.ozhera.trace.etl.constant; /** * @Description diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/SpanType.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/SpanType.java similarity index 96% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/SpanType.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/SpanType.java index cf3632513..e615941f5 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/constant/SpanType.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/constant/SpanType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.constant; +package org.apache.ozhera.trace.etl.constant; /** * @Description diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/DataCacheService.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/DataCacheService.java similarity index 99% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/DataCacheService.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/DataCacheService.java index c8c1fd097..a8b982d46 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/DataCacheService.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/DataCacheService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.consumer; +package org.apache.ozhera.trace.etl.consumer; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.base.Stopwatch; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/EnterManager.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/EnterManager.java similarity index 92% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/EnterManager.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/EnterManager.java index 74a72c8fc..01f6fb565 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/EnterManager.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/EnterManager.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.consumer; +package org.apache.ozhera.trace.etl.consumer; import com.google.common.util.concurrent.Monitor; -import com.xiaomi.hera.trace.etl.api.service.IEnterManager; +import org.apache.ozhera.trace.etl.api.service.IEnterManager; import lombok.Getter; import org.springframework.stereotype.Service; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/KafkaConsumerService.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/KafkaConsumerService.java similarity index 91% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/KafkaConsumerService.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/KafkaConsumerService.java index 0ebfba2ba..b93a46b1b 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/KafkaConsumerService.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/KafkaConsumerService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.consumer; +package org.apache.ozhera.trace.etl.consumer; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.api.service.IEnterManager; -import com.xiaomi.hera.trace.etl.api.service.IMetricsParseService; -import com.xiaomi.hera.trace.etl.api.service.MQExtension; -import com.xiaomi.hera.trace.etl.bo.MqConfig; -import com.xiaomi.hera.trace.etl.util.ThriftUtil; +import org.apache.ozhera.trace.etl.api.service.IEnterManager; +import org.apache.ozhera.trace.etl.api.service.IMetricsParseService; +import org.apache.ozhera.trace.etl.api.service.MQExtension; +import org.apache.ozhera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.util.ThriftUtil; import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MetricsParseService.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/MetricsParseService.java similarity index 98% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MetricsParseService.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/MetricsParseService.java index 24a52a170..c0f01ac7e 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MetricsParseService.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/MetricsParseService.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.consumer; +package org.apache.ozhera.trace.etl.consumer; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.api.service.DataSourceService; -import com.xiaomi.hera.trace.etl.api.service.IMetricsParseService; -import com.xiaomi.hera.trace.etl.config.TraceConfig; -import com.xiaomi.hera.trace.etl.constant.SpanKind; -import com.xiaomi.hera.trace.etl.constant.SpanType; -import com.xiaomi.hera.trace.etl.domain.DriverDomain; -import com.xiaomi.hera.trace.etl.domain.ErrorTraceMessage; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.domain.JaegerTracerDomain; -import com.xiaomi.hera.trace.etl.domain.MetricsParseResult; -import com.xiaomi.hera.trace.etl.service.HeraContextService; -import com.xiaomi.hera.trace.etl.util.ThriftUtil; +import org.apache.ozhera.trace.etl.api.service.DataSourceService; +import org.apache.ozhera.trace.etl.api.service.IMetricsParseService; +import org.apache.ozhera.trace.etl.config.TraceConfig; +import org.apache.ozhera.trace.etl.constant.SpanKind; +import org.apache.ozhera.trace.etl.constant.SpanType; +import org.apache.ozhera.trace.etl.domain.DriverDomain; +import org.apache.ozhera.trace.etl.domain.ErrorTraceMessage; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.domain.JaegerTracerDomain; +import org.apache.ozhera.trace.etl.domain.MetricsParseResult; +import org.apache.ozhera.trace.etl.service.HeraContextService; +import org.apache.ozhera.trace.etl.util.ThriftUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.ozhera.tspandata.*; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MutiMetricsCall.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/MutiMetricsCall.java similarity index 97% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MutiMetricsCall.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/MutiMetricsCall.java index 46b95471f..d3e21da13 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MutiMetricsCall.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/MutiMetricsCall.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.consumer; +package org.apache.ozhera.trace.etl.consumer; import com.xiaomi.youpin.prometheus.client.XmCounter; import com.xiaomi.youpin.prometheus.client.XmHistogram; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/RocketMQConsumerService.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/RocketMQConsumerService.java similarity index 90% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/RocketMQConsumerService.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/RocketMQConsumerService.java index 2bf4fa038..30d3f96d2 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/RocketMQConsumerService.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/consumer/RocketMQConsumerService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.consumer; +package org.apache.ozhera.trace.etl.consumer; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.api.service.IEnterManager; -import com.xiaomi.hera.trace.etl.api.service.IMetricsParseService; -import com.xiaomi.hera.trace.etl.api.service.MQExtension; -import com.xiaomi.hera.trace.etl.bo.MqConfig; -import com.xiaomi.hera.trace.etl.util.ThriftUtil; +import org.apache.ozhera.trace.etl.api.service.IEnterManager; +import org.apache.ozhera.trace.etl.api.service.IMetricsParseService; +import org.apache.ozhera.trace.etl.api.service.MQExtension; +import org.apache.ozhera.trace.etl.bo.MqConfig; +import org.apache.ozhera.trace.etl.util.ThriftUtil; import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQClientException; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/dubbo/TraceEtlServiceImpl.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/dubbo/TraceEtlServiceImpl.java similarity index 85% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/dubbo/TraceEtlServiceImpl.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/dubbo/TraceEtlServiceImpl.java index d917bf3dd..b9bf30497 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/dubbo/TraceEtlServiceImpl.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/dubbo/TraceEtlServiceImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.dubbo; +package org.apache.ozhera.trace.etl.dubbo; -import com.xiaomi.hera.trace.etl.config.TraceConfig; -import com.xiaomi.hera.trace.etl.api.service.TraceEtlService; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.config.TraceConfig; +import org.apache.ozhera.trace.etl.api.service.TraceEtlService; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/util/nacos/NacosClientUtil.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/util/nacos/NacosClientUtil.java similarity index 98% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/util/nacos/NacosClientUtil.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/util/nacos/NacosClientUtil.java index 4ae3977be..98e263825 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/util/nacos/NacosClientUtil.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/util/nacos/NacosClientUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util.nacos; +package org.apache.ozhera.trace.etl.util.nacos; import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.config.ConfigService; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/util/prometheus/HTTPServer.java b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/util/prometheus/HTTPServer.java similarity index 98% rename from trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/util/prometheus/HTTPServer.java rename to trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/util/prometheus/HTTPServer.java index 6d5648c84..bab8784d0 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/util/prometheus/HTTPServer.java +++ b/trace-etl/trace-etl-server/src/main/java/org/apache/ozhera/trace/etl/util/prometheus/HTTPServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util.prometheus; +package org.apache.ozhera.trace.etl.util.prometheus; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.collect.Sets; @@ -21,8 +21,8 @@ import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; -import com.xiaomi.hera.trace.etl.consumer.DataCacheService; -import com.xiaomi.hera.trace.etl.consumer.EnterManager; +import org.apache.ozhera.trace.etl.consumer.DataCacheService; +import org.apache.ozhera.trace.etl.consumer.EnterManager; import com.xiaomi.youpin.prometheus.client.binder.ClassLoaderMetricsReduced; import com.xiaomi.youpin.prometheus.client.binder.JvmGcMetricsReduced; import com.xiaomi.youpin.prometheus.client.binder.JvmMemoryMetricsReduced; diff --git a/trace-etl/trace-etl-service/pom.xml b/trace-etl/trace-etl-service/pom.xml index 1944d86f1..e8cf8dc4c 100644 --- a/trace-etl/trace-etl-service/pom.xml +++ b/trace-etl/trace-etl-service/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> trace-etl - run.mone - 1.0.1-jdk21 + org.apache.ozhera + 2.0.0-SNAPSHOT 4.0.0 @@ -52,25 +52,25 @@ - run.mone + org.apache.ozhera trace-etl-api ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-common ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-dao ${project.parent.version} - run.mone + org.apache.ozhera trace-etl-domain ${project.parent.version} diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/HeraContextService.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/HeraContextService.java similarity index 95% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/HeraContextService.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/HeraContextService.java index 1cff93e26..48e793fb9 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/HeraContextService.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/HeraContextService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.service; +package org.apache.ozhera.trace.etl.service; import java.util.Set; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/ManagerService.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/ManagerService.java similarity index 85% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/ManagerService.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/ManagerService.java index c34e15e25..4529e4d0a 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/ManagerService.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/ManagerService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.xiaomi.hera.trace.etl.service; +package org.apache.ozhera.trace.etl.service; -import com.xiaomi.hera.trace.etl.domain.HeraTraceConfigVo; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.domain.PageData; +import org.apache.ozhera.trace.etl.domain.HeraTraceConfigVo; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.domain.PageData; import com.xiaomi.youpin.infra.rpc.Result; import java.util.List; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/RedisService.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/RedisService.java similarity index 95% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/RedisService.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/RedisService.java index e5ebe42be..8bef01c40 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/RedisService.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/RedisService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.xiaomi.hera.trace.etl.service; +package org.apache.ozhera.trace.etl.service; public interface RedisService { diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/HeraContextServiceImpl.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/HeraContextServiceImpl.java similarity index 93% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/HeraContextServiceImpl.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/HeraContextServiceImpl.java index 0b98ef095..47f32e648 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/HeraContextServiceImpl.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/HeraContextServiceImpl.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.xiaomi.hera.trace.etl.service.impl; +package org.apache.ozhera.trace.etl.service.impl; -import com.xiaomi.hera.trace.etl.service.HeraContextService; +import org.apache.ozhera.trace.etl.service.HeraContextService; import org.springframework.stereotype.Service; import java.util.HashSet; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/ManagerServiceImpl.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/ManagerServiceImpl.java similarity index 92% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/ManagerServiceImpl.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/ManagerServiceImpl.java index 6f766d86f..7d5968fb8 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/ManagerServiceImpl.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/ManagerServiceImpl.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.service.impl; +package org.apache.ozhera.trace.etl.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.xiaomi.hera.trace.etl.api.service.TraceEtlService; -import com.xiaomi.hera.trace.etl.domain.HeraTraceConfigVo; -import com.xiaomi.hera.trace.etl.domain.HeraTraceEtlConfig; -import com.xiaomi.hera.trace.etl.domain.PageData; -import com.xiaomi.hera.trace.etl.mapper.HeraTraceEtlConfigMapper; -import com.xiaomi.hera.trace.etl.service.ManagerService; -import com.xiaomi.hera.trace.etl.util.pool.AsyncNotify; +import org.apache.ozhera.trace.etl.api.service.TraceEtlService; +import org.apache.ozhera.trace.etl.domain.HeraTraceConfigVo; +import org.apache.ozhera.trace.etl.domain.HeraTraceEtlConfig; +import org.apache.ozhera.trace.etl.domain.PageData; +import org.apache.ozhera.trace.etl.mapper.HeraTraceEtlConfigMapper; +import org.apache.ozhera.trace.etl.service.ManagerService; +import org.apache.ozhera.trace.etl.util.pool.AsyncNotify; import com.xiaomi.youpin.infra.rpc.Result; import com.xiaomi.youpin.infra.rpc.errors.GeneralCodes; import lombok.extern.slf4j.Slf4j; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/RedisServiceImpl.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/RedisServiceImpl.java similarity index 98% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/RedisServiceImpl.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/RedisServiceImpl.java index ee2df291e..7db8c981b 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/service/impl/RedisServiceImpl.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/service/impl/RedisServiceImpl.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.service.impl; +package org.apache.ozhera.trace.etl.service.impl; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.hera.trace.etl.service.RedisService; +import org.apache.ozhera.trace.etl.service.RedisService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ExecutorUtil.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/ExecutorUtil.java similarity index 98% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ExecutorUtil.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/ExecutorUtil.java index cca9f106a..84ac309a1 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ExecutorUtil.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/ExecutorUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util; +package org.apache.ozhera.trace.etl.util; import lombok.extern.slf4j.Slf4j; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/MessageUtil.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/MessageUtil.java similarity index 97% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/MessageUtil.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/MessageUtil.java index 2e938464a..af5fdc4b2 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/MessageUtil.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/MessageUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util; +package org.apache.ozhera.trace.etl.util; public class MessageUtil { diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ThriftUtil.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/ThriftUtil.java similarity index 97% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ThriftUtil.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/ThriftUtil.java index 54c7101b7..830da25cd 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ThriftUtil.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/ThriftUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util; +package org.apache.ozhera.trace.etl.util; import org.apache.ozhera.tspandata.TAttributeType; import org.apache.ozhera.tspandata.TValue; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/TraceUtil.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/TraceUtil.java similarity index 99% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/TraceUtil.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/TraceUtil.java index 4ebadc2b8..2f9415452 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/TraceUtil.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/TraceUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util; +package org.apache.ozhera.trace.etl.util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/convert/HeraMetaDataConvert.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/convert/HeraMetaDataConvert.java similarity index 82% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/convert/HeraMetaDataConvert.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/convert/HeraMetaDataConvert.java index c7e8f9e72..7a6a7e3b0 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/convert/HeraMetaDataConvert.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/convert/HeraMetaDataConvert.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util.convert; +package org.apache.ozhera.trace.etl.util.convert; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaData; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataMessage; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataModel; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaData; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataMessage; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataModel; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/convert/HeraMetaDataPortModelConvert.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/convert/HeraMetaDataPortModelConvert.java similarity index 85% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/convert/HeraMetaDataPortModelConvert.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/convert/HeraMetaDataPortModelConvert.java index 30c94f15e..cd1da1658 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/convert/HeraMetaDataPortModelConvert.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/convert/HeraMetaDataPortModelConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util.convert; +package org.apache.ozhera.trace.etl.util.convert; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataPort; -import com.xiaomi.hera.trace.etl.domain.metadata.HeraMetaDataPortModel; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataPort; +import org.apache.ozhera.trace.etl.domain.metadata.HeraMetaDataPortModel; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/pool/AsyncNotify.java b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/pool/AsyncNotify.java similarity index 96% rename from trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/pool/AsyncNotify.java rename to trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/pool/AsyncNotify.java index 4de1362c5..94d6e57cb 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/pool/AsyncNotify.java +++ b/trace-etl/trace-etl-service/src/main/java/org/apache/ozhera/trace/etl/util/pool/AsyncNotify.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.hera.trace.etl.util.pool; +package org.apache.ozhera.trace.etl.util.pool; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component;