You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/12/15 15:14:23 UTC
[shardingsphere] branch master updated: Rename AdvisorConfiguration (#22892)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 5df8b67671d Rename AdvisorConfiguration (#22892)
5df8b67671d is described below
commit 5df8b67671da278310a40e463b4ef87f29cf5020
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Dec 15 23:14:13 2022 +0800
Rename AdvisorConfiguration (#22892)
---
...sorConfiguration.java => AdvisorConfiguration.java} | 4 ++--
.../agent/spi/advisor/AdvisorDefinitionService.java | 6 +++---
.../agent/bootstrap/ShardingSphereAgent.java | 6 +++---
...Registry.java => AdvisorConfigurationRegistry.java} | 18 +++++++++---------
...y.java => AdvisorConfigurationRegistryFactory.java} | 14 +++++++-------
.../core/plugin/loader/AdvisorConfigurationLoader.java | 12 ++++++------
.../agent/core/transformer/AgentJunction.java | 4 ++--
.../agent/core/transformer/AgentTransformer.java | 12 ++++++------
...va => AdvisorConfigurationRegistryFactoryTest.java} | 4 ++--
...Test.java => AdvisorConfigurationRegistryTest.java} | 6 +++---
.../agent/core/transformer/AgentTransformerTest.java | 16 ++++++++--------
.../BaseLoggingAdvisorDefinitionService.java | 18 +++++++++---------
.../definition/PrometheusAdvisorDefinitionService.java | 16 ++++++++--------
.../tracing/core/advice/TracingAdviceEngine.java | 12 ++++++------
.../tracing/core/advice/adviser/TracingAdviser.java | 4 ++--
.../adviser/impl/CommandExecutorTaskAdviser.java | 8 ++++----
.../adviser/impl/JDBCExecutorCallbackAdviser.java | 8 ++++----
.../advice/adviser/impl/SQLParserEngineAdviser.java | 8 ++++----
.../definition/JaegerAdvisorDefinitionService.java | 6 +++---
.../OpenTelemetryTracingAdvisorDefinitionService.java | 6 +++---
.../OpenTracingAdvisorDefinitionService.java | 6 +++---
.../definition/ZipkinAdvisorDefinitionService.java | 6 +++---
22 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/ClassAdvisorConfiguration.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/AdvisorConfiguration.java
similarity index 94%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/ClassAdvisorConfiguration.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/AdvisorConfiguration.java
index 061613d0750..1d8ee35c19f 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/ClassAdvisorConfiguration.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/AdvisorConfiguration.java
@@ -24,11 +24,11 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * Class advisor configuration.
+ * Advisor configuration.
*/
@RequiredArgsConstructor
@Getter
-public final class ClassAdvisorConfiguration {
+public final class AdvisorConfiguration {
private final String targetClassName;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/advisor/AdvisorDefinitionService.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/advisor/AdvisorDefinitionService.java
index e80fad90ea4..9640e4b2a23 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/advisor/AdvisorDefinitionService.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/advisor/AdvisorDefinitionService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.spi.advisor;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.spi.AgentSPI;
import java.util.Collection;
@@ -32,12 +32,12 @@ public interface AdvisorDefinitionService extends AgentSPI {
*
* @return proxy advisor configurations
*/
- Collection<ClassAdvisorConfiguration> getProxyAdvisorConfigurations();
+ Collection<AdvisorConfiguration> getProxyAdvisorConfigurations();
/**
* Get JDBC advisors configuration.
*
* @return JDBC advisor configurations
*/
- Collection<ClassAdvisorConfiguration> getJDBCAdvisorConfigurations();
+ Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations();
}
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java b/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
index fc7b30921ec..3e20a8c7ecb 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
+++ b/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
@@ -23,7 +23,7 @@ import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.plugin.AgentConfiguration;
import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
@@ -55,7 +55,7 @@ public final class ShardingSphereAgent {
public static void premain(final String args, final Instrumentation instrumentation) throws IOException {
AgentConfiguration agentConfig = AgentConfigurationLoader.load();
boolean isEnhancedForProxy = isEnhancedForProxy();
- Map<String, ClassAdvisorConfiguration> advisorConfigs = AdvisorConfigurationLoader.load(AgentPluginLoader.load(), agentConfig.getPlugins().keySet(), isEnhancedForProxy);
+ Map<String, AdvisorConfiguration> advisorConfigs = AdvisorConfigurationLoader.load(AgentPluginLoader.load(), agentConfig.getPlugins().keySet(), isEnhancedForProxy);
setUpAgentBuilder(instrumentation, agentConfig, advisorConfigs, isEnhancedForProxy);
if (isEnhancedForProxy) {
setupPluginBootService(agentConfig.getPlugins());
@@ -72,7 +72,7 @@ public final class ShardingSphereAgent {
}
private static void setUpAgentBuilder(final Instrumentation instrumentation,
- final AgentConfiguration agentConfig, final Map<String, ClassAdvisorConfiguration> advisorConfigs, final boolean isEnhancedForProxy) {
+ final AgentConfiguration agentConfig, final Map<String, AdvisorConfiguration> advisorConfigs, final boolean isEnhancedForProxy) {
AgentBuilder agentBuilder = new AgentBuilder.Default().with(new ByteBuddy().with(TypeValidation.ENABLED))
.ignore(ElementMatchers.isSynthetic())
.or(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent."));
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistry.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
similarity index 62%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistry.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
index 2f0351fcfb6..96b4dc82a31 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistry.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
@@ -17,25 +17,25 @@
package org.apache.shardingsphere.agent.core.plugin.advisor;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Class advisor configuration registry.
+ * Advisor configuration registry.
*/
-public final class ClassAdvisorConfigurationRegistry {
+public final class AdvisorConfigurationRegistry {
- private final Map<String, ClassAdvisorConfiguration> advisors = new ConcurrentHashMap<>();
+ private final Map<String, AdvisorConfiguration> advisors = new ConcurrentHashMap<>();
/**
- * Get class advisor configuration.
+ * Get advisor configuration.
*
- * @param targetClassName target class name to be intercepted
- * @return class advisor configuration
+ * @param targetClassName to be advised class name
+ * @return advisor configuration
*/
- public ClassAdvisorConfiguration getAdvisorConfiguration(final String targetClassName) {
- return advisors.computeIfAbsent(targetClassName, ClassAdvisorConfiguration::new);
+ public AdvisorConfiguration getAdvisorConfiguration(final String targetClassName) {
+ return advisors.computeIfAbsent(targetClassName, AdvisorConfiguration::new);
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactory.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
similarity index 70%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactory.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
index 74c359486bc..adc305540bb 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactory.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
@@ -24,20 +24,20 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Class advisor registry factory.
+ * Advisor configuration registry factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ClassAdvisorRegistryFactory {
+public final class AdvisorConfigurationRegistryFactory {
- private static final Map<String, ClassAdvisorConfigurationRegistry> REGISTRIES = new ConcurrentHashMap<>();
+ private static final Map<String, AdvisorConfigurationRegistry> REGISTRIES = new ConcurrentHashMap<>();
/**
- * Get class advisor registry.
+ * Get advisor configuration registry.
*
* @param type registry type
- * @return class advisor registry
+ * @return advisor configuration registry
*/
- public static ClassAdvisorConfigurationRegistry getRegistry(final String type) {
- return REGISTRIES.computeIfAbsent(type, each -> new ClassAdvisorConfigurationRegistry());
+ public static AdvisorConfigurationRegistry getRegistry(final String type) {
+ return REGISTRIES.computeIfAbsent(type, each -> new AdvisorConfigurationRegistry());
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
index 1192497eb8d..8b5b66dd52d 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.core.plugin.loader;
import com.google.common.collect.ImmutableMap;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import org.apache.shardingsphere.agent.core.spi.PluginServiceLoader;
@@ -46,15 +46,15 @@ public final class AdvisorConfigurationLoader {
* @param isEnhancedForProxy is enhanced for proxy
* @return loaded advisor configurations
*/
- public static Map<String, ClassAdvisorConfiguration> load(final Collection<PluginJar> pluginJars, final Collection<String> pluginTypes, final boolean isEnhancedForProxy) {
- Map<String, ClassAdvisorConfiguration> result = new HashMap<>();
+ public static Map<String, AdvisorConfiguration> load(final Collection<PluginJar> pluginJars, final Collection<String> pluginTypes, final boolean isEnhancedForProxy) {
+ Map<String, AdvisorConfiguration> result = new HashMap<>();
AgentClassLoader.init(pluginJars);
for (AdvisorDefinitionService each : PluginServiceLoader.newServiceInstances(AdvisorDefinitionService.class, AgentClassLoader.getClassLoader())) {
if (pluginTypes.contains(each.getType())) {
- Collection<ClassAdvisorConfiguration> advisorConfigs = isEnhancedForProxy ? each.getProxyAdvisorConfigurations() : each.getJDBCAdvisorConfigurations();
- result.putAll(advisorConfigs.stream().collect(Collectors.toMap(ClassAdvisorConfiguration::getTargetClassName, Function.identity())));
+ Collection<AdvisorConfiguration> advisorConfigs = isEnhancedForProxy ? each.getProxyAdvisorConfigurations() : each.getJDBCAdvisorConfigurations();
+ result.putAll(advisorConfigs.stream().collect(Collectors.toMap(AdvisorConfiguration::getTargetClassName, Function.identity())));
}
}
- return ImmutableMap.<String, ClassAdvisorConfiguration>builder().putAll(result).build();
+ return ImmutableMap.<String, AdvisorConfiguration>builder().putAll(result).build();
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
index 875cd629d4d..8c5b0a620d8 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatcher.Junction;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import java.util.Map;
@@ -31,7 +31,7 @@ import java.util.Map;
@RequiredArgsConstructor
public final class AgentJunction implements Junction<TypeDescription> {
- private final Map<String, ClassAdvisorConfiguration> advisorConfigs;
+ private final Map<String, AdvisorConfiguration> advisorConfigs;
@Override
public boolean matches(final TypeDescription target) {
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
index 1e41b79fa16..359fc3d428c 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
@@ -30,7 +30,7 @@ import net.bytebuddy.implementation.bind.annotation.Morph;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
import net.bytebuddy.utility.JavaModule;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.ConstructorAdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.InstanceMethodAdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.StaticMethodAdvisorConfiguration;
@@ -72,7 +72,7 @@ public final class AgentTransformer implements Transformer {
private final AgentConfiguration agentConfig;
- private final Map<String, ClassAdvisorConfiguration> advisorConfigs;
+ private final Map<String, AdvisorConfiguration> advisorConfigs;
private final boolean isEnhancedForProxy;
@@ -83,10 +83,10 @@ public final class AgentTransformer implements Transformer {
return builder;
}
Builder<?> result = builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE).implement(TargetAdviceObject.class).intercept(FieldAccessor.ofField(EXTRA_DATA));
- ClassAdvisorConfiguration classAdvisorConfig = advisorConfigs.getOrDefault(typeDescription.getTypeName(), new ClassAdvisorConfiguration(""));
- result = interceptConstructor(typeDescription, classAdvisorConfig.getConstructorAdvisors(), result, classLoader);
- result = interceptStaticMethod(typeDescription, classAdvisorConfig.getStaticMethodAdvisors(), result, classLoader);
- result = interceptInstanceMethod(typeDescription, classAdvisorConfig.getInstanceMethodAdvisors(), result, classLoader);
+ AdvisorConfiguration advisorConfig = advisorConfigs.getOrDefault(typeDescription.getTypeName(), new AdvisorConfiguration(""));
+ result = interceptConstructor(typeDescription, advisorConfig.getConstructorAdvisors(), result, classLoader);
+ result = interceptStaticMethod(typeDescription, advisorConfig.getStaticMethodAdvisors(), result, classLoader);
+ result = interceptInstanceMethod(typeDescription, advisorConfig.getInstanceMethodAdvisors(), result, classLoader);
return result;
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistryFactoryTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
similarity index 84%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistryFactoryTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
index ed2509cab11..a45921d9ad0 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistryFactoryTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
@@ -22,10 +22,10 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class ClassAdvisorConfigurationRegistryFactoryTest {
+public final class AdvisorConfigurationRegistryFactoryTest {
@Test
public void assertGetRegistryWithType() {
- assertThat(ClassAdvisorRegistryFactory.getRegistry("test"), instanceOf(ClassAdvisorConfigurationRegistry.class));
+ assertThat(AdvisorConfigurationRegistryFactory.getRegistry("test"), instanceOf(AdvisorConfigurationRegistry.class));
}
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistryTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
similarity index 79%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistryTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
index f5d69d86310..05471dc8b1b 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorConfigurationRegistryTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
@@ -17,16 +17,16 @@
package org.apache.shardingsphere.agent.core.plugin.advisor;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class ClassAdvisorConfigurationRegistryTest {
+public final class AdvisorConfigurationRegistryTest {
@Test
public void assertGetAdvisorConfiguration() {
- assertThat(new ClassAdvisorConfigurationRegistry().getAdvisorConfiguration("test"), instanceOf(ClassAdvisorConfiguration.class));
+ assertThat(new AdvisorConfigurationRegistry().getAdvisorConfiguration("test"), instanceOf(AdvisorConfiguration.class));
}
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
index b90d2c8f702..05117f603db 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
@@ -23,7 +23,7 @@ import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.agent.builder.ResettableClassFileTransformer;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.ConstructorAdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.InstanceMethodAdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.StaticMethodAdvisorConfiguration;
@@ -69,10 +69,10 @@ public final class AgentTransformerTest {
objectPool.put(MockConstructorAdvice.class.getTypeName(), new MockConstructorAdvice());
objectPool.put(MockInstanceMethodAroundAdvice.class.getTypeName(), new MockInstanceMethodAroundAdvice());
objectPool.put(MockStaticMethodAroundAdvice.class.getTypeName(), new MockStaticMethodAroundAdvice());
- Map<String, ClassAdvisorConfiguration> advisorConfigs = new HashMap<>(2, 1);
- ClassAdvisorConfiguration advisorConfig = createClassAdvisorConfiguration();
+ Map<String, AdvisorConfiguration> advisorConfigs = new HashMap<>(2, 1);
+ AdvisorConfiguration advisorConfig = createAdvisorConfiguration();
advisorConfigs.put(advisorConfig.getTargetClassName(), advisorConfig);
- ClassAdvisorConfiguration advisorConfigInTwice = createClassAdvisorConfigurationInTwice();
+ AdvisorConfiguration advisorConfigInTwice = createAdvisorConfigurationInTwice();
advisorConfigs.put(advisorConfigInTwice.getTargetClassName(), advisorConfigInTwice);
byteBuddyAgent = new AgentBuilder.Default().with(new ByteBuddy().with(TypeValidation.ENABLED))
.ignore(ElementMatchers.isSynthetic()).or(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.")
@@ -85,16 +85,16 @@ public final class AgentTransformerTest {
.installOnByteBuddyAgent();
}
- private static ClassAdvisorConfiguration createClassAdvisorConfiguration() {
- ClassAdvisorConfiguration result = new ClassAdvisorConfiguration("org.apache.shardingsphere.agent.core.mock.material.Material");
+ private static AdvisorConfiguration createAdvisorConfiguration() {
+ AdvisorConfiguration result = new AdvisorConfiguration("org.apache.shardingsphere.agent.core.mock.material.Material");
result.getConstructorAdvisors().add(new ConstructorAdvisorConfiguration(ElementMatchers.takesArguments(1), MockConstructorAdvice.class.getTypeName()));
result.getInstanceMethodAdvisors().add(new InstanceMethodAdvisorConfiguration(ElementMatchers.named("mock"), MockInstanceMethodAroundAdvice.class.getTypeName()));
result.getStaticMethodAdvisors().add(new StaticMethodAdvisorConfiguration(ElementMatchers.named("staticMock"), MockStaticMethodAroundAdvice.class.getTypeName()));
return result;
}
- private static ClassAdvisorConfiguration createClassAdvisorConfigurationInTwice() {
- ClassAdvisorConfiguration result = new ClassAdvisorConfiguration("org.apache.shardingsphere.agent.core.mock.material.RepeatedAdviceMaterial");
+ private static AdvisorConfiguration createAdvisorConfigurationInTwice() {
+ AdvisorConfiguration result = new AdvisorConfiguration("org.apache.shardingsphere.agent.core.mock.material.RepeatedAdviceMaterial");
result.getInstanceMethodAdvisors().add(new InstanceMethodAdvisorConfiguration(ElementMatchers.named("mock"), MockInstanceMethodAroundAdvice.class.getTypeName()));
result.getInstanceMethodAdvisors().add(new InstanceMethodAdvisorConfiguration(ElementMatchers.named("mock"), MockInstanceMethodAroundRepeatedAdvice.class.getTypeName()));
return result;
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 98aa13b1cf9..1772ea6fbe0 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
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.agent.plugin.logging.base.definition;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.StaticMethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice;
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
@@ -39,21 +39,21 @@ public final class BaseLoggingAdvisorDefinitionService implements AdvisorDefinit
private static final String SCHEMA_METADATA_LOADER_ADVICE_CLASS = MetaDataContextsFactoryAdvice.class.getName();
@Override
- public Collection<ClassAdvisorConfiguration> getProxyAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
return getAdvisorConfigurations();
}
@Override
- public Collection<ClassAdvisorConfiguration> getJDBCAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
return getAdvisorConfigurations();
}
- private Collection<ClassAdvisorConfiguration> getAdvisorConfigurations() {
- Collection<ClassAdvisorConfiguration> result = new LinkedList<>();
- ClassAdvisorConfiguration classAdvisorConfig = ClassAdvisorRegistryFactory.getRegistry(getType()).getAdvisorConfiguration(SCHEMA_METADATA_LOADER_CLASS);
- classAdvisorConfig.getStaticMethodAdvisors().add(
+ private Collection<AdvisorConfiguration> getAdvisorConfigurations() {
+ Collection<AdvisorConfiguration> result = new LinkedList<>();
+ AdvisorConfiguration advisorConfig = AdvisorConfigurationRegistryFactory.getRegistry(getType()).getAdvisorConfiguration(SCHEMA_METADATA_LOADER_CLASS);
+ advisorConfig.getStaticMethodAdvisors().add(
new StaticMethodAdvisorConfiguration(ElementMatchers.named(SCHEMA_METADATA_LOADER_METHOD_NAME).and(ElementMatchers.takesArguments(4)), SCHEMA_METADATA_LOADER_ADVICE_CLASS));
- result.add(classAdvisorConfig);
+ result.add(advisorConfig);
return result;
}
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 25ebe7cfcde..9866165be5c 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
@@ -18,11 +18,11 @@
package org.apache.shardingsphere.agent.metrics.prometheus.definition;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.ConstructorAdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.InstanceMethodAdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.StaticMethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorConfiguration;
import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutConfiguration;
import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConfigurationSwapper;
@@ -38,18 +38,18 @@ import java.util.LinkedList;
public final class PrometheusAdvisorDefinitionService implements AdvisorDefinitionService {
@Override
- public Collection<ClassAdvisorConfiguration> getProxyAdvisorConfigurations() {
- Collection<ClassAdvisorConfiguration> result = new LinkedList<>();
+ public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
+ Collection<AdvisorConfiguration> result = new LinkedList<>();
for (YamlAdvisorConfiguration each : new YamlAdvisorsConfigurationSwapper().unmarshal(getClass().getResourceAsStream("/prometheus/advisors.yaml")).getAdvisors()) {
if (null != each.getTarget()) {
- result.add(createClassAdvisorConfiguration(each));
+ result.add(createAdvisorConfiguration(each));
}
}
return result;
}
- private ClassAdvisorConfiguration createClassAdvisorConfiguration(final YamlAdvisorConfiguration yamlAdvisorConfig) {
- ClassAdvisorConfiguration result = ClassAdvisorRegistryFactory.getRegistry(getType()).getAdvisorConfiguration(yamlAdvisorConfig.getTarget());
+ private AdvisorConfiguration createAdvisorConfiguration(final YamlAdvisorConfiguration yamlAdvisorConfig) {
+ AdvisorConfiguration result = AdvisorConfigurationRegistryFactory.getRegistry(getType()).getAdvisorConfiguration(yamlAdvisorConfig.getTarget());
if (null != yamlAdvisorConfig.getConstructAdvice() && !("".equals(yamlAdvisorConfig.getConstructAdvice()))) {
result.getConstructorAdvisors().add(new ConstructorAdvisorConfiguration(ElementMatchers.isConstructor(), yamlAdvisorConfig.getConstructAdvice()));
}
@@ -65,7 +65,7 @@ public final class PrometheusAdvisorDefinitionService implements AdvisorDefiniti
}
@Override
- public Collection<ClassAdvisorConfiguration> getJDBCAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
// TODO add JDBC related interceptors
return Collections.emptyList();
}
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
index a25ef989669..cbf227526c1 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.core.advice;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl.CommandExecutorTaskAdviser;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl.JDBCExecutorCallbackAdviser;
@@ -44,11 +44,11 @@ public final class TracingAdviceEngine {
* @param jdbcExecutorCallbackAdvice JDBC executor callback advice
* @return got configurations
*/
- public Collection<ClassAdvisorConfiguration> getProxyAdvisorConfigurations(final Class<? extends InstanceMethodAroundAdvice> commandExecutorTaskAdvice,
- final Class<? extends InstanceMethodAroundAdvice> sqlParserEngineAdvice,
- final Class<? extends InstanceMethodAroundAdvice> jdbcExecutorCallbackAdvice) {
+ public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations(final Class<? extends InstanceMethodAroundAdvice> commandExecutorTaskAdvice,
+ final Class<? extends InstanceMethodAroundAdvice> sqlParserEngineAdvice,
+ final Class<? extends InstanceMethodAroundAdvice> jdbcExecutorCallbackAdvice) {
// TODO load from YAML, please ref metrics
- Collection<ClassAdvisorConfiguration> result = new LinkedList<>();
+ Collection<AdvisorConfiguration> result = new LinkedList<>();
result.add(new CommandExecutorTaskAdviser(type).getAdvisorConfiguration(commandExecutorTaskAdvice));
result.add(new SQLParserEngineAdviser(type).getAdvisorConfiguration(sqlParserEngineAdvice));
result.add(new JDBCExecutorCallbackAdviser(type).getAdvisorConfiguration(jdbcExecutorCallbackAdvice));
@@ -60,7 +60,7 @@ public final class TracingAdviceEngine {
*
* @return got configurations
*/
- public Collection<ClassAdvisorConfiguration> getJDBCAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
// TODO
return Collections.emptyList();
}
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
index 2d29ef2368d..7109b32a1e7 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser;
import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
/**
* Tracing adviser.
@@ -31,5 +31,5 @@ public interface TracingAdviser {
* @param instanceMethodAroundAdvice instance method around advice
* @return advisor configuration
*/
- ClassAdvisorConfiguration getAdvisorConfiguration(Class<? extends InstanceMethodAroundAdvice> instanceMethodAroundAdvice);
+ AdvisorConfiguration getAdvisorConfiguration(Class<? extends InstanceMethodAroundAdvice> instanceMethodAroundAdvice);
}
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
index 8ddbc46105e..d039372b66c 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.InstanceMethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
@@ -38,8 +38,8 @@ public final class CommandExecutorTaskAdviser implements TracingAdviser {
private final String type;
@Override
- public ClassAdvisorConfiguration getAdvisorConfiguration(final Class<? extends InstanceMethodAroundAdvice> commandExecutorTaskAdvice) {
- ClassAdvisorConfiguration result = ClassAdvisorRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
+ public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends InstanceMethodAroundAdvice> commandExecutorTaskAdvice) {
+ AdvisorConfiguration result = AdvisorConfigurationRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
result.getInstanceMethodAdvisors().add(new InstanceMethodAdvisorConfiguration(ElementMatchers.named(TARGET_METHOD), commandExecutorTaskAdvice.getName()));
return result;
}
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
index c2a67b875d9..ac75c1b1ed4 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.InstanceMethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
@@ -40,8 +40,8 @@ public final class JDBCExecutorCallbackAdviser implements TracingAdviser {
private final String type;
@Override
- public ClassAdvisorConfiguration getAdvisorConfiguration(final Class<? extends InstanceMethodAroundAdvice> jdbcExecutorCallbackAdvice) {
- ClassAdvisorConfiguration result = ClassAdvisorRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
+ public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends InstanceMethodAroundAdvice> jdbcExecutorCallbackAdvice) {
+ AdvisorConfiguration result = AdvisorConfigurationRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
result.getInstanceMethodAdvisors().add(new InstanceMethodAdvisorConfiguration(
ElementMatchers.named(TARGET_METHOD).and(ElementMatchers.takesArgument(0, ElementMatchers.named(TARGET_METHOD_FIRST_PARAM))), jdbcExecutorCallbackAdvice.getName()));
return result;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
index c23e6944029..dfb35259afa 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.InstanceMethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
@@ -38,8 +38,8 @@ public final class SQLParserEngineAdviser implements TracingAdviser {
private final String type;
@Override
- public ClassAdvisorConfiguration getAdvisorConfiguration(final Class<? extends InstanceMethodAroundAdvice> sqlParserEngineAdvice) {
- ClassAdvisorConfiguration result = ClassAdvisorRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
+ public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends InstanceMethodAroundAdvice> sqlParserEngineAdvice) {
+ AdvisorConfiguration result = AdvisorConfigurationRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
result.getInstanceMethodAdvisors().add(new InstanceMethodAdvisorConfiguration(ElementMatchers.named(TARGET_METHOD), sqlParserEngineAdvice.getName()));
return result;
}
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 4a2fb767bb1..f1b44cbbc83 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.jaeger.definition;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingAdviceEngine;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.CommandExecutorTaskAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.JDBCExecutorCallbackAdvice;
@@ -33,12 +33,12 @@ public final class JaegerAdvisorDefinitionService implements AdvisorDefinitionSe
private final TracingAdviceEngine engine = new TracingAdviceEngine(getType());
@Override
- public Collection<ClassAdvisorConfiguration> getProxyAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
return engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdvice.class, CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
}
@Override
- public Collection<ClassAdvisorConfiguration> getJDBCAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
return engine.getJDBCAdvisorConfigurations();
}
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 edb67268a74..7721ecf5bbc 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.definition;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingAdviceEngine;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.CommandExecutorTaskAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.JDBCExecutorCallbackAdvice;
@@ -33,12 +33,12 @@ public final class OpenTelemetryTracingAdvisorDefinitionService implements Advis
private final TracingAdviceEngine engine = new TracingAdviceEngine(getType());
@Override
- public Collection<ClassAdvisorConfiguration> getProxyAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
return engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdvice.class, CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
}
@Override
- public Collection<ClassAdvisorConfiguration> getJDBCAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
return engine.getJDBCAdvisorConfigurations();
}
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 82558d7bb52..518659eb08b 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentracing.definition;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingAdviceEngine;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.CommandExecutorTaskAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.JDBCExecutorCallbackAdvice;
@@ -33,12 +33,12 @@ public final class OpenTracingAdvisorDefinitionService implements AdvisorDefinit
private final TracingAdviceEngine engine = new TracingAdviceEngine(getType());
@Override
- public Collection<ClassAdvisorConfiguration> getProxyAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
return engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdvice.class, CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
}
@Override
- public Collection<ClassAdvisorConfiguration> getJDBCAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
return engine.getJDBCAdvisorConfigurations();
}
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 794afca4cf4..0636fb3078b 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.zipkin.definition;
-import org.apache.shardingsphere.agent.config.advisor.ClassAdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingAdviceEngine;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.CommandExecutorTaskAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.JDBCExecutorCallbackAdvice;
@@ -33,12 +33,12 @@ public final class ZipkinAdvisorDefinitionService implements AdvisorDefinitionSe
private final TracingAdviceEngine engine = new TracingAdviceEngine(getType());
@Override
- public Collection<ClassAdvisorConfiguration> getProxyAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
return engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdvice.class, CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
}
@Override
- public Collection<ClassAdvisorConfiguration> getJDBCAdvisorConfigurations() {
+ public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
return engine.getJDBCAdvisorConfigurations();
}