You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/12/18 03:52:17 UTC
[shardingsphere] branch master updated: Revise javadoc and variable name of metrics-api (#22946)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 d223d90b1b1 Revise javadoc and variable name of metrics-api (#22946)
d223d90b1b1 is described below
commit d223d90b1b1d04d56738e701e50d79f03639db99
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 18 11:52:11 2022 +0800
Revise javadoc and variable name of metrics-api (#22946)
* Move package of AdvisorDefinitionService and PluginBootService
* Move package of AdvisorDefinitionService and PluginBootService
* Revise javadoc and variable name of metrics-api
---
.../agent/advice/type/InstanceMethodAdvice.java | 8 ++++----
.../agent/core/mock/advice/MockInstanceMethodAdvice.java | 6 +++---
.../core/mock/advice/MockInstanceMethodRepeatedAdvice.java | 4 ++--
.../shardingsphere/agent/metrics/api/MetricsPool.java | 14 +++++++-------
.../agent/metrics/api/MetricsWrapperFactory.java | 8 ++++----
.../agent/metrics/api/advice/ChannelHandlerAdvice.java | 4 ++--
.../metrics/api/advice/CommandExecutorTaskAdvice.java | 6 +++---
.../agent/metrics/api/advice/SQLParserEngineAdvice.java | 6 +++---
.../agent/metrics/api/advice/SQLRouteEngineAdvice.java | 8 ++++----
.../agent/metrics/api/advice/TransactionAdvice.java | 4 ++--
.../agent/metrics/api/constant/MetricIds.java | 3 +++
.../shardingsphere/agent/metrics/api/util/MetricsUtil.java | 4 ++--
.../tracing/jaeger/advice/CommandExecutorTaskAdvice.java | 4 ++--
.../tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java | 4 ++--
.../tracing/jaeger/advice/SQLParserEngineAdvice.java | 4 ++--
.../opentelemetry/advice/CommandExecutorTaskAdvice.java | 4 ++--
.../opentelemetry/advice/JDBCExecutorCallbackAdvice.java | 4 ++--
.../opentelemetry/advice/SQLParserEngineAdvice.java | 4 ++--
.../opentracing/advice/CommandExecutorTaskAdvice.java | 4 ++--
.../opentracing/advice/JDBCExecutorCallbackAdvice.java | 4 ++--
.../tracing/opentracing/advice/SQLParserEngineAdvice.java | 4 ++--
.../tracing/zipkin/advice/CommandExecutorTaskAdvice.java | 4 ++--
.../tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java | 4 ++--
.../tracing/zipkin/advice/SQLParserEngineAdvice.java | 4 ++--
24 files changed, 63 insertions(+), 60 deletions(-)
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/advice/type/InstanceMethodAdvice.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/advice/type/InstanceMethodAdvice.java
index 2d5f44488cd..ac099637604 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/advice/type/InstanceMethodAdvice.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/advice/type/InstanceMethodAdvice.java
@@ -35,9 +35,9 @@ public interface InstanceMethodAdvice extends AgentAdvice {
* @param target the target object
* @param method the target method
* @param args all method arguments
- * @param result wrapped class of result to detect whether or not to execute the origin method
+ * @param invocationResult wrapped class of result to detect whether or not to execute the origin method
*/
- default void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ default void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
}
/**
@@ -47,9 +47,9 @@ public interface InstanceMethodAdvice extends AgentAdvice {
* @param target the target object
* @param method the target method
* @param args all method arguments
- * @param result wrapped class of result to detect whether or not to execute the origin method.
+ * @param invocationResult wrapped class of result to detect whether or not to execute the origin method.
*/
- default void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ default void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
}
/**
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdvice.java
index 3e867f5e834..e337688ebd1 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdvice.java
@@ -36,16 +36,16 @@ public final class MockInstanceMethodAdvice implements InstanceMethodAdvice {
}
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
List<String> queues = (List<String>) args[0];
queues.add("before");
if (rebase) {
- result.rebase("rebase invocation method");
+ invocationResult.rebase("rebase invocation method");
}
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
List<String> queues = (List<String>) args[0];
queues.add("after");
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdvice.java
index 9cec9e5021a..629b21282a4 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdvice.java
@@ -28,13 +28,13 @@ import java.util.List;
public final class MockInstanceMethodRepeatedAdvice implements InstanceMethodAdvice {
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
List<String> queues = (List<String>) args[0];
queues.add("twice_before");
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
List<String> queues = (List<String>) args[0];
queues.add("twice_after");
}
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsPool.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsPool.java
index 5f60dcb0014..5c534a4c312 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsPool.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsPool.java
@@ -30,18 +30,18 @@ public final class MetricsPool {
private static MetricsWrapperFactory wrapperFactory;
/**
- * Set the metrics wrapper factory.
+ * Set metrics wrapper factory.
*
- * @param factory MetricsWrapperFactory
+ * @param factory metrics wrapper factory
*/
public static void setMetricsFactory(final MetricsWrapperFactory factory) {
wrapperFactory = factory;
}
/**
- * Create metrics wrapper by id.
+ * Create metrics wrapper.
*
- * @param id id
+ * @param id metrics wrapper ID
*/
public static void create(final String id) {
Optional<MetricsWrapper> wrapper = wrapperFactory.create(id);
@@ -49,10 +49,10 @@ public final class MetricsPool {
}
/**
- * Get the metrics wrapper by id.
+ * Get the metrics wrapper.
*
- * @param id id
- * @return optional of metrics wrapper
+ * @param id metrics wrapper ID
+ * @return metrics wrapper
*/
public static Optional<MetricsWrapper> get(final String id) {
return Optional.ofNullable(METRICS_POOL.get(id));
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsWrapperFactory.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsWrapperFactory.java
index f82e0c579f2..1344fd14d5c 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsWrapperFactory.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsWrapperFactory.java
@@ -20,15 +20,15 @@ package org.apache.shardingsphere.agent.metrics.api;
import java.util.Optional;
/**
- * Metrics wrapper abstract factory.
+ * Metrics wrapper factory.
*/
public interface MetricsWrapperFactory {
/**
- * Create the metrics wrapper.
+ * Create metrics wrapper.
*
- * @param id id
- * @return optional of metrics wrapper
+ * @param id metrics wrapper ID
+ * @return metrics wrapper
*/
Optional<MetricsWrapper> create(String id);
}
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java
index 9a5d608636c..3a191901f6d 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import java.lang.reflect.Method;
/**
- * Channel handler advice executor.
+ * Channel handler advice.
*/
public final class ChannelHandlerAdvice implements InstanceMethodAdvice {
@@ -43,7 +43,7 @@ public final class ChannelHandlerAdvice implements InstanceMethodAdvice {
}
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
switch (method.getName()) {
case CHANNEL_READ:
MetricsPool.get(MetricIds.PROXY_REQUEST).ifPresent(MetricsWrapper::inc);
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java
index a6773cffe56..049e32f4410 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import java.lang.reflect.Method;
/**
- * Command executor task advice executor.
+ * Command executor task advice.
*/
public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
@@ -42,14 +42,14 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
}
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
if (COMMAND_EXECUTOR_RUN.equals(method.getName())) {
TimeRecorder.INSTANCE.record();
}
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
if (COMMAND_EXECUTOR_RUN.equals(method.getName())) {
try {
MetricsPool.get(MetricIds.PROXY_EXECUTE_LATENCY_MILLIS).ifPresent(optional -> optional.observe(TimeRecorder.INSTANCE.getElapsedTime()));
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java
index d036506bd04..f5a8b708f67 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java
@@ -39,7 +39,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.TCLStatemen
import java.lang.reflect.Method;
/**
- * SQL parse engine advice executor.
+ * SQL parse engine advice.
*/
public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
@@ -58,8 +58,8 @@ public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
- SQLStatement sqlStatement = (SQLStatement) result.getResult();
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
+ SQLStatement sqlStatement = (SQLStatement) invocationResult.getResult();
countSQL(sqlStatement);
countDistSQL(sqlStatement);
}
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
index a7887e19593..80b50c55707 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
@@ -37,7 +37,7 @@ import java.lang.reflect.Method;
import java.util.Collection;
/**
- * SQL route engine advice executor.
+ * SQL route engine advice.
*/
public final class SQLRouteEngineAdvice implements InstanceMethodAdvice {
@@ -51,7 +51,7 @@ public final class SQLRouteEngineAdvice implements InstanceMethodAdvice {
}
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
QueryContext queryContext = (QueryContext) args[1];
SQLStatement sqlStatement = queryContext.getSqlStatementContext().getSqlStatement();
if (sqlStatement instanceof InsertStatement) {
@@ -66,8 +66,8 @@ public final class SQLRouteEngineAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
- RouteContext routeContext = (RouteContext) result.getResult();
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
+ RouteContext routeContext = (RouteContext) invocationResult.getResult();
if (null != routeContext) {
Collection<RouteUnit> routeUnits = routeContext.getRouteUnits();
routeUnits.forEach(each -> {
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java
index c47604bb338..c9130033fad 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import java.lang.reflect.Method;
/**
- * Transaction advice executor.
+ * Transaction advice.
*/
public final class TransactionAdvice implements InstanceMethodAdvice {
@@ -41,7 +41,7 @@ public final class TransactionAdvice implements InstanceMethodAdvice {
}
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
String methodName = method.getName();
if (COMMIT.equals(methodName)) {
MetricsPool.get(MetricIds.TRANSACTION_COMMIT).ifPresent(MetricsWrapper::inc);
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/constant/MetricIds.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/constant/MetricIds.java
index ac5d8079d8b..7bc71bee90f 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/constant/MetricIds.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/constant/MetricIds.java
@@ -17,6 +17,9 @@
package org.apache.shardingsphere.agent.metrics.api.constant;
+/**
+ * Metric IDs.
+ */
public final class MetricIds {
public static final String PROXY_REQUEST = "proxy_request_total";
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/util/MetricsUtil.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/util/MetricsUtil.java
index 981e980f153..958bd074c3d 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/util/MetricsUtil.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/util/MetricsUtil.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Metrics Util.
+ * Metrics Utility.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class MetricsUtil {
@@ -35,7 +35,7 @@ public final class MetricsUtil {
public static boolean isClassExisted(final String className) {
try {
Class.forName(className);
- } catch (ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
return false;
}
return true;
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
index 0aafff7ff08..cd160a31714 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
@@ -42,7 +42,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Scope scope = GlobalTracer.get().buildSpan(OPERATION_NAME)
.withTag(Tags.COMPONENT.getKey(), JaegerConstants.COMPONENT_NAME)
.startActive(true);
@@ -51,7 +51,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
@Override
@SneakyThrows(ReflectiveOperationException.class)
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
ExecutorDataMap.getValue().remove(JaegerConstants.ROOT_SPAN);
Field field = CommandExecutorTask.class.getDeclaredField("connectionSession");
field.setAccessible(true);
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
index 23776a7a1ba..49cfeb19c9a 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
@@ -49,7 +49,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
@Override
@SneakyThrows({ReflectiveOperationException.class, SQLException.class})
@SuppressWarnings("unchecked")
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Span root = (Span) ((Map<String, Object>) args[2]).get(JaegerConstants.ROOT_SPAN);
Tracer.SpanBuilder builder = GlobalTracer.get().buildSpan(OPERATION_NAME);
if (null != root) {
@@ -73,7 +73,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Scope) target.getAttachment()).close();
}
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
index ac448bc4e20..2ca87a4e038 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
@@ -36,7 +36,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Scope scope = GlobalTracer.get().buildSpan(OPERATION_NAME)
.withTag(Tags.COMPONENT.getKey(), JaegerConstants.COMPONENT_NAME)
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
@@ -46,7 +46,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Scope) target.getAttachment()).close();
}
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
index 5e7360a537d..084ad8ce92e 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
@@ -38,7 +38,7 @@ public class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
SpanBuilder spanBuilder = GlobalOpenTelemetry.getTracer("shardingsphere-agent")
.spanBuilder(OPERATION_NAME)
.setAttribute(OpenTelemetryConstants.COMPONENT, OpenTelemetryConstants.COMPONENT_NAME)
@@ -49,7 +49,7 @@ public class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Span) target.getAttachment()).end();
ExecutorDataMap.getValue().remove(OpenTelemetryConstants.ROOT_SPAN);
}
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
index a4182032ed8..06eca6ec07e 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
@@ -48,7 +48,7 @@ public class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
@Override
@SneakyThrows
@SuppressWarnings("unchecked")
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Span root = (Span) ((Map<String, Object>) args[2]).get(OpenTelemetryConstants.ROOT_SPAN);
Tracer tracer = GlobalOpenTelemetry.getTracer("shardingsphere-agent");
SpanBuilder spanBuilder = tracer.spanBuilder(OPERATION_NAME);
@@ -72,7 +72,7 @@ public class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Span) target.getAttachment()).end();
}
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
index c082680cfa1..17599ec84d6 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
@@ -39,7 +39,7 @@ public class SQLParserEngineAdvice implements InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Span root = (Span) ExecutorDataMap.getValue().get(OpenTelemetryConstants.ROOT_SPAN);
Tracer tracer = GlobalOpenTelemetry.getTracer("shardingsphere-agent");
SpanBuilder spanBuilder = tracer.spanBuilder(OPERATION_NAME)
@@ -53,7 +53,7 @@ public class SQLParserEngineAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Span) target.getAttachment()).end();
}
diff --git a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
index a06f2b15803..28c4f9a7a0b 100644
--- a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
@@ -39,7 +39,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
private static final String ROOT_SPAN = "ot_root_span_";
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Scope scope = GlobalTracer.get().buildSpan(OPERATION_NAME)
.withTag(Tags.COMPONENT.getKey(), ShardingSphereTags.COMPONENT_NAME)
.startActive(true);
@@ -47,7 +47,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
GlobalTracer.get().scopeManager().active().close();
ExecutorDataMap.getValue().remove(ROOT_SPAN);
}
diff --git a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
index 244029520a3..5fa47cd4c27 100644
--- a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
@@ -42,7 +42,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
@Override
@SuppressWarnings("unchecked")
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Span root = (Span) ((Map<String, Object>) args[2]).get("ot_root_span_");
Tracer.SpanBuilder builder = GlobalTracer.get().buildSpan(OPERATION_NAME);
if ((boolean) args[1]) {
@@ -61,7 +61,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Scope) target.getAttachment()).close();
}
diff --git a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
index dc0133dd1f0..cfd6c150b4a 100644
--- a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
@@ -36,7 +36,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Scope scope = GlobalTracer.get().buildSpan(OPERATION_NAME)
.withTag(Tags.COMPONENT.getKey(), ShardingSphereTags.COMPONENT_NAME)
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
@@ -46,7 +46,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Scope) target.getAttachment()).close();
}
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
index 14b773b3dac..bb188a2c847 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
@@ -40,7 +40,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Span span = Tracing.currentTracer().newTrace().name(OPERATION_NAME);
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME).kind(Span.Kind.CLIENT)
.tag(ZipkinConstants.Tags.DB_TYPE, ZipkinConstants.DB_TYPE_VALUE).start();
@@ -49,7 +49,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
@SneakyThrows(ReflectiveOperationException.class)
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Field field = CommandExecutorTask.class.getDeclaredField("connectionSession");
field.setAccessible(true);
JDBCBackendConnection connection = (JDBCBackendConnection) ((ConnectionSession) field.get(target)).getBackendConnection();
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
index fce73311f1f..c20e1f8cba9 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
@@ -45,7 +45,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
@Override
@SneakyThrows({ReflectiveOperationException.class, SQLException.class})
@SuppressWarnings("unchecked")
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
Span root = (Span) ((Map<String, Object>) args[2]).get(ZipkinConstants.ROOT_SPAN);
Span span = null == root ? Tracing.currentTracer().nextSpan().name(OPERATION_NAME) : Tracing.currentTracer().newChild(root.context()).name(OPERATION_NAME);
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME);
@@ -66,7 +66,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Span) target.getAttachment()).finish();
}
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
index f5c862cc53c..6ada1e079c6 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
@@ -36,7 +36,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
@Override
- public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
TraceContext parentContext = ((Span) ExecutorDataMap.getValue().get(ZipkinConstants.ROOT_SPAN)).context();
Span span = Tracing.currentTracer().newChild(parentContext).name(OPERATION_NAME);
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME);
@@ -47,7 +47,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
}
@Override
- public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
((Span) target.getAttachment()).finish();
}