This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 1dec40cd413 Add shardingsphere-agent-tracing-core module (#23687)
1dec40cd413 is described below
commit 1dec40cd41337ecb761b4cb8d3dfb241a4e72cc8
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 21 00:30:10 2023 +0800
Add shardingsphere-agent-tracing-core module (#23687)
---
agent/plugins/tracing/{type => core}/pom.xml | 21 +--------------------
.../agent/plugin/tracing/core}/RootSpanContext.java | 2 +-
agent/plugins/tracing/pom.xml | 2 ++
agent/plugins/tracing/type/pom.xml | 6 ++++++
.../advice/ZipkinCommandExecutorTaskAdvice.java | 2 +-
.../advice/ZipkinJDBCExecutorCallbackAdvice.java | 2 +-
.../zipkin/advice/ZipkinSQLParserEngineAdvice.java | 2 +-
.../advice/ZipkinSQLParserEngineAdviceTest.java | 2 +-
8 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/agent/plugins/tracing/type/pom.xml
b/agent/plugins/tracing/core/pom.xml
similarity index 74%
copy from agent/plugins/tracing/type/pom.xml
copy to agent/plugins/tracing/core/pom.xml
index a92a4d4abd0..ca771e74f74 100644
--- a/agent/plugins/tracing/type/pom.xml
+++ b/agent/plugins/tracing/core/pom.xml
@@ -24,21 +24,9 @@
<artifactId>shardingsphere-agent-plugin-tracing</artifactId>
<version>5.3.2-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-agent-tracing-type</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-agent-tracing-core</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>opentracing</module>
- <module>opentelemetry</module>
- <module>jaeger</module>
- <module>zipkin</module>
- </modules>
-
- <properties>
-
<target.directory>${project.basedir}/../target/plugins</target.directory>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -52,12 +40,5 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-tracing-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/span/RootSpanContext.java
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/RootSpanContext.java
similarity index 95%
rename from
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/span/RootSpanContext.java
rename to
agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/RootSpanContext.java
index c24b1d400d0..1ee8774657f 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/span/RootSpanContext.java
+++
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/RootSpanContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.plugin.tracing.zipkin.span;
+package org.apache.shardingsphere.agent.plugin.tracing.core;
import com.alibaba.ttl.TransmittableThreadLocal;
diff --git a/agent/plugins/tracing/pom.xml b/agent/plugins/tracing/pom.xml
index cb74c35a5e7..b05abd2311b 100644
--- a/agent/plugins/tracing/pom.xml
+++ b/agent/plugins/tracing/pom.xml
@@ -29,7 +29,9 @@
<name>${project.artifactId}</name>
<modules>
+ <module>core</module>
<module>type</module>
+
<module>test</module>
</modules>
diff --git a/agent/plugins/tracing/type/pom.xml
b/agent/plugins/tracing/type/pom.xml
index a92a4d4abd0..be26dac71f4 100644
--- a/agent/plugins/tracing/type/pom.xml
+++ b/agent/plugins/tracing/type/pom.xml
@@ -40,6 +40,12 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-agent-tracing-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-proxy-frontend-core</artifactId>
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinCommandExecutorTaskAdvice.java
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinCommandExecutorTaskAdvice.java
index 7b96a44c936..66926358300 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinCommandExecutorTaskAdvice.java
+++
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinCommandExecutorTaskAdvice.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.plugin.core.util.AgentReflectionUtil;
import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
-import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.span.RootSpanContext;
+import org.apache.shardingsphere.agent.plugin.tracing.core.RootSpanContext;
import org.apache.shardingsphere.proxy.backend.communication.BackendConnection;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinJDBCExecutorCallbackAdvice.java
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinJDBCExecutorCallbackAdvice.java
index 99d3ffa5f8a..bf6a5ca5fc0 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinJDBCExecutorCallbackAdvice.java
+++
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinJDBCExecutorCallbackAdvice.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.plugin.core.util.AgentReflectionUtil;
import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
-import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.span.RootSpanContext;
+import org.apache.shardingsphere.agent.plugin.tracing.core.RootSpanContext;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdvice.java
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdvice.java
index 3e7c0985b85..a865225141b 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdvice.java
+++
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdvice.java
@@ -22,7 +22,7 @@ import brave.Tracing;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
-import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.span.RootSpanContext;
+import org.apache.shardingsphere.agent.plugin.tracing.core.RootSpanContext;
import java.lang.reflect.Method;
diff --git
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdviceTest.java
index 1587691fd6d..ce2a669171d 100644
---
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/ZipkinSQLParserEngineAdviceTest.java
@@ -22,7 +22,7 @@ import brave.Tracing;
import
org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractSQLParserEngineAdviceTest;
import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.collector.ZipkinCollector;
import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
-import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.span.RootSpanContext;
+import org.apache.shardingsphere.agent.plugin.tracing.core.RootSpanContext;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
