Datasource support by QilongZhang · Pull Request #58 · sofastack/sofa-tracer

QilongZhang · 2018-08-27T08:27:58Z

coveralls · 2018-08-27T09:32:17Z

Pull Request Test Coverage Report for Build 186

379 of 538 (70.45%) changed or added relevant lines in 26 files are covered.
3 unchanged lines in 2 files lost coverage.
Overall coverage increased (+0.8%) to 64.428%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/DBType.java	31	32	96.88%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/tracer/DataSourceTracerKeys.java	0	1	0.0%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/tracer/DataSourceTracerState.java	14	15	93.33%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/Prop.java	7	9	77.78%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/MethodRegistry.java	81	84	96.43%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/tracer/Endpoint.java	6	9	66.67%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/tracer/StatementTracerInterceptor.java	8	11	72.73%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/utils/SqlUtils.java	5	8	62.5%
tracer-samples/tracer-sample-with-h2/src/main/java/com/alipay/sofa/tracer/examples/datasource/DemoApplication.java	0	3	0.0%
sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/Invocation.java	7	11	63.64%

Files with Coverage Reduction	New Missed Lines	%
tracer-sofa-boot-starter/src/main/java/com/alipay/sofa/tracer/boot/springmvc/configuration/OpenTracingSpringMvcAutoConfiguration.java	1	92.86%
tracer-core/src/main/java/com/alipay/common/tracer/core/appender/self/TracerDaemon.java	2	66.67%

Totals
Change from base Build 171:	0.8%
Covered Lines:	2619
Relevant Lines:	4065

💛 - Coveralls

guanchao-yang · 2018-08-28T06:34:37Z

...datasource-plugin/src/test/java/com/sofa/tracer/plugins/datasource/base/FakeInterceptor.java

+            System.out.println("finally interceptor");
+        }
+        return reVal;
+    }


Sample 我们补充一个 https://www.sqlite.org/index.html sqllite 或者 http://www.h2database.com/html/main.html H2DB 的实例吧，这样场景更完整些

guanchao-yang · 2018-08-28T06:38:54Z

...tracer-datasource-plugin/src/test/java/com/sofa/tracer/plugins/datasource/base/BaseTest.java

这么 comment 就不出现中文了。

guanchao-yang · 2018-08-28T16:01:02Z

...ce-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/BasePreparedStatement.java

@QilongZhang

if (initialized) { return; } realPreparedStatement = doPrepareStatement(sql); for (PreparedParameter preparedParameter : preparedParameters) { preparedParameter.invoke(realPreparedStatement); } initialized = true;

这里在并发时，会有重复初始化的风险

理论上不会出现并发

@QilongZhang 这里多个线程同时调用这个实例方法就会有并发初始化的问题。 @Xiaoshu-Yan 关注哈。

guanchao-yang · 2018-08-29T12:32:08Z

tracer-samples/tracer-sample-with-h2/README.md

+    <groupId>com.alipay.sofa</groupId>
+    <artifactId>tracer-sofa-boot-starter</artifactId>
+</dependency>
+```


H2 客户端的依赖；还有启动方式也在这里加一下吧

guanchao-yang · 2018-08-29T12:32:41Z

tracer-samples/tracer-sample-with-h2/README.md

+该样例工程使用 H2 内存数据库，并暴露 /create 用于新建一张数据表，用户访问 /create 即可执行创建数据库表 SQL 语句：
+```sql
+DROP TABLE IF EXISTS TEST;
+CREATE TABLE TEST(ID INT PRIMARY KEY, NAME VARCHAR(255));


光这个 SQL 语句，用户拿到还是很蒙圈的。

这个仅仅是为了演示该条sql语句的tracer记录

guanchao-yang · 2018-08-29T12:36:26Z

@QilongZhang 和同步之前的代码冲突了。

guanchao-yang · 2018-09-11T07:22:21Z

...ce-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/BasePreparedStatement.java

@QilongZhang 这里多个线程同时调用这个实例方法就会有并发初始化的问题。 @Xiaoshu-Yan 关注哈。

ujjboy · 2018-09-12T06:44:38Z

...ter/src/main/java/com/alipay/sofa/tracer/boot/configuration/SofaTracerAutoConfiguration.java

Already import SofaTracerConfiguration , No need import static field of this.

@ujjboy it need. I try to delete it , but compile error.

ujjboy · 2018-09-12T06:45:03Z

...ter/src/main/java/com/alipay/sofa/tracer/boot/configuration/SofaTracerAutoConfiguration.java

TRACER_APPNAME_KEY change to SofaTracerConfiguration.TRACER_APPNAME_KEY

ujjboy · 2018-09-12T08:53:56Z

...tarter/src/test/java/com/alipay/sofa/tracer/boot/datasource/DataSourceTracerDisableTest.java

change to org.junit.Assert#assertTrue()

ujjboy · 2018-09-12T08:54:04Z

...-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/datasource/DataSourceTracerTest.java

change to org.junit.Assert#assertTrue()

ujjboy · 2018-09-12T08:54:47Z

...fa-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/datasource/DataSourceBFPPTest.java

change to org.junit.Assert#assertTrue()

