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 2cde4bc9561 Rename tracing advice (#23681)
2cde4bc9561 is described below
commit 2cde4bc956152be9a041930d9ed4cc524ffc73e7
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jan 20 17:46:58 2023 +0800
Rename tracing advice (#23681)
---
...ExecutorTaskAdvice.java => JaegerCommandExecutorTaskAdvice.java} | 2 +-
...torCallbackAdvice.java => JaegerJDBCExecutorCallbackAdvice.java} | 2 +-
...{SQLParserEngineAdvice.java => JaegerSQLParserEngineAdvice.java} | 2 +-
.../src/main/resources/META-INF/conf/jaeger-proxy-advisors.yaml | 6 +++---
...TaskAdviceTest.java => JaegerCommandExecutorTaskAdviceTest.java} | 6 +++---
...ackAdviceTest.java => JaegerJDBCExecutorCallbackAdviceTest.java} | 6 +++---
...erEngineAdviceTest.java => JaegerSQLParserEngineAdviceTest.java} | 4 ++--
...rTaskAdvice.java => OpenTelemetryCommandExecutorTaskAdvice.java} | 4 ++--
...backAdvice.java => OpenTelemetryJDBCExecutorCallbackAdvice.java} | 4 ++--
...serEngineAdvice.java => OpenTelemetrySQLParserEngineAdvice.java} | 4 ++--
.../main/resources/META-INF/conf/opentelemetry-proxy-advisors.yaml | 6 +++---
...iceTest.java => OpenTelemetryCommandExecutorTaskAdviceTest.java} | 6 +++---
...ceTest.java => OpenTelemetryJDBCExecutorCallbackAdviceTest.java} | 6 +++---
...eAdviceTest.java => OpenTelemetrySQLParserEngineAdviceTest.java} | 6 +++---
...torTaskAdvice.java => OpenTracingCommandExecutorTaskAdvice.java} | 4 ++--
...llbackAdvice.java => OpenTracingJDBCExecutorCallbackAdvice.java} | 4 ++--
...arserEngineAdvice.java => OpenTracingSQLParserEngineAdvice.java} | 4 ++--
.../main/resources/META-INF/conf/opentracing-proxy-advisors.yaml | 6 +++---
...dviceTest.java => OpenTracingCommandExecutorTaskAdviceTest.java} | 4 ++--
...viceTest.java => OpenTracingJDBCExecutorCallbackAdviceTest.java} | 6 +++---
...ineAdviceTest.java => OpenTracingSQLParserEngineAdviceTest.java} | 4 ++--
...ExecutorTaskAdvice.java => ZipkinCommandExecutorTaskAdvice.java} | 4 ++--
...torCallbackAdvice.java => ZipkinJDBCExecutorCallbackAdvice.java} | 4 ++--
...{SQLParserEngineAdvice.java => ZipkinSQLParserEngineAdvice.java} | 4 ++--
.../src/main/resources/META-INF/conf/zipkin-proxy-advisors.yaml | 6 +++---
...TaskAdviceTest.java => ZipkinCommandExecutorTaskAdviceTest.java} | 6 +++---
...ackAdviceTest.java => ZipkinJDBCExecutorCallbackAdviceTest.java} | 6 +++---
...erEngineAdviceTest.java => ZipkinSQLParserEngineAdviceTest.java} | 6 +++---
28 files changed, 66 insertions(+), 66 deletions(-)
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/JaegerCommandExecutorTaskAdvice.java
similarity index 97%
rename from
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerCommandExecutorTaskAdvice.java
index 0a2e1ee5336..20168890eac 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/JaegerCommandExecutorTaskAdvice.java
@@ -34,7 +34,7 @@ import java.lang.reflect.Method;
/**
* Command executor task advice executor.
*/
-public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
+public final class JaegerCommandExecutorTaskAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
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/JaegerJDBCExecutorCallbackAdvice.java
similarity index 98%
rename from
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
rename to
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerJDBCExecutorCallbackAdvice.java
index 4e454370f6a..3fe728859c3 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/JaegerJDBCExecutorCallbackAdvice.java
@@ -41,7 +41,7 @@ import java.util.Map;
/**
* JDBC executor callback advice executor.
*/
-public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
+public final class JaegerJDBCExecutorCallbackAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/executeSQL/";
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/JaegerSQLParserEngineAdvice.java
similarity index 96%
rename from
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerSQLParserEngineAdvice.java
index 01f3ec23c77..dc4c3a9dcdc 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/JaegerSQLParserEngineAdvice.java
@@ -30,7 +30,7 @@ import java.lang.reflect.Method;
/**
* SQL parser engine advice executor.
*/
-public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
+public final class JaegerSQLParserEngineAdvice implements InstanceMethodAdvice
{
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
diff --git
a/agent/plugins/tracing/type/jaeger/src/main/resources/META-INF/conf/jaeger-proxy-advisors.yaml
b/agent/plugins/tracing/type/jaeger/src/main/resources/META-INF/conf/jaeger-proxy-advisors.yaml
index 5f1d956da72..237d00d28af 100644
---
a/agent/plugins/tracing/type/jaeger/src/main/resources/META-INF/conf/jaeger-proxy-advisors.yaml
+++
b/agent/plugins/tracing/type/jaeger/src/main/resources/META-INF/conf/jaeger-proxy-advisors.yaml
@@ -17,17 +17,17 @@
advisors:
- target:
org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask
- advice:
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.CommandExecutorTaskAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.JaegerCommandExecutorTaskAdvice
pointcuts:
- name: run
type: method
- target:
org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine
- advice:
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.SQLParserEngineAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.JaegerSQLParserEngineAdvice
pointcuts:
- name: parse
type: method
- target:
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback
- advice:
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.JDBCExecutorCallbackAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.JaegerJDBCExecutorCallbackAdvice
pointcuts:
- name: execute
type: method
diff --git
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerCommandExecutorTaskAdviceTest.java
similarity index 92%
rename from
agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
rename to
agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerCommandExecutorTaskAdviceTest.java
index baef15b2352..40ac485fb52 100644
---
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
+++
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerCommandExecutorTaskAdviceTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertNull;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutorTaskAdviceTest {
+public final class JaegerCommandExecutorTaskAdviceTest extends
AbstractCommandExecutorTaskAdviceTest {
@ClassRule
public static final JaegerCollector COLLECTOR = new JaegerCollector();
@@ -52,7 +52,7 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
@Test
public void assertMethod() {
- CommandExecutorTaskAdvice advice = new CommandExecutorTaskAdvice();
+ JaegerCommandExecutorTaskAdvice advice = new
JaegerCommandExecutorTaskAdvice();
advice.beforeMethod(getTargetObject(), null, new Object[]{}, "Jaeger");
advice.afterMethod(getTargetObject(), null, new Object[]{}, null,
"Jaeger");
List<MockSpan> spans = COLLECTOR.finishedSpans();
@@ -64,7 +64,7 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
@Test
public void assertExceptionHandle() {
- CommandExecutorTaskAdvice advice = new CommandExecutorTaskAdvice();
+ JaegerCommandExecutorTaskAdvice advice = new
JaegerCommandExecutorTaskAdvice();
advice.beforeMethod(getTargetObject(), null, new Object[]{}, "Jaeger");
advice.onThrowing(getTargetObject(), null, new Object[]{}, new
IOException(), "Jaeger");
advice.afterMethod(getTargetObject(), null, new Object[]{}, null,
"Jaeger");
diff --git
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerJDBCExecutorCallbackAdviceTest.java
similarity index 93%
rename from
agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
rename to
agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerJDBCExecutorCallbackAdviceTest.java
index 3e102d7382b..5ff331e3701 100644
---
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerJDBCExecutorCallbackAdviceTest.java
@@ -33,7 +33,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCallbackAdviceTest {
+public final class JaegerJDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCallbackAdviceTest {
@ClassRule
public static final JaegerCollector COLLECTOR = new JaegerCollector();
@@ -45,7 +45,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
@Test
public void assertMethod() {
- JDBCExecutorCallbackAdvice advice = new JDBCExecutorCallbackAdvice();
+ JaegerJDBCExecutorCallbackAdvice advice = new
JaegerJDBCExecutorCallbackAdvice();
advice.beforeMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, "Jaeger");
advice.afterMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, null, "Jaeger");
List<MockSpan> spans = COLLECTOR.finishedSpans();
@@ -62,7 +62,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
@Test
public void assertExceptionHandle() {
- JDBCExecutorCallbackAdvice advice = new JDBCExecutorCallbackAdvice();
+ JaegerJDBCExecutorCallbackAdvice advice = new
JaegerJDBCExecutorCallbackAdvice();
advice.beforeMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, "Jaeger");
advice.onThrowing(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, new IOException(),
"Jaeger");
advice.afterMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, null, "Jaeger");
diff --git
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerSQLParserEngineAdviceTest.java
similarity index 93%
rename from
agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
rename to
agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerSQLParserEngineAdviceTest.java
index 80d1ab13878..cabfca0f83b 100644
---
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JaegerSQLParserEngineAdviceTest.java
@@ -32,12 +32,12 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdviceTest {
+public final class JaegerSQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdviceTest {
@ClassRule
public static final JaegerCollector COLLECTOR = new JaegerCollector();
- private static final SQLParserEngineAdvice ADVICE = new
SQLParserEngineAdvice();
+ private static final JaegerSQLParserEngineAdvice ADVICE = new
JaegerSQLParserEngineAdvice();
@Test
public void assertMethod() {
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/OpenTelemetryCommandExecutorTaskAdvice.java
similarity index 95%
rename from
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryCommandExecutorTaskAdvice.java
index 2266fd0e9b5..a3b300314aa 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/OpenTelemetryCommandExecutorTaskAdvice.java
@@ -30,9 +30,9 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import java.lang.reflect.Method;
/**
- * Command executor task advice executor.
+ * OpenTelemetry command executor task advice executor.
*/
-public class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
+public class OpenTelemetryCommandExecutorTaskAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
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/OpenTelemetryJDBCExecutorCallbackAdvice.java
similarity index 96%
rename from
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
rename to
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdvice.java
index c86b593d1a3..d7f1c0cc6c3 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/OpenTelemetryJDBCExecutorCallbackAdvice.java
@@ -39,9 +39,9 @@ import java.sql.SQLException;
import java.util.Map;
/**
- * JDBC executor callback advice executor.
+ * OpenTelemetry JDBC executor callback advice executor.
*/
-public class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
+public class OpenTelemetryJDBCExecutorCallbackAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/executeSQL/";
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/OpenTelemetrySQLParserEngineAdvice.java
similarity index 95%
rename from
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetrySQLParserEngineAdvice.java
index 083488803a4..6668965db0a 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/OpenTelemetrySQLParserEngineAdvice.java
@@ -31,9 +31,9 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import java.lang.reflect.Method;
/**
- * SQL parser engine advice executor.
+ * OpenTelemetry SQL parser engine advice executor.
*/
-public class SQLParserEngineAdvice implements InstanceMethodAdvice {
+public class OpenTelemetrySQLParserEngineAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/main/resources/META-INF/conf/opentelemetry-proxy-advisors.yaml
b/agent/plugins/tracing/type/opentelemetry/src/main/resources/META-INF/conf/opentelemetry-proxy-advisors.yaml
index ee57f01d0f3..0fbbd7f9329 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/main/resources/META-INF/conf/opentelemetry-proxy-advisors.yaml
+++
b/agent/plugins/tracing/type/opentelemetry/src/main/resources/META-INF/conf/opentelemetry-proxy-advisors.yaml
@@ -17,17 +17,17 @@
advisors:
- target:
org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask
- advice:
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.CommandExecutorTaskAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.OpenTelemetryCommandExecutorTaskAdvice
pointcuts:
- name: run
type: method
- target:
org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine
- advice:
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.SQLParserEngineAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.OpenTelemetrySQLParserEngineAdvice
pointcuts:
- name: parse
type: method
- target:
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback
- advice:
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.JDBCExecutorCallbackAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.OpenTelemetryJDBCExecutorCallbackAdvice
pointcuts:
- name: execute
type: method
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryCommandExecutorTaskAdviceTest.java
similarity index 91%
rename from
agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
rename to
agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryCommandExecutorTaskAdviceTest.java
index deb9b104e58..363286c5984 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryCommandExecutorTaskAdviceTest.java
@@ -33,14 +33,14 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutorTaskAdviceTest {
+public final class OpenTelemetryCommandExecutorTaskAdviceTest extends
AbstractCommandExecutorTaskAdviceTest {
@ClassRule
public static final OpenTelemetryCollector COLLECTOR = new
OpenTelemetryCollector();
@Test
public void assertMethod() {
- CommandExecutorTaskAdvice advice = new CommandExecutorTaskAdvice();
+ OpenTelemetryCommandExecutorTaskAdvice advice = new
OpenTelemetryCommandExecutorTaskAdvice();
advice.beforeMethod(getTargetObject(), null, new Object[]{},
"OpenTelemetry");
advice.afterMethod(getTargetObject(), null, new Object[]{}, null,
"OpenTelemetry");
List<SpanData> spanItems = COLLECTOR.getSpanItems();
@@ -53,7 +53,7 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
@Test
public void assertExceptionHandle() {
- CommandExecutorTaskAdvice advice = new CommandExecutorTaskAdvice();
+ OpenTelemetryCommandExecutorTaskAdvice advice = new
OpenTelemetryCommandExecutorTaskAdvice();
advice.beforeMethod(getTargetObject(), null, new Object[]{},
"OpenTelemetry");
advice.onThrowing(getTargetObject(), null, new Object[]{}, new
IOException(), "OpenTelemetry");
advice.afterMethod(getTargetObject(), null, new Object[]{}, null,
"OpenTelemetry");
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
similarity index 92%
rename from
agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
rename to
agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
index 44b3179c7b9..02ebf565a6b 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
@@ -33,14 +33,14 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCallbackAdviceTest {
+public final class OpenTelemetryJDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCallbackAdviceTest {
@ClassRule
public static final OpenTelemetryCollector COLLECTOR = new
OpenTelemetryCollector();
@Test
public void assertMethod() {
- JDBCExecutorCallbackAdvice advice = new JDBCExecutorCallbackAdvice();
+ OpenTelemetryJDBCExecutorCallbackAdvice advice = new
OpenTelemetryJDBCExecutorCallbackAdvice();
advice.beforeMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, "OpenTelemetry");
advice.afterMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, null, "OpenTelemetry");
List<SpanData> spanItems = COLLECTOR.getSpanItems();
@@ -56,7 +56,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
@Test
public void assertExceptionHandle() {
- JDBCExecutorCallbackAdvice advice = new JDBCExecutorCallbackAdvice();
+ OpenTelemetryJDBCExecutorCallbackAdvice advice = new
OpenTelemetryJDBCExecutorCallbackAdvice();
advice.beforeMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, "OpenTelemetry");
advice.onThrowing(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, new IOException(),
"OpenTelemetry");
advice.afterMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, null, "OpenTelemetry");
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetrySQLParserEngineAdviceTest.java
similarity index 95%
rename from
agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
rename to
agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetrySQLParserEngineAdviceTest.java
index 6dab97a5cb5..16c2e0b0917 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetrySQLParserEngineAdviceTest.java
@@ -38,14 +38,14 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotNull;
-public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdviceTest {
+public final class OpenTelemetrySQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdviceTest {
@ClassRule
public static final OpenTelemetryCollector COLLECTOR = new
OpenTelemetryCollector();
private static final String SQL_STATEMENT = "select 1";
- private SQLParserEngineAdvice advice;
+ private OpenTelemetrySQLParserEngineAdvice advice;
private Span parentSpan;
@@ -55,7 +55,7 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
.spanBuilder("parent")
.startSpan();
ExecutorDataMap.getValue().put(OpenTelemetryConstants.ROOT_SPAN,
parentSpan);
- advice = new SQLParserEngineAdvice();
+ advice = new OpenTelemetrySQLParserEngineAdvice();
}
@Test
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/OpenTracingCommandExecutorTaskAdvice.java
similarity index 94%
rename from
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingCommandExecutorTaskAdvice.java
index cfe0b72e7b1..dad8af208fa 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/OpenTracingCommandExecutorTaskAdvice.java
@@ -29,9 +29,9 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import java.lang.reflect.Method;
/**
- * Command executor task advice executor.
+ * OpenTracing command executor task advice executor.
*/
-public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
+public final class OpenTracingCommandExecutorTaskAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
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/OpenTracingJDBCExecutorCallbackAdvice.java
similarity index 95%
rename from
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
rename to
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingJDBCExecutorCallbackAdvice.java
index 872041c49f4..f0db88ad514 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/OpenTracingJDBCExecutorCallbackAdvice.java
@@ -33,9 +33,9 @@ import java.lang.reflect.Method;
import java.util.Map;
/**
- * JDBC executor callback advice executor.
+ * OpenTracing JDBC executor callback advice executor.
*/
-public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
+public final class OpenTracingJDBCExecutorCallbackAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/executeSQL/";
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/OpenTracingSQLParserEngineAdvice.java
similarity index 94%
rename from
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingSQLParserEngineAdvice.java
index 28d5e62431e..8b72534f719 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/OpenTracingSQLParserEngineAdvice.java
@@ -28,9 +28,9 @@ import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTraci
import java.lang.reflect.Method;
/**
- * SQL parser engine advice executor.
+ * OpenTracing SQL parser engine advice executor.
*/
-public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
+public final class OpenTracingSQLParserEngineAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
diff --git
a/agent/plugins/tracing/type/opentracing/src/main/resources/META-INF/conf/opentracing-proxy-advisors.yaml
b/agent/plugins/tracing/type/opentracing/src/main/resources/META-INF/conf/opentracing-proxy-advisors.yaml
index d704de35790..7d039fd47b2 100644
---
a/agent/plugins/tracing/type/opentracing/src/main/resources/META-INF/conf/opentracing-proxy-advisors.yaml
+++
b/agent/plugins/tracing/type/opentracing/src/main/resources/META-INF/conf/opentracing-proxy-advisors.yaml
@@ -17,17 +17,17 @@
advisors:
- target:
org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask
- advice:
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.CommandExecutorTaskAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.OpenTracingCommandExecutorTaskAdvice
pointcuts:
- name: run
type: method
- target:
org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine
- advice:
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.SQLParserEngineAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.OpenTracingSQLParserEngineAdvice
pointcuts:
- name: parse
type: method
- target:
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback
- advice:
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.JDBCExecutorCallbackAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.OpenTracingJDBCExecutorCallbackAdvice
pointcuts:
- name: execute
type: method
diff --git
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingCommandExecutorTaskAdviceTest.java
similarity index 95%
rename from
agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
rename to
agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingCommandExecutorTaskAdviceTest.java
index 582c3043afa..3b56d0c0d8c 100644
---
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
+++
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingCommandExecutorTaskAdviceTest.java
@@ -39,9 +39,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public final class CommandExecutorTaskAdviceTest {
+public final class OpenTracingCommandExecutorTaskAdviceTest {
- private static final CommandExecutorTaskAdvice ADVICE = new
CommandExecutorTaskAdvice();
+ private static final OpenTracingCommandExecutorTaskAdvice ADVICE = new
OpenTracingCommandExecutorTaskAdvice();
private static MockTracer tracer;
diff --git
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingJDBCExecutorCallbackAdviceTest.java
similarity index 95%
rename from
agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
rename to
agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingJDBCExecutorCallbackAdviceTest.java
index aebe343c613..db53a966339 100644
---
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingJDBCExecutorCallbackAdviceTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class JDBCExecutorCallbackAdviceTest {
+public final class OpenTracingJDBCExecutorCallbackAdviceTest {
private static MockTracer tracer;
@@ -68,7 +68,7 @@ public final class JDBCExecutorCallbackAdviceTest {
Map<String, Object> extraMap = Collections.singletonMap("_root_span_",
null);
JDBCExecutionUnit executionUnit = mock(JDBCExecutionUnit.class);
when(executionUnit.getExecutionUnit()).thenReturn(new
ExecutionUnit("mock.db", new SQLUnit("select 1", Collections.emptyList())));
- JDBCExecutorCallbackAdvice advice = new JDBCExecutorCallbackAdvice();
+ OpenTracingJDBCExecutorCallbackAdvice advice = new
OpenTracingJDBCExecutorCallbackAdvice();
advice.beforeMethod(targetObject, executeMethod, new
Object[]{executionUnit, false, extraMap}, "OpenTracing");
advice.afterMethod(targetObject, executeMethod, new
Object[]{executionUnit, false, extraMap}, null, "OpenTracing");
List<MockSpan> spans = tracer.finishedSpans();
@@ -89,7 +89,7 @@ public final class JDBCExecutorCallbackAdviceTest {
Map<String, Object> extraMap = Collections.singletonMap("_root_span_",
null);
JDBCExecutionUnit executionUnit = mock(JDBCExecutionUnit.class);
when(executionUnit.getExecutionUnit()).thenReturn(new
ExecutionUnit("mock.db", new SQLUnit("select 1", Collections.emptyList())));
- JDBCExecutorCallbackAdvice advice = new JDBCExecutorCallbackAdvice();
+ OpenTracingJDBCExecutorCallbackAdvice advice = new
OpenTracingJDBCExecutorCallbackAdvice();
advice.beforeMethod(targetObject, executeMethod, new
Object[]{executionUnit, false, extraMap}, "OpenTracing");
advice.onThrowing(targetObject, executeMethod, new
Object[]{executionUnit, false, extraMap}, new IOException(), "OpenTracing");
advice.afterMethod(targetObject, executeMethod, new
Object[]{executionUnit, false, extraMap}, null, "OpenTracing");
diff --git
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingSQLParserEngineAdviceTest.java
similarity index 95%
rename from
agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
rename to
agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingSQLParserEngineAdviceTest.java
index 7db4d9bf4ba..7ff8a67b3f8 100644
---
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingSQLParserEngineAdviceTest.java
@@ -36,9 +36,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class SQLParserEngineAdviceTest {
+public final class OpenTracingSQLParserEngineAdviceTest {
- private static final SQLParserEngineAdvice ADVICE = new
SQLParserEngineAdvice();
+ private static final OpenTracingSQLParserEngineAdvice ADVICE = new
OpenTracingSQLParserEngineAdvice();
private static MockTracer tracer;
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/ZipkinCommandExecutorTaskAdvice.java
similarity index 95%
rename from
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinCommandExecutorTaskAdvice.java
index 5196ec29e29..ae7aeb15b83 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/ZipkinCommandExecutorTaskAdvice.java
@@ -30,9 +30,9 @@ import
org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import java.lang.reflect.Method;
/**
- * Command executor task advice executor.
+ * Zipkin command executor task advice executor.
*/
-public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
+public final class ZipkinCommandExecutorTaskAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
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/ZipkinJDBCExecutorCallbackAdvice.java
similarity index 96%
rename from
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
rename to
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinJDBCExecutorCallbackAdvice.java
index 2cf21fd6e06..971cf245142 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/ZipkinJDBCExecutorCallbackAdvice.java
@@ -35,9 +35,9 @@ import java.sql.SQLException;
import java.util.Map;
/**
- * JDBC executor callback advice executor.
+ * Zipkin JDBC executor callback advice executor.
*/
-public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
+public final class ZipkinJDBCExecutorCallbackAdvice implements
InstanceMethodAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/executeSQL/";
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/ZipkinSQLParserEngineAdvice.java
similarity index 95%
rename from
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdvice.java
index 0cc82d00986..8ad9ca7ef9d 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/ZipkinSQLParserEngineAdvice.java
@@ -28,9 +28,9 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import java.lang.reflect.Method;
/**
- * SQL parser engine advice executor.
+ * Zipkin SQL parser engine advice executor.
*/
-public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
+public final class ZipkinSQLParserEngineAdvice implements InstanceMethodAdvice
{
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/resources/META-INF/conf/zipkin-proxy-advisors.yaml
b/agent/plugins/tracing/type/zipkin/src/main/resources/META-INF/conf/zipkin-proxy-advisors.yaml
index f8a7f8de704..5bef72811bc 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/resources/META-INF/conf/zipkin-proxy-advisors.yaml
+++
b/agent/plugins/tracing/type/zipkin/src/main/resources/META-INF/conf/zipkin-proxy-advisors.yaml
@@ -17,17 +17,17 @@
advisors:
- target:
org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask
- advice:
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.CommandExecutorTaskAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.ZipkinCommandExecutorTaskAdvice
pointcuts:
- name: run
type: method
- target:
org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine
- advice:
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.SQLParserEngineAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.ZipkinSQLParserEngineAdvice
pointcuts:
- name: parse
type: method
- target:
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback
- advice:
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.JDBCExecutorCallbackAdvice
+ advice:
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.ZipkinJDBCExecutorCallbackAdvice
pointcuts:
- name: execute
type: method
diff --git
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinCommandExecutorTaskAdviceTest.java
similarity index 91%
rename from
agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
rename to
agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinCommandExecutorTaskAdviceTest.java
index 1172d0550dd..5da479191e4 100644
---
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
+++
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinCommandExecutorTaskAdviceTest.java
@@ -30,14 +30,14 @@ import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutorTaskAdviceTest {
+public final class ZipkinCommandExecutorTaskAdviceTest extends
AbstractCommandExecutorTaskAdviceTest {
@ClassRule
public static final ZipkinCollector COLLECTOR = new ZipkinCollector();
@Test
public void assertMethod() {
- CommandExecutorTaskAdvice advice = new CommandExecutorTaskAdvice();
+ ZipkinCommandExecutorTaskAdvice advice = new
ZipkinCommandExecutorTaskAdvice();
advice.beforeMethod(getTargetObject(), null, new Object[]{}, "Zipkin");
advice.afterMethod(getTargetObject(), null, new Object[]{}, null,
"Zipkin");
Span span = COLLECTOR.pop();
@@ -50,7 +50,7 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
@Test
public void assertExceptionHandle() {
- CommandExecutorTaskAdvice advice = new CommandExecutorTaskAdvice();
+ ZipkinCommandExecutorTaskAdvice advice = new
ZipkinCommandExecutorTaskAdvice();
advice.beforeMethod(getTargetObject(), null, new Object[]{}, "Zipkin");
advice.onThrowing(getTargetObject(), null, new Object[]{}, new
IOException(), "Zipkin");
advice.afterMethod(getTargetObject(), null, new Object[]{}, null,
"Zipkin");
diff --git
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinJDBCExecutorCallbackAdviceTest.java
similarity index 93%
rename from
agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
rename to
agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinJDBCExecutorCallbackAdviceTest.java
index 61e44fee3b5..e6d1bcf922d 100644
---
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinJDBCExecutorCallbackAdviceTest.java
@@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
-public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCallbackAdviceTest {
+public final class ZipkinJDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCallbackAdviceTest {
@ClassRule
public static final ZipkinCollector COLLECTOR = new ZipkinCollector();
@@ -44,7 +44,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
@Test
public void assertMethod() {
- JDBCExecutorCallbackAdvice advice = new JDBCExecutorCallbackAdvice();
+ ZipkinJDBCExecutorCallbackAdvice advice = new
ZipkinJDBCExecutorCallbackAdvice();
advice.beforeMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, "Zipkin");
advice.afterMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, null, "Zipkin");
Span span = COLLECTOR.pop();
@@ -61,7 +61,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
@Test
public void assertExceptionHandle() {
- JDBCExecutorCallbackAdvice advice = new JDBCExecutorCallbackAdvice();
+ ZipkinJDBCExecutorCallbackAdvice advice = new
ZipkinJDBCExecutorCallbackAdvice();
advice.beforeMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, "Zipkin");
advice.onThrowing(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, new IOException(),
"Zipkin");
advice.afterMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, null, "Zipkin");
diff --git
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdviceTest.java
similarity index 94%
rename from
agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
rename to
agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdviceTest.java
index 065ab961025..738dafad848 100644
---
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdviceTest.java
@@ -34,14 +34,14 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotNull;
-public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdviceTest {
+public final class ZipkinSQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdviceTest {
@ClassRule
public static final ZipkinCollector COLLECTOR = new ZipkinCollector();
private static final String SQL_STATEMENT = "select 1";
- private SQLParserEngineAdvice advice;
+ private ZipkinSQLParserEngineAdvice advice;
private Span parentSpan;
@@ -49,7 +49,7 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
public void setup() {
parentSpan = Tracing.currentTracer().newTrace().name("parent").start();
ExecutorDataMap.getValue().put(ZipkinConstants.ROOT_SPAN, parentSpan);
- advice = new SQLParserEngineAdvice();
+ advice = new ZipkinSQLParserEngineAdvice();
}
@Test
