Skip to content

Commit

Permalink
Prepare to release 3.0.4. (#206)
Browse files Browse the repository at this point in the history 
* 1、升级zipkin版本值最新版本，ui支持中文；2、修复模型转换中的一些bug，去除对RPC类型的特殊处理逻辑；3、修复Endpoint计算逻辑；4、对于zipkin中的serviceName赋值，使用按服务节点作为serviceName，不在依赖span的oparetionName

* rename zipkin's base package name to com.alipay.sofa.tracer.plugins.zipkin

* glmapper-branch-3.x-sheery-pick

* rename zipkin's base package name to com.alipay.sofa.tracer.plugins.zipkin

* cheery pick okhttp

* Fix OkHttpTracer don't send log to Zipkin bug #173 (#173)

(cherry picked from commit f728346)

* compile&code format

* cheery pick datasource

* cheery pick datasource

* cherry pick

* okhttp

* up version 3.0.3 for sampler

* up version 3.0.3 for sampler

* code format

* sheery pick

* 移除采样参数设置

* rebuild

* prepare to release 3.0.3

* prepare to release
  • Loading branch information
@glmapper @leizhiyuan
glmapper authored and leizhiyuan committed Apr 7, 2019
1 parent 1797543 commit 6e12db7
Show file tree
Hide file tree
Showing 30 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>

<artifactId>tracer-all-parent</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<packaging>pom</packaging>
<name>tracer-all-parent</name>
<description>Alipay SOFATracer Log Implemented by OpenTracing</description>
Expand All @@ -35,7 +35,7 @@

<properties>
<opentracing.version>0.22.0</opentracing.version>
<sofa.tracer.version>3.0.4-SNAPSHOT</sofa.tracer.version>
<sofa.tracer.version>3.0.4</sofa.tracer.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>
Expand Down
2 changes: 1 addition & 1 deletion sofa-tracer-plugins/sofa-tracer-datasource-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sofa-tracer-plugins/sofa-tracer-dubbo-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sofa-tracer-plugins/sofa-tracer-httpclient-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sofa-tracer-plugins/sofa-tracer-okhttp-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sofa-tracer-plugins/sofa-tracer-spring-cloud-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sofa-tracer-plugins/sofa-tracer-springmvc-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion sofa-tracer-plugins/sofa-tracer-zipkin-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions tracer-all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>tracer-all</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<packaging>jar</packaging>

<name>SOFATracer in one without SOFABoot starter</name>
Expand Down
2 changes: 1 addition & 1 deletion tracer-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tracer-extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>

<artifactId>tracer-extensions</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>tracer-all-parent</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions tracer-samples/tracer-sample-with-dubbo/tracer-sample-with-dubbo-consumer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-sample-with-dubbo</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>tracer-sample-with-dubbo-facade</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-dubbo/tracer-sample-with-dubbo-facade/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-sample-with-dubbo</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions tracer-samples/tracer-sample-with-dubbo/tracer-sample-with-dubbo-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-sample-with-dubbo</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>tracer-sample-with-dubbo-facade</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-h2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofa-tracer-samples</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-httpclient/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofa-tracer-samples</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-openfeign/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofa-tracer-samples</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-sampler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>sofa-tracer-samples</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-slf4j/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-tracer-samples</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-sofarpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-tracer-samples</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-springmvc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-tracer-samples</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tracer-samples/tracer-sample-with-zipkin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-tracer-samples</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tracer-sofa-boot-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tracer-sofa-boot-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tracer-sofa-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tracer-test/core-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions tracer-test/log4j-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>tracer-extensions</artifactId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion tracer-test/log4j2-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tracer-test/logback-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>tracer-all-parent</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>3.0.4-SNAPSHOT</version>
<version>3.0.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 6e12db7

Please sign in to comment.