You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/18 15:34:48 UTC
[shardingsphere] branch master updated: Update content if advisors.yaml (#22959)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1be8a5ade3c Update content if advisors.yaml (#22959)
1be8a5ade3c is described below
commit 1be8a5ade3c576cbfd7be4c89f2c5fcf0133ab00
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 18 23:34:41 2022 +0800
Update content if advisors.yaml (#22959)
---
.../yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java | 10 +++++-----
agent/core/src/test/resources/advisors.yaml | 10 +++++-----
.../prometheus/src/main/resources/prometheus/advisors.yaml | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
index 58241b33dbf..f7aacdc8fb7 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
@@ -40,20 +40,20 @@ public final class YamlAdvisorsConfigurationSwapperTest {
assertThat(actual.getAdvisors().size(), is(5));
List<YamlAdvisorConfiguration> actualYamlAdvisorConfigs = new ArrayList<>(actual.getAdvisors());
assertYamlAdvisorConfiguration(actualYamlAdvisorConfigs.get(0), createExpectedYamlAdvisorConfiguration("org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask",
- "org.apache.shardingsphere.agent.metrics.api.advice.CommandExecutorTaskAdvice",
+ "org.apache.shardingsphere.agent.metrics.core.advice.CommandExecutorTaskAdvice",
Arrays.asList(createExpectedYamlPointcutConfiguration("run", "instance"), createExpectedYamlPointcutConfiguration("processException", "instance"))));
assertYamlAdvisorConfiguration(actualYamlAdvisorConfigs.get(1), createExpectedYamlAdvisorConfiguration("org.apache.shardingsphere.proxy.frontend.netty.FrontendChannelInboundHandler",
- "org.apache.shardingsphere.agent.metrics.api.advice.ChannelHandlerAdvice",
+ "org.apache.shardingsphere.agent.metrics.core.advice.ChannelHandlerAdvice",
Arrays.asList(createExpectedYamlPointcutConfiguration("channelActive", "instance"),
createExpectedYamlPointcutConfiguration("channelRead", "instance"), createExpectedYamlPointcutConfiguration("channelInactive", "instance"))));
assertYamlAdvisorConfiguration(actualYamlAdvisorConfigs.get(2), createExpectedYamlAdvisorConfiguration("org.apache.shardingsphere.infra.route.engine.SQLRouteEngine",
- "org.apache.shardingsphere.agent.metrics.api.advice.SQLRouteEngineAdvice", Collections.singleton(createExpectedYamlPointcutConfiguration("route", "instance"))));
+ "org.apache.shardingsphere.agent.metrics.core.advice.SQLRouteEngineAdvice", Collections.singleton(createExpectedYamlPointcutConfiguration("route", "instance"))));
assertYamlAdvisorConfiguration(actualYamlAdvisorConfigs.get(3), createExpectedYamlAdvisorConfiguration(
"org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.BackendTransactionManager",
- "org.apache.shardingsphere.agent.metrics.api.advice.TransactionAdvice",
+ "org.apache.shardingsphere.agent.metrics.core.advice.TransactionAdvice",
Arrays.asList(createExpectedYamlPointcutConfiguration("commit", "instance"), createExpectedYamlPointcutConfiguration("rollback", "instance"))));
assertYamlAdvisorConfiguration(actualYamlAdvisorConfigs.get(4), createExpectedYamlAdvisorConfiguration("org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecoratorHelper",
- "org.apache.shardingsphere.agent.metrics.api.advice.DataSourceAdvice", Collections.singleton(createExpectedYamlPointcutConfiguration("decorate", "static"))));
+ "org.apache.shardingsphere.agent.metrics.core.advice.DataSourceAdvice", Collections.singleton(createExpectedYamlPointcutConfiguration("decorate", "static"))));
}
private void assertYamlAdvisorConfiguration(final YamlAdvisorConfiguration actual, final YamlAdvisorConfiguration expected) {
diff --git a/agent/core/src/test/resources/advisors.yaml b/agent/core/src/test/resources/advisors.yaml
index e1ff1df3f8b..ec4e8cc7d6e 100644
--- a/agent/core/src/test/resources/advisors.yaml
+++ b/agent/core/src/test/resources/advisors.yaml
@@ -17,14 +17,14 @@
advisors:
- target: org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask
- advice: org.apache.shardingsphere.agent.metrics.api.advice.CommandExecutorTaskAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.CommandExecutorTaskAdvice
pointcuts:
- name: run
type: instance
- name: processException
type: instance
- target: org.apache.shardingsphere.proxy.frontend.netty.FrontendChannelInboundHandler
- advice: org.apache.shardingsphere.agent.metrics.api.advice.ChannelHandlerAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.ChannelHandlerAdvice
pointcuts:
- name: channelActive
type: instance
@@ -33,19 +33,19 @@ advisors:
- name: channelInactive
type: instance
- target: org.apache.shardingsphere.infra.route.engine.SQLRouteEngine
- advice: org.apache.shardingsphere.agent.metrics.api.advice.SQLRouteEngineAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.SQLRouteEngineAdvice
pointcuts:
- name: route
type: instance
- target: org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.BackendTransactionManager
- advice: org.apache.shardingsphere.agent.metrics.api.advice.TransactionAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.TransactionAdvice
pointcuts:
- name: commit
type: instance
- name: rollback
type: instance
- target: org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecoratorHelper
- advice: org.apache.shardingsphere.agent.metrics.api.advice.DataSourceAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.DataSourceAdvice
pointcuts:
- name: decorate
type: static
diff --git a/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/advisors.yaml b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/advisors.yaml
index 95ec3c23f80..9a43f7dc19e 100644
--- a/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/advisors.yaml
+++ b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/advisors.yaml
@@ -17,14 +17,14 @@
advisors:
- target: org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask
- advice: org.apache.shardingsphere.agent.metrics.api.advice.CommandExecutorTaskAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.CommandExecutorTaskAdvice
pointcuts:
- name: run
type: instance
- name: processException
type: instance
- target: org.apache.shardingsphere.proxy.frontend.netty.FrontendChannelInboundHandler
- advice: org.apache.shardingsphere.agent.metrics.api.advice.ChannelHandlerAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.ChannelHandlerAdvice
pointcuts:
- name: channelActive
type: instance
@@ -33,19 +33,19 @@ advisors:
- name: channelInactive
type: instance
- target: org.apache.shardingsphere.infra.route.engine.SQLRouteEngine
- advice: org.apache.shardingsphere.agent.metrics.api.advice.SQLRouteEngineAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.SQLRouteEngineAdvice
pointcuts:
- name: route
type: instance
- target: org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.JDBCBackendTransactionManager
- advice: org.apache.shardingsphere.agent.metrics.api.advice.TransactionAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.TransactionAdvice
pointcuts:
- name: commit
type: instance
- name: rollback
type: instance
- target: org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine
- advice: org.apache.shardingsphere.agent.metrics.api.advice.SQLParserEngineAdvice
+ advice: org.apache.shardingsphere.agent.metrics.core.advice.SQLParserEngineAdvice
pointcuts:
- name: parse
type: instance