Unverified Commit 858f66e8 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge branch 'master' into master

parents c87039a8 91386d43

.travis.yml

+1 −2
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ services: 
language: java

install:

  - jdk_switcher use oraclejdk8

  - mvn clean install

  - mvn clean install --quiet jacoco:report coveralls:report



after_success:

  - mvn clean test jacoco:report coveralls:report

  - bash ./travis/push_image.sh

README.md

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ Sky Walking | [中文](README_ZH.md) 
This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com.



# Screenshots

- Topological graph of application clusters based on dubbox and [motan](https://github.com/weibocom/motan).

- Discovery topological graph of application clusters automatically.

<img src="https://skywalkingtest.github.io/page-resources/3.2.1/topological_graph_test_project.png"/>



- Trace query.

README_ZH.md

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Sky Walking | [English](README.md) 
  * 使用 [**@Trace**](docs/cn/Application-toolkit-trace-CN.md) 标注追踪业务方法

  * 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中

* 纯Java后端Collector实现，提供RESTful和gRPC接口。兼容接受其他语言探针发送数据 

  * [如何将探针的Metric和Trace数据上传到Collector？]()

  * [如何将探针的Metric和Trace数据上传到Collector？](/docs/cn/How-to-communicate-with-the-collector-CN.md)

* UI工程请查看 [skywalking-ui](https://github.com/OpenSkywalking/skywalking-ui)

* 中文QQ群：392443393
@@ -33,7 +33,7 @@ Sky Walking | [English](README.md) 
This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com.



# Screenshots

- 追踪基于 dubbox 和 [motan](https://github.com/weibocom/motan)的分布式系统，生成的拓扑截图

- 分布式系统拓扑图自动发现

<img src="https://skywalkingtest.github.io/page-resources/3.2.1/topological_graph_test_project.png?forceUpdate=0"/>



- 调用链查询

apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <parent>

        <artifactId>apm-application-toolkit</artifactId>

        <groupId>org.skywalking</groupId>

        <version>3.2.5-2017</version>

        <version>3.3.0-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -49,6 +49,7 @@ 
                <executions>

                    <execution>

                        <id>attach-sources</id>

                        <phase>none</phase>

                        <goals>

                            <goal>jar</goal>

                        </goals>

apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <parent>

        <artifactId>apm-application-toolkit</artifactId>

        <groupId>org.skywalking</groupId>

        <version>3.2.5-2017</version>

        <version>3.3.0-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -49,6 +49,7 @@ 
                <executions>

                    <execution>

                        <id>attach-sources</id>

                        <phase>none</phase>

                        <goals>

                            <goal>jar</goal>

                        </goals>