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 6007b28a2d2 Refactor usage of AdvisorDefinitionServiceEngine (#22855)
6007b28a2d2 is described below
commit 6007b28a2d2de60ce4efd751d853bb9aebc5bb6c
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Dec 13 20:08:34 2022 +0800
Refactor usage of AdvisorDefinitionServiceEngine (#22855)
---
.../base/definition/BaseLoggingAdvisorDefinitionService.java | 3 ++-
.../prometheus/definition/PrometheusAdvisorDefinitionService.java | 7 ++++---
.../tracing/jaeger/definition/JaegerAdvisorDefinitionService.java | 6 ++++--
.../definition/OpenTelemetryTracingAdvisorDefinitionService.java | 6 ++++--
.../definition/OpenTracingAdvisorDefinitionService.java | 6 ++++--
.../tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java | 6 ++++--
6 files changed, 22 insertions(+), 12 deletions(-)
diff --git
a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingAdvisorDefinitionService.java
b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingAdvisorDefinitionService.java
index e448a60b408..d3458cebd1a 100644
---
a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingAdvisorDefinitionService.java
+++
b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingAdvisorDefinitionService.java
@@ -38,6 +38,8 @@ public final class BaseLoggingAdvisorDefinitionService
implements AdvisorDefinit
private static final String SCHEMA_METADATA_LOADER_ADVICE_CLASS =
MetaDataContextsFactoryAdvice.class.getName();
+ private final AdvisorDefinitionServiceEngine engine = new
AdvisorDefinitionServiceEngine(this);
+
@Override
public Collection<ClassAdvisor> getProxyAdvisors() {
return getAdvisors();
@@ -50,7 +52,6 @@ public final class BaseLoggingAdvisorDefinitionService
implements AdvisorDefinit
private Collection<ClassAdvisor> getAdvisors() {
Collection<ClassAdvisor> result = new LinkedList<>();
- AdvisorDefinitionServiceEngine engine = new
AdvisorDefinitionServiceEngine(this);
ClassAdvisor classAdvisor =
engine.getAdvisors(SCHEMA_METADATA_LOADER_CLASS);
classAdvisor.getStaticMethodAdvisors().add(
new
StaticMethodAdvisor(ElementMatchers.named(SCHEMA_METADATA_LOADER_METHOD_NAME).and(ElementMatchers.takesArguments(4)),
SCHEMA_METADATA_LOADER_ADVICE_CLASS));
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusAdvisorDefinitionService.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusAdvisorDefinitionService.java
index f25ce5deb83..fd051738cf9 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusAdvisorDefinitionService.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusAdvisorDefinitionService.java
@@ -37,19 +37,20 @@ import java.util.LinkedList;
*/
public final class PrometheusAdvisorDefinitionService implements
AdvisorDefinitionService {
+ private final AdvisorDefinitionServiceEngine engine = new
AdvisorDefinitionServiceEngine(this);
+
@Override
public Collection<ClassAdvisor> getProxyAdvisors() {
Collection<ClassAdvisor> result = new LinkedList<>();
- AdvisorDefinitionServiceEngine engine = new
AdvisorDefinitionServiceEngine(this);
for (Interceptor each : new
InterceptorsYamlSwapper().unmarshal(getClass().getResourceAsStream("/prometheus/interceptors.yaml")).getInterceptors())
{
if (null != each.getTarget()) {
- result.add(createClassAdvisor(engine, each));
+ result.add(createClassAdvisor(each));
}
}
return result;
}
- private ClassAdvisor createClassAdvisor(final
AdvisorDefinitionServiceEngine engine, final Interceptor interceptor) {
+ private ClassAdvisor createClassAdvisor(final Interceptor interceptor) {
ClassAdvisor result = engine.getAdvisors(interceptor.getTarget());
if (null != interceptor.getConstructAdvice() &&
!("".equals(interceptor.getConstructAdvice()))) {
result.getConstructorAdvisors().add(new
ConstructorAdvisor(ElementMatchers.isConstructor(),
interceptor.getConstructAdvice()));
diff --git
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerAdvisorDefinitionService.java
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerAdvisorDefinitionService.java
index 7f6cc225265..5b92b77123a 100644
---
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerAdvisorDefinitionService.java
+++
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerAdvisorDefinitionService.java
@@ -31,14 +31,16 @@ import java.util.Collection;
*/
public final class JaegerAdvisorDefinitionService implements
AdvisorDefinitionService {
+ private final TracingAdviceEngine engine = new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this));
+
@Override
public Collection<ClassAdvisor> getProxyAdvisors() {
- return new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this)).getProxyAdvisors(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
+ return engine.getProxyAdvisors(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
}
@Override
public Collection<ClassAdvisor> getJDBCAdvisors() {
- return new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this)).getJDBCAdvisors();
+ return engine.getJDBCAdvisors();
}
@Override
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingAdvisorDefinitionService.java
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingAdvisorDefinitionService.java
index b54c096d112..0fc5027ca76 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingAdvisorDefinitionService.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingAdvisorDefinitionService.java
@@ -31,14 +31,16 @@ import java.util.Collection;
*/
public final class OpenTelemetryTracingAdvisorDefinitionService implements
AdvisorDefinitionService {
+ private final TracingAdviceEngine engine = new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this));
+
@Override
public Collection<ClassAdvisor> getProxyAdvisors() {
- return new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this)).getProxyAdvisors(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
+ return engine.getProxyAdvisors(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
}
@Override
public Collection<ClassAdvisor> getJDBCAdvisors() {
- return new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this)).getJDBCAdvisors();
+ return engine.getJDBCAdvisors();
}
@Override
diff --git
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingAdvisorDefinitionService.java
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingAdvisorDefinitionService.java
index 5ad3d9bed23..df31caa15b5 100644
---
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingAdvisorDefinitionService.java
+++
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingAdvisorDefinitionService.java
@@ -31,14 +31,16 @@ import java.util.Collection;
*/
public final class OpenTracingAdvisorDefinitionService implements
AdvisorDefinitionService {
+ private final TracingAdviceEngine engine = new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this));
+
@Override
public Collection<ClassAdvisor> getProxyAdvisors() {
- return new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this)).getProxyAdvisors(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
+ return engine.getProxyAdvisors(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
}
@Override
public Collection<ClassAdvisor> getJDBCAdvisors() {
- return new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this)).getJDBCAdvisors();
+ return engine.getJDBCAdvisors();
}
@Override
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java
index 7509f55714f..bc60a381b6b 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java
+++
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java
@@ -31,14 +31,16 @@ import java.util.Collection;
*/
public final class ZipkinAdvisorDefinitionService implements
AdvisorDefinitionService {
+ private final TracingAdviceEngine engine = new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this));
+
@Override
public Collection<ClassAdvisor> getProxyAdvisors() {
- return new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this)).getProxyAdvisors(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
+ return engine.getProxyAdvisors(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
}
@Override
public Collection<ClassAdvisor> getJDBCAdvisors() {
- return new TracingAdviceEngine(new
AdvisorDefinitionServiceEngine(this)).getJDBCAdvisors();
+ return engine.getJDBCAdvisors();
}
@Override
