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 2021/01/21 16:48:21 UTC
[shardingsphere] branch master updated: refactor agent
defineInterceptor api (#9122)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 ac76ed0 refactor agent defineInterceptor api (#9122)
ac76ed0 is described below
commit ac76ed0c179df3f8e6229d737235e0e00fa7960e
Author: xiaoyu <54...@qq.com>
AuthorDate: Fri Jan 22 00:47:48 2021 +0800
refactor agent defineInterceptor api (#9122)
---
.../definition/AbstractPluginDefinitionService.java | 20 +++++++++++---------
.../agent/core/plugin/PluginLoader.java | 2 +-
.../BaseLoggingPluginDefinitionService.java | 7 ++-----
.../definition/MetricsPluginDefinitionService.java | 15 ++++++---------
.../MetricsPluginDefinitionServiceTest.java | 2 +-
.../definition/JaegerPluginDefinitionService.java | 11 ++++-------
.../JaegerPluginDefinitionServiceTest.java | 2 +-
.../OpenTracingPluginDefinitionService.java | 11 ++++-------
.../OpenTracingPluginDefinitionServiceTest.java | 2 +-
.../definition/ZipkinPluginDefinitionService.java | 11 ++++-------
.../ZipkinPluginDefinitionServiceTest.java | 2 +-
11 files changed, 36 insertions(+), 49 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java b/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
index 5cd562e..dfd3637 100644
--- a/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
+++ b/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
@@ -20,8 +20,6 @@ package org.apache.shardingsphere.agent.spi.definition;
import com.google.common.collect.Maps;
import java.util.Collection;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
-
-import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -33,13 +31,21 @@ public abstract class AbstractPluginDefinitionService implements PluginDefinitio
private final Map<String, PluginInterceptorPoint.Builder> interceptorPointMap = Maps.newHashMap();
/**
- * Define to collection of plugin interceptor point.
+ * Define interceptors to collection of plugin interceptor point.
+ */
+ public abstract void defineInterceptors();
+
+ /**
+ * Install to collection of plugin interceptor point.
*
* @return collection of plugin interceptor point
*/
- public abstract Collection<PluginInterceptorPoint> define();
+ public final Collection<PluginInterceptorPoint> install() {
+ defineInterceptors();
+ return interceptorPointMap.values().stream().map(PluginInterceptorPoint.Builder::install).collect(Collectors.toList());
+ }
- protected final PluginInterceptorPoint.Builder intercept(final String classNameOfTarget) {
+ protected final PluginInterceptorPoint.Builder defineInterceptor(final String classNameOfTarget) {
if (interceptorPointMap.containsKey(classNameOfTarget)) {
return interceptorPointMap.get(classNameOfTarget);
}
@@ -47,8 +53,4 @@ public abstract class AbstractPluginDefinitionService implements PluginDefinitio
interceptorPointMap.put(classNameOfTarget, builder);
return builder;
}
-
- protected List<PluginInterceptorPoint> install() {
- return interceptorPointMap.values().stream().map(PluginInterceptorPoint.Builder::install).collect(Collectors.toList());
- }
}
diff --git a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
index 596ea41..ecfacc9 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
+++ b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
@@ -283,7 +283,7 @@ public final class PluginLoader extends ClassLoader implements Closeable {
private void buildPluginInterceptorPointMap(final PluginDefinitionService pluginDefinitionService, final Map<String, PluginInterceptorPoint> pointMap) {
AbstractPluginDefinitionService definitionService = (AbstractPluginDefinitionService) pluginDefinitionService;
- definitionService.define().forEach(each -> {
+ definitionService.install().forEach(each -> {
String target = each.getClassNameOfTarget();
if (pointMap.containsKey(target)) {
PluginInterceptorPoint pluginInterceptorPoint = pointMap.get(target);
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/shardingsphere-agent-logging-base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/shardingsphere-agent-logging-base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
index 337e50e..60fa1ae 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/shardingsphere-agent-logging-base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/shardingsphere-agent-logging-base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
@@ -17,9 +17,7 @@
package org.apache.shardingsphere.agent.plugin.logging.base.definition;
-import java.util.Collection;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
/**
@@ -34,12 +32,11 @@ public final class BaseLoggingPluginDefinitionService extends AbstractPluginDefi
private static final String SCHEMA_METADATA_LOADER_ADVICE_CLASS = "org.apache.shardingsphere.agent.plugin.logging.base.advice.SchemaMetaDataLoaderAdvice";
@Override
- public Collection<PluginInterceptorPoint> define() {
- intercept(SCHEMA_METADATA_LOADER_CLASS)
+ public void defineInterceptors() {
+ defineInterceptor(SCHEMA_METADATA_LOADER_CLASS)
.aroundClassStaticMethod(ElementMatchers.named(SCHEMA_METADATA_LOADER_METHOD_NAME))
.implement(SCHEMA_METADATA_LOADER_ADVICE_CLASS)
.build();
- return install();
}
@Override
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionService.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionService.java
index d1aa890..0e28705 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionService.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionService.java
@@ -17,11 +17,9 @@
package org.apache.shardingsphere.agent.metrics.api.definition;
-import java.util.Collection;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
-import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
import org.apache.shardingsphere.agent.metrics.api.constant.MethodNameConstant;
+import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
/**
* Metrics plugin definition service.
@@ -45,25 +43,24 @@ public final class MetricsPluginDefinitionService extends AbstractPluginDefiniti
private static final String TRANSACTION_ADVICE_CLASS = "org.apache.shardingsphere.agent.metrics.api.advice.TransactionAdvice";
@Override
- public Collection<PluginInterceptorPoint> define() {
- intercept(COMMAND_EXECUTOR_TASK_ENHANCE_CLASS)
+ public void defineInterceptors() {
+ defineInterceptor(COMMAND_EXECUTOR_TASK_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(MethodNameConstant.COMMAND_EXECUTOR_RUN))
.implement(COMMAND_EXECUTOR_TASK_ADVICE_CLASS)
.build();
- intercept(CHANNEL_HANDLER_ENHANCE_CLASS)
+ defineInterceptor(CHANNEL_HANDLER_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(MethodNameConstant.CHANNEL_ACTIVE).or(ElementMatchers.named(MethodNameConstant.CHANNEL_INACTIVE))
.or(ElementMatchers.named(MethodNameConstant.CHANNEL_READ)))
.implement(CHANNEL_HANDLER_ADVICE_CLASS)
.build();
- intercept(SQL_ROUTER_ENGINE_ENHANCE_CLASS)
+ defineInterceptor(SQL_ROUTER_ENGINE_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(MethodNameConstant.SQL_ROUTER))
.implement(SQL_ROUTER_ENGINE_ADVICE_CLASS)
.build();
- intercept(TRANSACTION_ENHANCE_CLASS)
+ defineInterceptor(TRANSACTION_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(MethodNameConstant.COMMIT).or(ElementMatchers.named(MethodNameConstant.ROLL_BACK)))
.implement(TRANSACTION_ADVICE_CLASS)
.build();
- return install();
}
@Override
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionServiceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionServiceTest.java
index 02faaed..3664512 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionServiceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionServiceTest.java
@@ -30,7 +30,7 @@ public final class MetricsPluginDefinitionServiceTest {
@Test
public void assertDefine() {
- Collection<PluginInterceptorPoint> interceptorPointList = metricsPluginDefinitionService.define();
+ Collection<PluginInterceptorPoint> interceptorPointList = metricsPluginDefinitionService.install();
assertThat(interceptorPointList.size(), is(4));
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
index 881e227..68cbfb1 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
@@ -17,9 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.jaeger.definition;
-import java.util.Collection;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
/**
@@ -48,23 +46,22 @@ public final class JaegerPluginDefinitionService extends AbstractPluginDefinitio
private static final String JDBC_EXECUTOR_CALLBACK_ADVICE_CLASS = "org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.JDBCExecutorCallbackAdvice";
@Override
- public Collection<PluginInterceptorPoint> define() {
- intercept(COMMAND_EXECUTOR_TASK_ENHANCE_CLASS)
+ public void defineInterceptors() {
+ defineInterceptor(COMMAND_EXECUTOR_TASK_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(COMMAND_EXECUTOR_METHOD_NAME))
.implement(COMMAND_EXECUTOR_TASK_ADVICE_CLASS)
.build();
- intercept(SQL_PARSER_ENGINE_ENHANCE_CLASS)
+ defineInterceptor(SQL_PARSER_ENGINE_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(SQL_PARSER_ENGINE_METHOD_NAME))
.implement(SQL_PARSER_ENGINE_ADVICE_CLASS)
.build();
- intercept(JDBC_EXECUTOR_CALLBACK_ENGINE_ENHANCE_CLASS)
+ defineInterceptor(JDBC_EXECUTOR_CALLBACK_ENGINE_ENHANCE_CLASS)
.aroundInstanceMethod(
ElementMatchers.named(JDBC_EXECUTOR_METHOD_NAME)
.and(ElementMatchers.takesArgument(0, ElementMatchers.named(JDBC_EXECUTOR_UNIT_ENGINE_ENHANCE_CLASS)))
)
.implement(JDBC_EXECUTOR_CALLBACK_ADVICE_CLASS)
.build();
- return install();
}
@Override
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionServiceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionServiceTest.java
index b5e85c0..280de67 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionServiceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionServiceTest.java
@@ -30,7 +30,7 @@ public final class JaegerPluginDefinitionServiceTest {
@Test
public void assertDefine() {
- Collection<PluginInterceptorPoint> interceptorPointList = jaegerPluginDefinitionService.define();
+ Collection<PluginInterceptorPoint> interceptorPointList = jaegerPluginDefinitionService.install();
assertThat(interceptorPointList.size(), is(3));
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPlugi [...]
index 12a7d30..a14ec63 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
@@ -17,9 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentracing.definition;
-import java.util.Collection;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
/**
@@ -48,22 +46,21 @@ public final class OpenTracingPluginDefinitionService extends AbstractPluginDefi
private static final String JDBC_EXECUTOR_CALLBACK_ADVICE_CLASS = "org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.JDBCExecutorCallbackAdvice";
@Override
- public Collection<PluginInterceptorPoint> define() {
- intercept(COMMAND_EXECUTOR_TASK_ENHANCE_CLASS)
+ public void defineInterceptors() {
+ defineInterceptor(COMMAND_EXECUTOR_TASK_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(COMMAND_EXECUTOR_METHOD_NAME))
.implement(COMMAND_EXECUTOR_TASK_ADVICE_CLASS)
.build();
- intercept(SQL_PARSER_ENGINE_ENHANCE_CLASS)
+ defineInterceptor(SQL_PARSER_ENGINE_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(SQL_PARSER_ENGINE_METHOD_NAME))
.implement(SQL_PARSER_ENGINE_ADVICE_CLASS)
.build();
- intercept(JDBC_EXECUTOR_CALLBACK_ENGINE_ENHANCE_CLASS)
+ defineInterceptor(JDBC_EXECUTOR_CALLBACK_ENGINE_ENHANCE_CLASS)
.aroundInstanceMethod(
ElementMatchers.named(JDBC_EXECUTOR_METHOD_NAME)
.and(ElementMatchers.takesArgument(0, ElementMatchers.named(JDBC_EXECUTOR_UNIT_ENGINE_ENHANCE_CLASS))))
.implement(JDBC_EXECUTOR_CALLBACK_ADVICE_CLASS)
.build();
- return install();
}
@Override
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionServiceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingP [...]
index 6d9dd0b..eb28999 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionServiceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionServiceTest.java
@@ -30,7 +30,7 @@ public final class OpenTracingPluginDefinitionServiceTest {
@Test
public void assertDefine() {
- Collection<PluginInterceptorPoint> interceptorPointList = openTracingPluginDefinitionService.define();
+ Collection<PluginInterceptorPoint> interceptorPointList = openTracingPluginDefinitionService.install();
assertThat(interceptorPointList.size(), is(3));
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
index bbaa6b9..ba146d3 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
@@ -17,9 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.zipkin.definition;
-import java.util.Collection;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
/**
@@ -48,22 +46,21 @@ public final class ZipkinPluginDefinitionService extends AbstractPluginDefinitio
private static final String JDBC_EXECUTOR_CALLBACK_ADVICE_CLASS = "org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.JDBCExecutorCallbackAdvice";
@Override
- public Collection<PluginInterceptorPoint> define() {
- intercept(COMMAND_EXECUTOR_TASK_ENHANCE_CLASS)
+ public void defineInterceptors() {
+ defineInterceptor(COMMAND_EXECUTOR_TASK_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(COMMAND_EXECUTOR_METHOD_NAME))
.implement(COMMAND_EXECUTOR_TASK_ADVICE_CLASS)
.build();
- intercept(SQL_PARSER_ENGINE_ENHANCE_CLASS)
+ defineInterceptor(SQL_PARSER_ENGINE_ENHANCE_CLASS)
.aroundInstanceMethod(ElementMatchers.named(SQL_PARSER_ENGINE_METHOD_NAME))
.implement(SQL_PARSER_ENGINE_ADVICE_CLASS)
.build();
- intercept(JDBC_EXECUTOR_CALLBACK_ENGINE_ENHANCE_CLASS)
+ defineInterceptor(JDBC_EXECUTOR_CALLBACK_ENGINE_ENHANCE_CLASS)
.aroundInstanceMethod(
ElementMatchers.named(JDBC_EXECUTOR_METHOD_NAME)
.and(ElementMatchers.takesArgument(0, ElementMatchers.named(JDBC_EXECUTOR_UNIT_ENGINE_ENHANCE_CLASS))))
.implement(JDBC_EXECUTOR_CALLBACK_ADVICE_CLASS)
.build();
- return install();
}
@Override
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionServiceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionServiceTest.java
index e82cb62..e9f6d19 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionServiceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionServiceTest.java
@@ -30,7 +30,7 @@ public final class ZipkinPluginDefinitionServiceTest {
@Test
public void assertDefine() {
- Collection<PluginInterceptorPoint> interceptorPointList = zipkinPluginDefinitionService.define();
+ Collection<PluginInterceptorPoint> interceptorPointList = zipkinPluginDefinitionService.install();
assertThat(interceptorPointList.size(), is(3));
}