You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2021/01/06 04:03:33 UTC
[shardingsphere] branch master updated: fix agent tracing test
(#8904)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 9797e20 fix agent tracing test (#8904)
9797e20 is described below
commit 9797e20cb1bed0a86a6acaabc232bc094d7ffdfe
Author: xiaoyu <54...@qq.com>
AuthorDate: Wed Jan 6 12:03:05 2021 +0800
fix agent tracing test (#8904)
---
.../shardingsphere-agent-bootstrap/pom.xml | 5 +++
.../shardingsphere-agent-core/pom.xml | 1 +
.../advice/CommandExecutorTaskAdviceTest.java | 22 ++++++-----
.../advice/JDBCExecutorCallbackAdviceTest.java | 43 ++++++++++-----------
.../jaeger/advice/SQLParserEngineAdviceTest.java | 20 +++++-----
.../advice/CommandExecutorTaskAdviceTest.java | 29 +++++++-------
.../advice/JDBCExecutorCallbackAdviceTest.java | 45 ++++++++++++----------
.../zipkin/advice/SQLParserEngineAdviceTest.java | 29 +++++++-------
8 files changed, 106 insertions(+), 88 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml b/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
index 39eb810..e7467fe 100644
--- a/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
@@ -38,6 +38,11 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-agent-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-core</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/shardingsphere-agent/shardingsphere-agent-core/pom.xml b/shardingsphere-agent/shardingsphere-agent-core/pom.xml
index 90b4dba..abf28e2 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-core/pom.xml
@@ -33,6 +33,7 @@
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-api</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
index f582bdc..ccbe09c 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
@@ -37,6 +37,10 @@ import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
public final class CommandExecutorTaskAdviceTest {
private static final CommandExecutorTaskAdvice ADVICE = new CommandExecutorTaskAdvice();
@@ -67,9 +71,9 @@ public final class CommandExecutorTaskAdviceTest {
ADVICE.beforeMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
ADVICE.afterMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
List<MockSpan> spans = tracer.finishedSpans();
- Assert.assertEquals(1, spans.size());
- Assert.assertEquals(0, spans.get(0).logEntries().size());
- Assert.assertEquals("/ShardingSphere/rootInvoke/", spans.get(0).operationName());
+ assertThat(spans.size(), is(1));
+ assertThat(spans.get(0).logEntries().size(), is(0));
+ assertThat(spans.get(0).operationName(), is("/ShardingSphere/rootInvoke/"));
}
@Test
@@ -81,14 +85,14 @@ public final class CommandExecutorTaskAdviceTest {
List<MockSpan> spans = tracer.finishedSpans();
Assert.assertEquals(1, spans.size());
MockSpan span = spans.get(0);
- Assert.assertTrue((boolean) span.tags().get("error"));
+ assertThat(span.tags().get("error"), is(true));
List<MockSpan.LogEntry> entries = span.logEntries();
- Assert.assertEquals(1, entries.size());
+ assertThat(entries.size(), is(1));
Map<String, ?> fields = entries.get(0).fields();
- Assert.assertEquals("error", fields.get("event"));
- Assert.assertEquals(null, fields.get("message"));
- Assert.assertEquals("java.io.IOException", fields.get("error.kind"));
- Assert.assertEquals("/ShardingSphere/rootInvoke/", span.operationName());
+ assertThat(fields.get("event"), is("error"));
+ assertNull(fields.get("message"));
+ assertThat(fields.get("error.kind"), is("java.io.IOException"));
+ assertThat(span.operationName(), is("/ShardingSphere/rootInvoke/"));
}
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
index d4d1b66..4ac7e17 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
@@ -29,7 +29,6 @@ import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -40,6 +39,8 @@ import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -69,30 +70,29 @@ public final class JDBCExecutorCallbackAdviceTest {
@Test
public void testMethod() {
- final MockTargetObject targetObject = new MockTargetObject();
- final Map<String, Object> extraMap = Maps.newHashMap();
+ MockTargetObject targetObject = new MockTargetObject();
+ Map<String, Object> extraMap = Maps.newHashMap();
extraMap.put("_root_span_", null);
JDBCExecutionUnit executionUnit = mock(JDBCExecutionUnit.class);
when(executionUnit.getExecutionUnit()).thenReturn(new ExecutionUnit("mock.db", new SQLUnit("select 1", Lists.newArrayList())));
ADVICE.beforeMethod(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new MethodInvocationResult());
ADVICE.afterMethod(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new MethodInvocationResult());
List<MockSpan> spans = tracer.finishedSpans();
- System.out.println(spans);
- Assert.assertEquals(1, spans.size());
+ assertThat(spans.size(), is(1));
MockSpan span = spans.get(0);
Map<String, Object> tags = span.tags();
- Assert.assertEquals(0, span.logEntries().size());
- Assert.assertEquals("/ShardingSphere/executeSQL/", span.operationName());
- Assert.assertEquals("mock.db", tags.get("db.instance"));
- Assert.assertEquals("sql", tags.get("db.type"));
- Assert.assertEquals("client", tags.get("span.kind"));
- Assert.assertEquals("select 1", tags.get("db.statement"));
+ assertThat(spans.get(0).logEntries().size(), is(0));
+ assertThat(span.operationName(), is("/ShardingSphere/executeSQL/"));
+ assertThat(tags.get("db.instance"), is("mock.db"));
+ assertThat(tags.get("db.type"), is("sql"));
+ assertThat(tags.get("span.kind"), is("client"));
+ assertThat(tags.get("db.statement"), is("select 1"));
}
@Test
public void testExceptionHandle() {
- final MockTargetObject targetObject = new MockTargetObject();
- final Map<String, Object> extraMap = Maps.newHashMap();
+ MockTargetObject targetObject = new MockTargetObject();
+ Map<String, Object> extraMap = Maps.newHashMap();
extraMap.put("_root_span_", null);
JDBCExecutionUnit executionUnit = mock(JDBCExecutionUnit.class);
when(executionUnit.getExecutionUnit()).thenReturn(new ExecutionUnit("mock.db", new SQLUnit("select 1", Lists.newArrayList())));
@@ -100,18 +100,17 @@ public final class JDBCExecutorCallbackAdviceTest {
ADVICE.onThrowing(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new IOException());
ADVICE.afterMethod(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new MethodInvocationResult());
List<MockSpan> spans = tracer.finishedSpans();
- Assert.assertEquals(1, spans.size());
+ assertThat(spans.size(), is(1));
MockSpan span = spans.get(0);
List<MockSpan.LogEntry> entries = span.logEntries();
Map<String, ?> fields = entries.get(0).fields();
- Assert.assertEquals("error", fields.get(ErrorLogTagKeys.EVENT));
- Assert.assertEquals("java.io.IOException", fields.get(ErrorLogTagKeys.ERROR_KIND));
+ assertThat(fields.get(ErrorLogTagKeys.EVENT), is("error"));
+ assertThat(fields.get(ErrorLogTagKeys.ERROR_KIND), is("java.io.IOException"));
Map<String, Object> tags = span.tags();
- Assert.assertSame("/ShardingSphere/executeSQL/", span.operationName());
- Assert.assertSame("mock.db", tags.get("db.instance"));
- Assert.assertSame("sql", tags.get("db.type"));
- Assert.assertSame("client", tags.get("span.kind"));
- Assert.assertSame("select 1", tags.get("db.statement"));
+ assertThat(span.operationName(), is("/ShardingSphere/executeSQL/"));
+ assertThat(tags.get("db.instance"), is("mock.db"));
+ assertThat(tags.get("db.type"), is("sql"));
+ assertThat(tags.get("span.kind"), is("client"));
+ assertThat(tags.get("db.statement"), is("select 1"));
}
-
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
index ff0ea85..95759ab 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
@@ -34,6 +34,9 @@ import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class SQLParserEngineAdviceTest {
private static final SQLParserEngineAdvice ADVICE = new SQLParserEngineAdvice();
@@ -63,9 +66,9 @@ public final class SQLParserEngineAdviceTest {
ADVICE.beforeMethod(targetObject, parserMethod, new Object[]{"select 1"}, new MethodInvocationResult());
ADVICE.afterMethod(targetObject, parserMethod, new Object[]{}, new MethodInvocationResult());
List<MockSpan> spans = tracer.finishedSpans();
- Assert.assertEquals(1, spans.size());
- Assert.assertEquals(0, spans.get(0).logEntries().size());
- Assert.assertEquals("/ShardingSphere/parseSQL/", spans.get(0).operationName());
+ assertThat(spans.size(), is(1));
+ assertThat(spans.get(0).logEntries().size(), is(0));
+ assertThat(spans.get(0).operationName(), is("/ShardingSphere/parseSQL/"));
}
@Test
@@ -75,15 +78,14 @@ public final class SQLParserEngineAdviceTest {
ADVICE.onThrowing(targetObject, parserMethod, new Object[]{}, new IOException());
ADVICE.afterMethod(targetObject, parserMethod, new Object[]{}, new MethodInvocationResult());
List<MockSpan> spans = tracer.finishedSpans();
- Assert.assertEquals(1, spans.size());
+ assertThat(spans.size(), is(1));
MockSpan span = spans.get(0);
Assert.assertTrue((boolean) span.tags().get("error"));
List<MockSpan.LogEntry> entries = span.logEntries();
- Assert.assertEquals(1, entries.size());
+ assertThat(entries.size(), is(1));
Map<String, ?> fields = entries.get(0).fields();
- Assert.assertEquals("error", fields.get(ErrorLogTagKeys.EVENT));
- Assert.assertEquals("java.io.IOException", fields.get(ErrorLogTagKeys.ERROR_KIND));
- Assert.assertEquals("/ShardingSphere/parseSQL/", span.operationName());
+ assertThat(fields.get(ErrorLogTagKeys.EVENT), is("error"));
+ assertThat(fields.get(ErrorLogTagKeys.ERROR_KIND), is("java.io.IOException"));
+ assertThat(span.operationName(), is("/ShardingSphere/parseSQL/"));
}
-
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
index 4a42e56..9521012 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
@@ -27,7 +27,6 @@ import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.Bac
import org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -37,6 +36,10 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
public final class CommandExecutorTaskAdviceTest extends AdviceTestBase {
private static Method executeCommandMethod;
@@ -53,6 +56,7 @@ public final class CommandExecutorTaskAdviceTest extends AdviceTestBase {
@Before
@SneakyThrows
+ @SuppressWarnings("all")
public void before() {
advice = new CommandExecutorTaskAdvice();
Object executorTask = new CommandExecutorTask(null, new BackendConnection(TransactionType.BASE), null, null);
@@ -64,12 +68,12 @@ public final class CommandExecutorTaskAdviceTest extends AdviceTestBase {
advice.beforeMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
advice.afterMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
Span span = SPANS.poll();
- Assert.assertNotNull(span);
+ assertNotNull(span);
Map<String, String> tags = span.tags();
- Assert.assertEquals(ZipkinConstants.DB_TYPE_VALUE, tags.get(ZipkinConstants.Tags.DB_TYPE));
- Assert.assertEquals(ZipkinConstants.COMPONENT_NAME, tags.get(ZipkinConstants.Tags.COMPONENT));
- Assert.assertEquals("0", tags.get(ZipkinConstants.Tags.CONNECTION_COUNT));
- Assert.assertEquals("/ShardingSphere/rootInvoke/".toLowerCase(), span.name());
+ assertThat(tags.get(ZipkinConstants.Tags.DB_TYPE), is(ZipkinConstants.DB_TYPE_VALUE));
+ assertThat(tags.get(ZipkinConstants.Tags.COMPONENT), is(ZipkinConstants.COMPONENT_NAME));
+ assertThat(tags.get(ZipkinConstants.Tags.CONNECTION_COUNT), is("0"));
+ assertThat(span.name(), is("/ShardingSphere/rootInvoke/".toLowerCase()));
}
@Test
@@ -78,18 +82,17 @@ public final class CommandExecutorTaskAdviceTest extends AdviceTestBase {
advice.onThrowing(targetObject, executeCommandMethod, new Object[]{}, new IOException());
advice.afterMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
Span span = SPANS.poll();
- Assert.assertNotNull(span);
+ assertNotNull(span);
Map<String, String> tags = span.tags();
- Assert.assertEquals("IOException", tags.get("error"));
- Assert.assertEquals(ZipkinConstants.DB_TYPE_VALUE, tags.get(ZipkinConstants.Tags.DB_TYPE));
- Assert.assertEquals(ZipkinConstants.COMPONENT_NAME, tags.get(ZipkinConstants.Tags.COMPONENT));
- Assert.assertEquals("0", tags.get(ZipkinConstants.Tags.CONNECTION_COUNT));
- Assert.assertEquals("/ShardingSphere/rootInvoke/".toLowerCase(), span.name());
+ assertThat(tags.get("error"), is("IOException"));
+ assertThat(tags.get(ZipkinConstants.Tags.DB_TYPE), is(ZipkinConstants.DB_TYPE_VALUE));
+ assertThat(tags.get(ZipkinConstants.Tags.COMPONENT), is(ZipkinConstants.COMPONENT_NAME));
+ assertThat(tags.get(ZipkinConstants.Tags.CONNECTION_COUNT), is("0"));
+ assertThat(span.name(), is("/ShardingSphere/rootInvoke/".toLowerCase()));
}
@After
public void cleanup() {
SPANS.clear();
}
-
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
index 07fbed2..935f7fd 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
@@ -29,7 +29,6 @@ import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -43,6 +42,10 @@ import java.sql.DatabaseMetaData;
import java.sql.Statement;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -69,6 +72,7 @@ public final class JDBCExecutorCallbackAdviceTest extends AdviceTestBase {
@Before
@SneakyThrows
+ @SuppressWarnings("all")
public void before() {
extraMap = Maps.newHashMap();
extraMap.put(ZipkinConstants.ROOT_SPAN, null);
@@ -101,16 +105,16 @@ public final class JDBCExecutorCallbackAdviceTest extends AdviceTestBase {
advice.beforeMethod(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new MethodInvocationResult());
advice.afterMethod(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new MethodInvocationResult());
Span span = SPANS.pollFirst();
- Assert.assertNotNull(span);
- Assert.assertEquals("/ShardingSphere/executeSQL/".toLowerCase(), span.name());
+ assertNotNull(span);
+ assertThat(span.name(), is("/ShardingSphere/executeSQL/".toLowerCase()));
Map<String, String> tags = span.tags();
- Assert.assertFalse(tags == null || tags.isEmpty());
- Assert.assertEquals("shardingsphere", tags.get(ZipkinConstants.Tags.COMPONENT));
- Assert.assertEquals("mock.db", tags.get(ZipkinConstants.Tags.DB_INSTANCE));
- Assert.assertEquals("select 1", tags.get(ZipkinConstants.Tags.DB_STATEMENT));
- Assert.assertEquals("shardingsphere-proxy", tags.get(ZipkinConstants.Tags.DB_TYPE));
- Assert.assertEquals("mock.host", tags.get(ZipkinConstants.Tags.PEER_HOSTNAME));
- Assert.assertEquals("1000", tags.get(ZipkinConstants.Tags.PEER_PORT));
+ assertFalse(tags == null || tags.isEmpty());
+ assertThat(tags.get(ZipkinConstants.Tags.COMPONENT), is("shardingsphere"));
+ assertThat(tags.get(ZipkinConstants.Tags.DB_INSTANCE), is("mock.db"));
+ assertThat(tags.get(ZipkinConstants.Tags.DB_STATEMENT), is("select 1"));
+ assertThat(tags.get(ZipkinConstants.Tags.DB_TYPE), is("shardingsphere-proxy"));
+ assertThat(tags.get(ZipkinConstants.Tags.PEER_HOSTNAME), is("mock.host"));
+ assertThat(tags.get(ZipkinConstants.Tags.PEER_PORT), is("1000"));
}
@Test
@@ -119,22 +123,21 @@ public final class JDBCExecutorCallbackAdviceTest extends AdviceTestBase {
advice.onThrowing(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new IOException());
advice.afterMethod(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new MethodInvocationResult());
Span span = SPANS.pollFirst();
- Assert.assertNotNull(span);
- Assert.assertEquals("/ShardingSphere/executeSQL/".toLowerCase(), span.name());
+ assertNotNull(span);
+ assertThat(span.name(), is("/ShardingSphere/executeSQL/".toLowerCase()));
Map<String, String> tags = span.tags();
- Assert.assertNotNull(tags);
- Assert.assertEquals("shardingsphere", tags.get(ZipkinConstants.Tags.COMPONENT));
- Assert.assertEquals("mock.db", tags.get(ZipkinConstants.Tags.DB_INSTANCE));
- Assert.assertEquals("select 1", tags.get(ZipkinConstants.Tags.DB_STATEMENT));
- Assert.assertEquals("shardingsphere-proxy", tags.get(ZipkinConstants.Tags.DB_TYPE));
- Assert.assertEquals("mock.host", tags.get(ZipkinConstants.Tags.PEER_HOSTNAME));
- Assert.assertEquals("1000", tags.get(ZipkinConstants.Tags.PEER_PORT));
- Assert.assertEquals("IOException", tags.get("error"));
+ assertNotNull(tags);
+ assertThat(tags.get(ZipkinConstants.Tags.COMPONENT), is("shardingsphere"));
+ assertThat(tags.get(ZipkinConstants.Tags.DB_INSTANCE), is("mock.db"));
+ assertThat(tags.get(ZipkinConstants.Tags.DB_STATEMENT), is("select 1"));
+ assertThat(tags.get(ZipkinConstants.Tags.DB_TYPE), is("shardingsphere-proxy"));
+ assertThat(tags.get(ZipkinConstants.Tags.PEER_HOSTNAME), is("mock.host"));
+ assertThat(tags.get(ZipkinConstants.Tags.PEER_PORT), is("1000"));
+ assertThat(tags.get("error"), is("IOException"));
}
@After
public void cleanup() {
SPANS.clear();
}
-
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
index 80e1dbc..4579269 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinCons
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -35,6 +34,9 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
public final class SQLParserEngineAdviceTest extends AdviceTestBase {
@@ -60,6 +62,7 @@ public final class SQLParserEngineAdviceTest extends AdviceTestBase {
@Before
@SneakyThrows
+ @SuppressWarnings("all")
public void before() {
parentSpan = Tracing.currentTracer().newTrace().name("parent").start();
ExecutorDataMap.getValue().put(ZipkinConstants.ROOT_SPAN, parentSpan);
@@ -82,15 +85,14 @@ public final class SQLParserEngineAdviceTest extends AdviceTestBase {
public void testMethod() {
advice.beforeMethod(targetObject, parseMethod, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
advice.afterMethod(targetObject, parseMethod, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
- // ensure the parent span(mock) finished
parentSpan.finish();
zipkin2.Span span = SPANS.pollFirst();
- Assert.assertNotNull(span);
- Assert.assertNotNull(span.parentId());
+ assertNotNull(span);
+ assertNotNull(span.parentId());
Map<String, String> tags = span.tags();
- Assert.assertNotNull(tags);
- Assert.assertEquals(ZipkinConstants.DB_TYPE_VALUE, tags.get(ZipkinConstants.Tags.DB_TYPE));
- Assert.assertEquals(ZipkinConstants.COMPONENT_NAME, tags.get(ZipkinConstants.Tags.COMPONENT));
+ assertNotNull(tags);
+ assertThat(tags.get(ZipkinConstants.Tags.DB_TYPE), is(ZipkinConstants.DB_TYPE_VALUE));
+ assertThat(tags.get(ZipkinConstants.Tags.COMPONENT), is(ZipkinConstants.COMPONENT_NAME));
}
@Test
@@ -101,18 +103,17 @@ public final class SQLParserEngineAdviceTest extends AdviceTestBase {
// ensure the parent span(mock) finished
parentSpan.finish();
zipkin2.Span span = SPANS.pollFirst();
- Assert.assertNotNull(span);
- Assert.assertNotNull(span.parentId());
+ assertNotNull(span);
+ assertNotNull(span.parentId());
Map<String, String> tags = span.tags();
- Assert.assertNotNull(tags);
- Assert.assertEquals("IOException", tags.get("error"));
- Assert.assertEquals(ZipkinConstants.DB_TYPE_VALUE, tags.get(ZipkinConstants.Tags.DB_TYPE));
- Assert.assertEquals(ZipkinConstants.COMPONENT_NAME, tags.get(ZipkinConstants.Tags.COMPONENT));
+ assertNotNull(tags);
+ assertThat(tags.get("error"), is("IOException"));
+ assertThat(tags.get(ZipkinConstants.Tags.DB_TYPE), is(ZipkinConstants.DB_TYPE_VALUE));
+ assertThat(tags.get(ZipkinConstants.Tags.COMPONENT), is(ZipkinConstants.COMPONENT_NAME));
}
@After
public void cleanup() {
SPANS.clear();
}
-
}