ujjboy · 2018-09-12T10:55:42Z

...ava/com/alipay/sofa/tracer/boot/datasource/processor/DataSourceBeanFactoryPostProcessor.java

+                createDataSourceProxy(beanFactory, beanName, dataSource, getTomcatJdbcUrlKey());
+            } else if (DataSourceUtils.isHikariDataSource(dataSource.getBeanClassName())) {
+                createDataSourceProxy(beanFactory, beanName, dataSource, getHikariJdbcUrlKey());
+            }


It seems getXXKey() can move to DataSourceUtils, too. The code will more simple, like

createDataSourceProxy(beanFactory, beanName, dataSource, getJdbcUrlKeyByDataSource());

it has been moved to DataSourceUtils.

YanXs · 2018-09-27T16:50:16Z

...n/src/main/java/com/alipay/sofa/tracer/plugins/datasource/tracer/DataSourceClientTracer.java

这里应该是当前时间

@YanXs 已改成当前时间

Xiaoshu-Yan · 2018-08-30T14:47:54Z

...ce-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/BasePreparedStatement.java

+ * @author qilong.zql
+ * @since 2.2.0
+ */
+public abstract class BasePreparedStatement implements PreparedStatement {


这个类可以去掉，只是trace的话不会修改sql

@Xiaoshu-Yan 保留？主站会使用sql服务端埋点，可以直接依赖开源版扩展。

Xiaoshu-Yan · 2018-08-30T14:52:22Z

...-datasource-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/SecuritySpec.java

这个也删掉吧，没啥用

Xiaoshu-Yan · 2018-08-31T02:19:09Z

...lugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/ExtendedPreparedStatement.java

这个类名去掉Abstract改成 PreparedStatementInterceptorChainImpl

Xiaoshu-Yan · 2018-08-31T02:21:17Z

...source-plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/ExtendedStatement.java

这个类名也改一下吧 StatementInterceptorChainImpl

Xiaoshu-Yan · 2018-09-04T13:32:02Z

...ava/com/alipay/sofa/tracer/boot/datasource/processor/DataSourceBeanFactoryPostProcessor.java

+    }
+
+    public static String resolveDatabaseFromUrl(String url) {
+        Assert.isTrue(!StringUtils.isBlank(url), "Jdbc url must not be empty!");


考虑一下其他类型数据库，比如
oracle(jdbc:oracle:thin:@localhost:1521:sid)
sqlserver(jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks)

@Xiaoshu-Yan 已修改，1、支持 SQLServer 2、支持 oracle SID 格式

Xiaoshu-Yan · 2018-09-28T03:09:09Z

@QilongZhang 修改一下前面review

QilongZhang added 4 commits August 24, 2018 12:15

datasource draft

1fc5312

add datasource support

66c5791

add test case

cae5981

add testcase

09e1bd3

QilongZhang requested a review from guanchao-yang August 27, 2018 08:27

QilongZhang added the enhancement New feature or request label Aug 27, 2018

QilongZhang added this to the 2.2.0 milestone Aug 27, 2018

code formate

cb57a55

guanchao-yang requested changes Aug 28, 2018

View reviewed changes

delete unsed import

dcaad2b

guanchao-yang requested changes Aug 28, 2018

View reviewed changes

QilongZhang added 3 commits August 29, 2018 17:13

draft

45d014d

add datasource sample

512c851

add readme

952e17e

guanchao-yang requested changes Aug 29, 2018

View reviewed changes

QilongZhang added 2 commits August 29, 2018 20:47

fix conflict

3640ca1

add operation name

98dc552

QilongZhang requested a review from Xiaoshu-Yan August 30, 2018 12:56

QilongZhang added 5 commits September 3, 2018 16:02

optimize code

981dd21

code review

700ca9f

support auto druid

412a61d

auto support druid/c3p0/tomcat/dbcp/hikari

a10819f

add test case

b5361e9

guanchao-yang requested changes Sep 11, 2018

View reviewed changes

ujjboy requested changes Sep 12, 2018

View reviewed changes

QilongZhang added 2 commits September 13, 2018 08:45

fixed as review

5c19d8a

fix conflicts

b7b0db0

QilongZhang added 3 commits September 26, 2018 17:49

cr fix

df2c1db

fix npe

3b4f39a

code format

1230ac7

guanchao-yang approved these changes Sep 27, 2018

View reviewed changes

YanXs suggested changes Sep 27, 2018

View reviewed changes

add sql to stat.key

a4401c8

Xiaoshu-Yan approved these changes Sep 28, 2018

View reviewed changes

QilongZhang added 2 commits October 8, 2018 11:57

support sql server

9105152

add start time

8e5f988

ujjboy approved these changes Oct 8, 2018

View reviewed changes

QilongZhang merged commit 418e9af into sofastack:master Oct 8, 2018

QilongZhang deleted the datasource_support branch November 16, 2018 14:58

Conversation

QilongZhang commented Aug 27, 2018

Uh oh!

coveralls commented Aug 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 186

💛 - Coveralls

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

guanchao-yang commented Aug 29, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Xiaoshu-Yan commented Sep 28, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Comments

coveralls commented Aug 27, 2018 •

edited

Loading