This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a change to branch clear-code-author
in repository https://gitbox.apache.org/repos/asf/ozhera.git
from d1a5d260 fix: clear author info
add 4bddd0a7 feat: add agent config and function (#584)
add a08b4860 feat: add new message type and optimize prompt logic (#584)
(#585)
add 5f31d053 feat: add trace analysis service (#590)
add 6e45d594 Merge branch 'master' into intelligence-front-end
add 127622e3 feat: merge Intelligence front end branch to master (#594)
add 01212237 feat: add trace downgrade strategy switch (#592) (#595)
add a1d5d9e6 Merge branch 'master' into clear-code-author
No new revisions were added by this update.
Summary of changes:
.../client/bootstrap/HeraDemoClientBootstrap.java | 3 -
.../client/config/PrometheusConfiguration.java | 1 -
ozhera-intelligence/README.md | 29 +-
ozhera-intelligence/README_cn.md | 15 +-
.../rootanalysis/HeraRootCaseAnalyseRes.java | 4 -
.../domain/rootanalysis/LogPromptResult.java | 6 +
.../domain/rootanalysis/MetricsPromptResult.java | 4 +
.../domain/rootanalysis/TracePromptResult.java | 13 +
.../domain/rootanalysis/TraceQueryParam.java | 2 +-
.../domain/rootanalysis/constant/Prompts.java | 175 ++++++++++++
.../rootanalysis/constant}/RootAnalysisConst.java | 2 +-
.../src/main/resources/application.properties | 5 +-
.../resources/config/opensource-outer.properties | 4 +-
.../ozhera-intelligence-service/pom.xml | 7 +
.../intelligence/agents/config/AgentConfig.java | 66 +++++
.../agents/function/TraceAnalysisFunction.java | 97 +++++++
.../ozhera/intelligence/service/LogService.java | 4 -
.../intelligence/service/MetricsService.java | 4 -
.../ozhera/intelligence/service/PromptService.java | 160 +++++++++--
.../intelligence/service/TraceAnalysisService.java | 261 ++++++++++++++++++
.../ozhera/intelligence/service/TraceService.java | 24 +-
.../ozhera/intelligence/util/HttpClient.java | 4 -
.../intelligence/service/PromptServiceTest.java | 295 +++++++++++++++++++++
.../ozhera/log/agent/channel/ChannelEngine.java | 1 -
.../ozhera/log/agent/extension/KafkaExporter.java | 29 +-
.../ozhera/log/agent/extension/KafkaService.java | 32 ++-
.../ozhera/log/agent/extension/RmqExporter.java | 7 +-
.../log/agent/extension/RocketMQService.java | 1 -
.../log/agent/extension/TopAppPartitioner.java | 56 ++++
.../extension/nacos/AppPartitionConfigService.java | 168 ++++++++++++
.../agent/extension/nacos/NacosConfigUtil.java} | 26 +-
.../log/agent/factory/OutPutServiceFactory.java | 1 -
.../OuterChannelDefineLocatorExtensionImpl.java | 1 -
.../log-agent/src/main/resources/config.properties | 4 +-
.../ozhera/monitor/pojo/BasicUrlTypePOJO.java | 1 -
.../ozhera/monitor/pojo/MetricLabelKindPOJO.java | 1 -
.../ozhera/monitor/pojo/ReqSlowMetricsPOJO.java | 1 -
.../alertmanager/impl/AlarmExprServiceOuter.java | 24 ++
.../service/api/MetricsLabelKindService.java | 1 -
.../api/impl/AlarmPresetMetricsServiceImpl.java | 1 -
.../api/impl/AppAlarmServiceExtensionImpl.java | 1 -
.../AppGrafanaMappingServiceExtensionImpl.java | 1 -
.../api/impl/ComputeTimerServiceExtensionImpl.java | 1 -
.../monitor/service/api/impl/IAMServiceImpl.java | 1 -
.../api/impl/MetricsLabelKindServiceImpl.java | 1 -
.../api/impl/ReqErrorMetricsServiceImpl.java | 1 -
.../api/impl/ReqSlowMetricsServiceImpl.java | 1 -
.../monitor/service/api/impl/TeslaServiceImpl.java | 1 -
.../monitor/service/es/EsExtensionServiceImpl.java | 1 -
.../service/helper/AlertHelperExtensionImpl.java | 1 -
.../prometheus/AlarmServiceExtensionImpl.java | 1 -
..._intelligence_config_#_DEFAULT_GROUP.properties | 2 +
.../hera_trace_config_#_DEFAULT_GROUP.properties | 5 +-
...imonitor_open_config_#_DEFAULT_GROUP.properties | 3 +
.../agent/bootstrap/PrometheusAgentBootstrap.java | 3 -
.../java/org/apache/ozhera/webhook/Bootstrap.java | 3 -
.../webhook/controller/HeraWebhookController.java | 4 -
.../apache/ozhera/webhook/domain/JsonPatch.java | 1 -
.../ozhera/webhook/service/HeraWebhookService.java | 2 -
.../service/impl/HeraWebhookServiceImpl.java | 1 -
pom.xml | 7 +
.../client/binder/ClassLoaderMetricsReduced.java | 1 -
.../all/client/binder/JvmGcMetricsReduced.java | 1 -
.../all/client/binder/JvmMemoryMetricsReduced.java | 1 -
.../all/client/binder/JvmThreadMetricsReduced.java | 1 -
.../prometheus/starter/all/domain/Const.java | 1 -
.../starter/all/factory/ServiceFactory.java | 2 -
.../all/service/MilinePrometheusService.java | 1 -
.../trace/etl/api/service/TraceManagerService.java | 1 -
.../trace/etl/api/service/TraceQueryService.java | 4 -
.../apache/ozhera/trace/etl/common/HashUtil.java | 1 -
.../ozhera/trace/etl/common/TimeConverter.java | 1 -
.../ozhera/trace/etl/domain/DriverDomain.java | 1 -
.../ozhera/trace/etl/domain/HeraTraceConfigVo.java | 1 -
.../trace/etl/domain/JaegerTracerDomain.java | 1 -
.../trace/etl/domain/MetricsParseResult.java | 53 +---
.../ozhera/trace/etl/domain/NginxJaegerDomain.java | 3 +-
.../apache/ozhera/trace/etl/domain/PagerVo.java | 1 -
.../trace/etl/domain/metadata/HeraMetaData.java | 3 -
.../etl/domain/metadata/HeraMetaDataMessage.java | 3 -
.../etl/domain/metadata/HeraMetaDataModel.java | 3 -
.../etl/domain/metadata/HeraMetaDataPort.java | 3 -
.../etl/domain/metadata/HeraMetaDataPortModel.java | 3 -
.../etl/domain/metadata/HeraMetaDataType.java | 3 -
.../ozhera/trace/etl/domain/tracequery/Span.java | 3 +-
.../ozhera/trace/etl/domain/tracequery/Trace.java | 3 +-
.../etl/domain/tracequery/TraceIdQueryVo.java | 3 +-
.../etl/domain/tracequery/TraceListQueryVo.java | 3 +-
.../etl/domain/tracequery/TraceOperationsVo.java | 3 +-
.../etl/domain/tracequery/TraceQueryResult.java | 3 +-
.../etl/es/bootstrap/TraceEtlEsBootstrap.java | 3 -
.../trace/etl/es/config/ServiceConfiguration.java | 1 -
.../ozhera/trace/etl/es/config/TraceConfig.java | 1 -
.../trace/etl/es/consumer/ConsumerService.java | 5 -
.../etl/es/consumer/KafkaTraceSpanConsumer.java | 1 -
.../etl/es/consumer/RocketMQTraceSpanConsumer.java | 1 -
.../ozhera/trace/etl/es/domain/FilterResult.java | 1 -
.../ozhera/trace/etl/es/domain/FutureRequest.java | 1 -
.../ozhera/trace/etl/es/domain/LocalStorages.java | 1 -
.../trace/etl/es/dubbo/TraceEtlServiceImpl.java | 1 -
.../etl/extension/doris/QueryDorisService.java | 3 +-
.../trace/etl/extension/es/QueryEsService.java | 3 +-
.../etl/extension/rocketmq/ClientMessageQueue.java | 3 +-
.../rocketmq/ClientMessageQueueWrapper.java | 3 +-
.../bootstrap/TraceEtlManagerBootstrap.java | 3 -
.../etl/manager/config/FilterConfiguration.java | 3 +-
.../etl/manager/config/ServiceConfiguration.java | 3 +-
.../etl/manager/controller/ManagerController.java | 3 +-
.../etl/manager/controller/TraceController.java | 3 +-
.../etl/manager/dubbo/TraceManagerServiceImpl.java | 3 +-
.../etl/manager/dubbo/TraceQueryServiceImpl.java | 4 -
.../etl/manager/filter/RequestHeaderFilter.java | 3 +-
.../bootstrap/TraceEtlMetadataBootstrap.java | 3 -
.../metadata/dubbo/HeraMetaDataServiceImpl.java | 4 -
.../etl/metadata/mq/KafkaHeraMetaDataConsumer.java | 3 -
.../metadata/mq/RocketMQHeraMetaDataConsumer.java | 3 -
.../nginx/bootstrap/TraceEtlNginxBootstrap.java | 3 -
.../etl/nginx/parser/NginxLogToTraceBase.java | 1 -
trace-etl/trace-etl-server/README.md | 20 +-
trace-etl/trace-etl-server/README_CN.md | 21 +-
.../trace/etl/bootstrap/TraceEtlBootstrap.java | 3 -
.../trace/etl/config/ServiceConfiguration.java | 3 +-
.../ozhera/trace/etl/config/TraceConfig.java | 3 +-
.../ozhera/trace/etl/constant/MetricsName.java | 3 +-
.../apache/ozhera/trace/etl/constant/SpanKind.java | 3 +-
.../apache/ozhera/trace/etl/constant/SpanType.java | 3 +-
.../trace/etl/consumer/MetricsParseService.java | 25 +-
.../etl/consumer/RocketMQConsumerService.java | 5 -
.../trace/etl/dubbo/TraceEtlServiceImpl.java | 3 +-
.../apache/ozhera/trace/etl/test/TestConsumer.java | 3 +-
.../trace/etl/service/HeraContextService.java | 3 +-
.../ozhera/trace/etl/service/ManagerService.java | 3 +-
.../etl/service/impl/HeraContextServiceImpl.java | 3 +-
.../trace/etl/service/impl/ManagerServiceImpl.java | 3 +-
.../ozhera/trace/etl/util/pool/AsyncNotify.java | 3 +-
135 files changed, 1553 insertions(+), 320 deletions(-)
create mode 100644
ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/constant/Prompts.java
rename
ozhera-intelligence/{ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service
=>
ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/constant}/RootAnalysisConst.java
(93%)
create mode 100644
ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/agents/config/AgentConfig.java
create mode 100644
ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/agents/function/TraceAnalysisFunction.java
create mode 100644
ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/TraceAnalysisService.java
create mode 100644
ozhera-intelligence/ozhera-intelligence-service/src/test/java/org/apache/ozhera/intelligence/service/PromptServiceTest.java
create mode 100644
ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/extension/TopAppPartitioner.java
create mode 100644
ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/extension/nacos/AppPartitionConfigService.java
copy
ozhera-log/{log-manager/src/main/java/org/apache/ozhera/log/manager/common/exception/MilogManageException.java
=>
log-agent/src/main/java/org/apache/ozhera/log/agent/extension/nacos/NacosConfigUtil.java}
(54%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
