Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support dubbo #183

Merged
merged 50 commits into from
Apr 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
9aa096b
Merge pull request #4 from alipay/master
glmapper Oct 10, 2018
3a897b4
Merge branch 'master-alipay'
Nov 8, 2018
d50a8a2
Merge branch 'master-alipay'
Nov 21, 2018
27923f4
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Dec 14, 2018
c6461b8
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Dec 27, 2018
c4652c4
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Jan 4, 2019
7758538
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Jan 7, 2019
1c94b31
Merge branch 'master-alipay'
Jan 25, 2019
518d87f
Merge branch 'master-alipay'
Jan 30, 2019
f74b0b3
Merge branch 'master-alipay'
Jan 31, 2019
3c09b2a
Merge branch 'master-alipay'
Feb 13, 2019
7747345
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Feb 20, 2019
2832112
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Feb 22, 2019
72b0467
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Feb 22, 2019
404d8a7
upgrade-2.3.4-SNAPSHOT
Feb 26, 2019
2e817c8
support dubbo
Mar 4, 2019
14ba0c5
fix test case
Mar 4, 2019
fe64513
fix test case
Mar 4, 2019
5b972e9
fix test case
Mar 4, 2019
04efaf9
user jdk8
Mar 4, 2019
ad04066
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Mar 4, 2019
17664cc
use map to store sapn and key id build by invoker's hashcode
Mar 7, 2019
05ad951
Merge branch 'upgrade-2.3.4-SNAPSHOT' into support-dubbo
Mar 7, 2019
92c2918
merge upstream
Mar 7, 2019
006f959
merge upstream
Mar 7, 2019
28fd903
code format
Mar 7, 2019
cf075de
add do deal with dubbo invoke timeoutexception
Mar 8, 2019
7fa7244
Merge branch 'master' into support-dubbo
glmapper Mar 8, 2019
c6e4103
codec fix
Mar 11, 2019
4643b3a
delete import
Mar 12, 2019
0cc4c87
Merge branch 'support-dubbo' of https://github.com/glmapper/sofa-trac…
Mar 12, 2019
824628f
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Mar 12, 2019
50d352c
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Mar 15, 2019
c6139a1
fix async callback
Mar 16, 2019
51fb323
clear tracer context
Mar 16, 2019
954d037
Merge branch 'master' of https://github.com/alipay/sofa-tracer into m…
Mar 22, 2019
ad9793a
Merge remote-tracking branch 'upstream/master'
Mar 26, 2019
989b651
Merge branch 'master' into support-dubbo
Mar 26, 2019
20a98cd
support dubbo
Mar 26, 2019
999f844
collect error tags msg to span
Mar 28, 2019
a7a5fcb
optimize duubo stat encoder
Mar 28, 2019
5f58d3c
optimize duubo stat encoder
Mar 28, 2019
1e706f5
solve conflic
Mar 28, 2019
0a3656f
Merge branch 'master' into support-dubbo
glmapper Mar 28, 2019
ead0008
add samples readme
Apr 3, 2019
f2fa51a
fix cr
Apr 3, 2019
9580e5f
rebuild
Apr 3, 2019
20ad9cd
fast json dependency management
Apr 4, 2019
2b38e5c
provider dubbo samples demos
Apr 4, 2019
2251c3a
rename demo name
Apr 4, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: java
sudo: false

jdk:
- openjdk7
- openjdk8

install:

Expand Down
16 changes: 13 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<module>sofa-tracer-plugins/sofa-tracer-datasource-plugin</module>
<module>sofa-tracer-plugins/sofa-tracer-resttmplate-plugin</module>
<module>sofa-tracer-plugins/sofa-tracer-zipkin-plugin</module>
<module>sofa-tracer-plugins/sofa-tracer-dubbo-plugin</module>
<module>tracer-all</module>
<module>tracer-sofa-boot-starter</module>
<module>tracer-samples</module>
Expand All @@ -35,8 +36,8 @@
<properties>
<opentracing.version>0.22.0</opentracing.version>
<sofa.tracer.version>2.4.0</sofa.tracer.version>
<java.compiler.source.version>1.6</java.compiler.source.version>
<java.compiler.target.version>1.6</java.compiler.target.version>
<java.compiler.source.version>1.8</java.compiler.source.version>
<java.compiler.target.version>1.8</java.compiler.target.version>
<jmh.version>1.9.3</jmh.version>
<project.encoding>UTF-8</project.encoding>
<main.user.dir>${user.dir}</main.user.dir>
Expand Down Expand Up @@ -123,6 +124,11 @@
<artifactId>sofa-tracer-zipkin-plugin</artifactId>
<version>${sofa.tracer.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-tracer-dubbo-plugin</artifactId>
<version>${sofa.tracer.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>tracer-all</artifactId>
Expand Down Expand Up @@ -216,9 +222,13 @@
<version>${jmh.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.51</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<resources>
<resource>
Expand Down
41 changes: 41 additions & 0 deletions sofa-tracer-plugins/sofa-tracer-dubbo-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sofa-tracer-dubbo-plugin</artifactId>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>2.7.0</version>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

写成provided就好了吧,如果有人要用sofa-tracer-dubbo-plugin,那他肯定是dubbo环境,如果不是dubbo环境误引入,我们也有conditionOnClass保证不报错,没必要把这个依赖带出去。

<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>tracer-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>

</dependencies>
</project>
Loading