This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 c910a111c29 Add install method into PluginDefinitionService (#22786)
c910a111c29 is described below
commit c910a111c29de58f69581cdb91f9e0480a3e87ef
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Dec 10 15:56:14 2022 +0800
Add install method into PluginDefinitionService (#22786)
---
.../agent/api/point/PluginInterceptorPoint.java | 62 ++++++++++------------
.../AbstractPluginDefinitionService.java | 7 +--
.../spi/definition/PluginDefinitionService.java | 11 ++++
.../agent/core/plugin/AgentPluginLoader.java | 9 ++--
.../transformer/ShardingSphereTransformerTest.java | 4 +-
.../core/plugin/loader/AgentPluginLoaderTest.java | 2 +-
.../PrometheusPluginDefinitionServiceTest.java | 2 +-
.../definition/JaegerPluginDefinitionService.java | 4 +-
.../JaegerPluginDefinitionServiceTest.java | 2 +-
...penTelemetryTracingPluginDefinitionService.java | 4 +-
...elemetryTracingPluginDefinitionServiceTest.java | 2 +-
.../OpenTracingPluginDefinitionService.java | 4 +-
.../OpenTracingPluginDefinitionServiceTest.java | 2 +-
.../definition/ZipkinPluginDefinitionService.java | 4 +-
.../ZipkinPluginDefinitionServiceTest.java | 2 +-
15 files changed, 56 insertions(+), 65 deletions(-)
diff --git
a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
index 557bda0e3a1..046243c19f0 100644
---
a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
+++
b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
@@ -38,11 +38,11 @@ import java.util.List;
* .install();
* }
*/
-@Getter
@RequiredArgsConstructor
+@Getter
public final class PluginInterceptorPoint {
- private final String classNameOfTarget;
+ private final String targetClassName;
private final List<ConstructorPoint> constructorPoints;
@@ -62,11 +62,11 @@ public final class PluginInterceptorPoint {
/**
* Intercept target class.
*
- * @param classNameOfTarget a class name of wanted advice target
+ * @param targetClassName target class name
* @return builder
*/
- public static Builder intercept(final String classNameOfTarget) {
- return new Builder(classNameOfTarget);
+ public static Builder intercept(final String targetClassName) {
+ return new Builder(targetClassName);
}
/**
@@ -81,7 +81,7 @@ public final class PluginInterceptorPoint {
private final List<ClassStaticMethodPoint> classStaticMethodPoints =
new ArrayList<>();
- private final String classNameOfTarget;
+ private final String targetClassName;
/**
* Configure the intercepting point on constructor.
@@ -119,35 +119,31 @@ public final class PluginInterceptorPoint {
* @return plugin advice definition
*/
public PluginInterceptorPoint install() {
- return new PluginInterceptorPoint(classNameOfTarget,
constructorPoints, instanceMethodPoints, classStaticMethodPoints);
+ return new PluginInterceptorPoint(targetClassName,
constructorPoints, instanceMethodPoints, classStaticMethodPoints);
}
/**
* Instance method intercepting point configuration builder.
*/
+ @RequiredArgsConstructor
public static final class InstanceMethodPointBuilder {
private final Builder builder;
+
+ private final ElementMatcher<? super MethodDescription> matcher;
- private String classNameOfAdvice;
+ private String adviceClassName;
private boolean overrideArgs;
- private final ElementMatcher<? super MethodDescription> matcher;
-
- private InstanceMethodPointBuilder(final Builder builder, final
ElementMatcher<? super MethodDescription> matcher) {
- this.builder = builder;
- this.matcher = matcher;
- }
-
/**
* Configure implementation for interceptor point.
*
- * @param classNameOfAdvice the class name of advice
+ * @param adviceClassName advice class name
* @return instance method point builder
*/
- public InstanceMethodPointBuilder implement(final String
classNameOfAdvice) {
- this.classNameOfAdvice = classNameOfAdvice;
+ public InstanceMethodPointBuilder implement(final String
adviceClassName) {
+ this.adviceClassName = adviceClassName;
return this;
}
@@ -168,7 +164,7 @@ public final class PluginInterceptorPoint {
* @return plugin advice builder
*/
public Builder build() {
- builder.instanceMethodPoints.add(new
InstanceMethodPoint(matcher, classNameOfAdvice, overrideArgs));
+ builder.instanceMethodPoints.add(new
InstanceMethodPoint(matcher, adviceClassName, overrideArgs));
return builder;
}
}
@@ -179,13 +175,13 @@ public final class PluginInterceptorPoint {
public static final class StaticMethodPointBuilder {
private final Builder builder;
+
+ private final ElementMatcher<? super MethodDescription> matcher;
- private String classNameOfAdvice;
+ private String adviceClassName;
private boolean overrideArgs;
- private final ElementMatcher<? super MethodDescription> matcher;
-
private StaticMethodPointBuilder(final Builder builder, final
ElementMatcher<? super MethodDescription> matcher) {
this.builder = builder;
this.matcher = ElementMatchers.isStatic().and(matcher);
@@ -194,11 +190,11 @@ public final class PluginInterceptorPoint {
/**
* Configure implementation for intercepting point.
*
- * @param classNameOfAdvice the class name of advice
- * @return static method point configurer
+ * @param adviceClassName advice class name
+ * @return static method point configure builder
*/
- public StaticMethodPointBuilder implement(final String
classNameOfAdvice) {
- this.classNameOfAdvice = classNameOfAdvice;
+ public StaticMethodPointBuilder implement(final String
adviceClassName) {
+ this.adviceClassName = adviceClassName;
return this;
}
@@ -206,7 +202,7 @@ public final class PluginInterceptorPoint {
* Configure whether or not override the origin method arguments.
*
* @param overrideArgs whether to override origin method arguments
- * @return static method point configurer
+ * @return static method point builder
*/
public StaticMethodPointBuilder overrideArgs(final boolean
overrideArgs) {
this.overrideArgs = overrideArgs;
@@ -219,7 +215,7 @@ public final class PluginInterceptorPoint {
* @return builder
*/
public Builder build() {
- builder.classStaticMethodPoints.add(new
ClassStaticMethodPoint(matcher, classNameOfAdvice, overrideArgs));
+ builder.classStaticMethodPoints.add(new
ClassStaticMethodPoint(matcher, adviceClassName, overrideArgs));
return builder;
}
}
@@ -233,7 +229,7 @@ public final class PluginInterceptorPoint {
private final ElementMatcher<? super MethodDescription> matcher;
- private String classNameOfAdvice;
+ private String adviceClassName;
private ConstructorPointBuilder(final Builder builder, final
ElementMatcher<? super MethodDescription> matcher) {
this.builder = builder;
@@ -243,11 +239,11 @@ public final class PluginInterceptorPoint {
/**
* Configure implementation for intercepting point.
*
- * @param classNameOfAdvice the class name of advice
+ * @param adviceClassName advice class name
* @return constructor point builder
*/
- public ConstructorPointBuilder implement(final String
classNameOfAdvice) {
- this.classNameOfAdvice = classNameOfAdvice;
+ public ConstructorPointBuilder implement(final String
adviceClassName) {
+ this.adviceClassName = adviceClassName;
return this;
}
@@ -257,7 +253,7 @@ public final class PluginInterceptorPoint {
* @return plugin advice builder
*/
public Builder build() {
- builder.constructorPoints.add(new ConstructorPoint(matcher,
classNameOfAdvice));
+ builder.constructorPoints.add(new ConstructorPoint(matcher,
adviceClassName));
return builder;
}
}
diff --git
a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
index fb6c181d70f..aff9f63da97 100644
---
a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
+++
b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
@@ -32,12 +32,7 @@ public abstract class AbstractPluginDefinitionService
implements PluginDefinitio
private final Map<String, Builder> interceptorPoints = new HashMap<>();
- /**
- * Install plugin interceptor points.
- *
- * @param isEnhancedForProxy is enhanced for proxy
- * @return plugin interceptor points
- */
+ @Override
public final Collection<PluginInterceptorPoint> install(final boolean
isEnhancedForProxy) {
if (isEnhancedForProxy) {
defineProxyInterceptors();
diff --git
a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/PluginDefinitionService.java
b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/PluginDefinitionService.java
index 568cae02cf1..a2b299d3515 100644
---
a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/PluginDefinitionService.java
+++
b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/PluginDefinitionService.java
@@ -17,10 +17,21 @@
package org.apache.shardingsphere.agent.spi.definition;
+import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.spi.AgentSPI;
+import java.util.Collection;
+
/**
* Plugin definition service.
*/
public interface PluginDefinitionService extends AgentSPI {
+
+ /**
+ * Install plugin interceptor points.
+ *
+ * @param isEnhancedForProxy is enhanced for proxy
+ * @return plugin interceptor points
+ */
+ Collection<PluginInterceptorPoint> install(boolean isEnhancedForProxy);
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
index bec28bb5ba2..a33d3f8f33b 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
@@ -30,7 +30,6 @@ import
org.apache.shardingsphere.agent.core.config.path.AgentPathBuilder;
import
org.apache.shardingsphere.agent.core.config.registry.AgentConfigurationRegistry;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.spi.PluginServiceLoader;
-import
org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
import org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService;
import java.io.File;
@@ -106,9 +105,8 @@ public final class AgentPluginLoader implements
PluginLoader {
}
private void buildPluginInterceptorPointMap(final PluginDefinitionService
pluginDefinitionService, final Map<String, PluginInterceptorPoint> pointMap) {
- AbstractPluginDefinitionService definitionService =
(AbstractPluginDefinitionService) pluginDefinitionService;
- definitionService.install(isEnhancedForProxy).forEach(each -> {
- String target = each.getClassNameOfTarget();
+ pluginDefinitionService.install(isEnhancedForProxy).forEach(each -> {
+ String target = each.getTargetClassName();
if (pointMap.containsKey(target)) {
PluginInterceptorPoint pluginInterceptorPoint =
pointMap.get(target);
pluginInterceptorPoint.getConstructorPoints().addAll(each.getConstructorPoints());
@@ -156,8 +154,7 @@ public final class AgentPluginLoader implements
PluginLoader {
}
@Override
- @SuppressWarnings("unchecked")
public <T> T getOrCreateInstance(final String adviceClassName, final
ClassLoader classLoader) {
- return (T) AdviceInstanceLoader.loadAdviceInstance(adviceClassName,
classLoader, isEnhancedForProxy);
+ return AdviceInstanceLoader.loadAdviceInstance(adviceClassName,
classLoader, isEnhancedForProxy);
}
}
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
index 9f0656012d0..955759180b9 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
@@ -84,7 +84,7 @@ public final class ShardingSphereTransformerTest {
.implement(MockConstructorAdvice.class.getTypeName())
.build()
.install();
- interceptorPointMap.put(interceptorPoint.getClassNameOfTarget(),
interceptorPoint);
+ interceptorPointMap.put(interceptorPoint.getTargetClassName(),
interceptorPoint);
PluginInterceptorPoint interceptorPointInTwice =
PluginInterceptorPoint.intercept("org.apache.shardingsphere.agent.core.mock.material.RepeatedAdviceMaterial")
.aroundInstanceMethod(ElementMatchers.named("mock"))
.implement(MockInstanceMethodAroundAdvice.class.getTypeName())
@@ -93,7 +93,7 @@ public final class ShardingSphereTransformerTest {
.implement(MockInstanceMethodAroundRepeatedAdvice.class.getTypeName())
.build()
.install();
-
interceptorPointMap.put(interceptorPointInTwice.getClassNameOfTarget(),
interceptorPointInTwice);
+ interceptorPointMap.put(interceptorPointInTwice.getTargetClassName(),
interceptorPointInTwice);
MemberAccessor accessor = Plugins.getMemberAccessor();
accessor.set(PLUGIN_LOADER.getClass().getDeclaredField("interceptorPointMap"),
PLUGIN_LOADER, interceptorPointMap);
byteBuddyAgent = new AgentBuilder.Default().with(new
ByteBuddy().with(TypeValidation.ENABLED))
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
index e32a84851a3..0b389f13303 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
@@ -73,7 +73,7 @@ public final class AgentPluginLoaderTest {
.build()
.install();
MemberAccessor accessor = Plugins.getMemberAccessor();
-
accessor.set(PLUGIN_LOADER.getClass().getDeclaredField("interceptorPointMap"),
PLUGIN_LOADER,
Collections.singletonMap(interceptorPoint.getClassNameOfTarget(),
interceptorPoint));
+
accessor.set(PLUGIN_LOADER.getClass().getDeclaredField("interceptorPointMap"),
PLUGIN_LOADER, Collections.singletonMap(interceptorPoint.getTargetClassName(),
interceptorPoint));
}
@Test
diff --git
a/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionServiceTest.java
b/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionServiceTest.java
index 7aae0f1a3cd..22f6d11ec0c 100644
---
a/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionServiceTest.java
+++
b/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionServiceTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
public final class PrometheusPluginDefinitionServiceTest {
@Test
- public void assertDefine() {
+ public void assertInstall() {
assertThat(new
PrometheusPluginDefinitionService().install(true).size(), is(5));
}
}
diff --git
a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
index 9781d717988..f9eef03bed9 100644
---
a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
+++
b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
@@ -56,9 +56,7 @@ public final class JaegerPluginDefinitionService extends
AbstractPluginDefinitio
.implement(SQL_PARSER_ENGINE_ADVICE_CLASS)
.build();
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))))
+
.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();
}
diff --git
a/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionServiceTest.java
b/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionServiceTest.java
index 11e6e79c28f..d44e7d1a3fb 100644
---
a/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionServiceTest.java
+++
b/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionServiceTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
public final class JaegerPluginDefinitionServiceTest {
@Test
- public void assertDefine() {
+ public void assertInstall() {
assertThat(new JaegerPluginDefinitionService().install(true).size(),
is(3));
}
}
diff --git
a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionService.java
b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionService.java
index 8276060101e..e1ece1c2572 100644
---
a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionService.java
+++
b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionService.java
@@ -56,9 +56,7 @@ public final class
OpenTelemetryTracingPluginDefinitionService extends AbstractP
.implement(SQL_PARSER_ENGINE_ADVICE_CLASS)
.build();
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))))
+
.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();
}
diff --git
a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionServiceTest.java
b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionServiceTest.java
index bffdbeda5e6..c60acd2b561 100644
---
a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionServiceTest.java
+++
b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionServiceTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
public final class OpenTelemetryTracingPluginDefinitionServiceTest {
@Test
- public void assertDefine() {
+ public void assertInstall() {
assertThat(new
OpenTelemetryTracingPluginDefinitionService().install(true).size(), is(3));
}
}
diff --git
a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
index beb08a95b2a..6f7b54b7c1a 100644
---
a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
+++
b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
@@ -56,9 +56,7 @@ public final class OpenTracingPluginDefinitionService extends
AbstractPluginDefi
.implement(SQL_PARSER_ENGINE_ADVICE_CLASS)
.build();
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))))
+
.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();
}
diff --git
a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionServiceTest.java
b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionServiceTest.java
index 7a48daff238..b688377ddd3 100644
---
a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionServiceTest.java
+++
b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionServiceTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
public final class OpenTracingPluginDefinitionServiceTest {
@Test
- public void assertDefine() {
+ public void assertInstall() {
assertThat(new
OpenTracingPluginDefinitionService().install(true).size(), is(3));
}
}
diff --git
a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
index d40dd5b9620..d76c1154b6c 100644
---
a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
+++
b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
@@ -56,9 +56,7 @@ public final class ZipkinPluginDefinitionService extends
AbstractPluginDefinitio
.implement(SQL_PARSER_ENGINE_ADVICE_CLASS)
.build();
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))))
+
.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();
}
diff --git
a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionServiceTest.java
b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionServiceTest.java
index 6a9fbb6f4de..5c70d7b0728 100644
---
a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionServiceTest.java
+++
b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionServiceTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
public final class ZipkinPluginDefinitionServiceTest {
@Test
- public void assertDefine() {
+ public void assertInstall() {
assertThat(new ZipkinPluginDefinitionService().install(true).size(),
is(3));
}
}
