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

Merge branch 'master' into feature/support-rocketMQ-plugin

parents 30dbdc82 986700ea

.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

+7 −7
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ Sky Walking | [中文](README_ZH.md) 
**SkyWalking 3**: APM for Distributed Systems, also known Distributed Tracing System. 



[![Build Status](https://travis-ci.org/OpenSkywalking/skywalking.svg?branch=master)](https://travis-ci.org/OpenSkywalking/skywalking)

[![Coverage Status](https://coveralls.io/repos/github/OpenSkywalking/skywalking/badge.svg?branch=master&forceUpdate=2)](https://coveralls.io/github/OpenSkywalking/skywalking?branch=master)

[![Coverage Status](https://coveralls.io/repos/github/OpenSkywalking/skywalking/badge.svg?branch=master&forceUpdate=3)](https://coveralls.io/github/OpenSkywalking/skywalking?branch=master)

[![Join the chat at https://gitter.im/sky-walking/Lobby](https://badges.gitter.im/openskywalking/Lobby.svg)](https://gitter.im/openskywalking/Lobby)

[![OpenTracing-1.x Badge](https://img.shields.io/badge/OpenTracing--1.x-enabled-blue.svg)](http://opentracing.io)



* Provide Java agent, **no need to CHANGE any application source code**.

  * High performance agent. Only increase extra **10%** cpu cost in 5000+ tps application, even **When collect all traces**, [check test reports](#test-reports).

  * [Supported middlewares, frameworks and libraries](https://github.com/OpenSkywalking/sky-walking/wiki/3.2-supported-list).

  * High performance agent. Only increase extra **10%** cpu cost in 5000+ tps application, even **when collect all traces**.

  * [Supported middlewares, frameworks and libraries](docs/Supported-list.md).

* Manual instrumentation

  * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers)

  * Use **@Trace** annotation for any methods you want to trace.
@@ -21,16 +21,16 @@ Sky Walking | [中文](README_ZH.md) 
* The UI released on [skywalking-ui](https://github.com/OpenSkywalking/sky-walking-ui)



# Architecture

* Architecture graph for 3.2+

<img src="https://skywalkingtest.github.io/page-resources/3.x-architecture.jpg"/>

* Architecture graph for 3.2.5+

<img src="https://skywalkingtest.github.io/page-resources/3.2.5%2b_architecture.jpg"/>



# Document

* [WIKI](https://github.com/OpenSkywalking/skywalking/wiki)

[![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/document-中文-blue.svg)](docs/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

+9 −9
Original line number Diff line number Diff line
@@ -6,34 +6,34 @@ Sky Walking | [English](README.md) 
**SkyWalking 3**: 针对分布式系统的APM系统，也被称为分布式追踪系统



[![Build Status](https://travis-ci.org/OpenSkywalking/skywalking.svg?branch=master)](https://travis-ci.org/OpenSkywalking/skywalking)

[![Coverage Status](https://coveralls.io/repos/github/OpenSkywalking/skywalking/badge.svg?branch=master&forceUpdate=2)](https://coveralls.io/github/OpenSkywalking/skywalking?branch=master)

[![Coverage Status](https://coveralls.io/repos/github/OpenSkywalking/skywalking/badge.svg?branch=master&forceUpdate=3)](https://coveralls.io/github/OpenSkywalking/skywalking?branch=master)

[![Join the chat at https://gitter.im/openskywalking/Lobby](https://badges.gitter.im/openskywalking/Lobby.svg)](https://gitter.im/openskywalking/Lobby)

[![OpenTracing-1.x Badge](https://img.shields.io/badge/OpenTracing--1.x-enabled-blue.svg)](http://opentracing.io)





* Java自动探针，**不需要修改应用程序源代码**

  * 高性能探针，针对单实例5000tps的应用，在**全量采集的情况下**，只增加**10%**的CPU开销。

  * [中间件，框架与类库支持列表](https://github.com/wu-sheng/sky-walking/wiki/3.2-supported-list).

  * [中间件，框架与类库支持列表](docs/Supported-list.md).

* 手动探针

  * [使用OpenTracing手动探针API](http://opentracing.io/documentation/pages/supported-tracers)

  * 使用 [**@Trace**](https://github.com/wu-sheng/OpenSkywalking/wiki/sky-walking-application-toolkit-trace-chn) 标注追踪业务方法

  * 使用 [**@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



# Architecture

* 3.2+版本架构图

<img src="https://skywalkingtest.github.io/page-resources/3.x-architecture.jpg"/>

* 3.2.5+版本架构图

<img src="https://skywalkingtest.github.io/page-resources/3.2.5%2b_architecture.jpg"/>



# Document

* [WIKI](https://github.com/OpenSkywalking/skywalking/wiki)

[![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/document-中文-blue.svg)](docs/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

- 追踪基于 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"/>



- 调用链查询
@@ -60,7 +60,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU 


# Contact Us

* 直接提交Issue

* [Gitter](https://gitter.im/sky-walking/Lobby)

* [Gitter](https://gitter.im/openskywalking/Lobby)

* [Google Mailing List](https://groups.google.com/forum/#!forum/skywalking-distributed-tracing-and-apm)

* QQ群: 392443393

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.3-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.3-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>