Commit ad547e00 authored by 吴晟's avatar 吴晟
Browse files

Merge branch 'feature/collector-modelization' into feature/agent-memory-control 

* feature/collector-modelization: (55 commits)
  Change the exception to runtime exception in module find and service find method.
  Register graph finish.
  Application register test success.
  Fix a code style issue.
  Move instruments into an independency module in collector, named `apm-collector-instrument`.
  Remove ServiceInstrumentation mechanism for further collector agent design.
  Adjust startup sequence.
  cluster, naming, grpc manager, jetty manager, storage modules test successful.
  Segment standardization
  Parse and listener
  trace workers
  Register workers
  no message
  Add cache service manager in worker construction.
  Fix compile issues.
  Support WayToNode for entry node.
  JVM worker
  Use cache service from cache module.
  Refactor cache module to provide cache services.
  Fix a pom confilct.
  ...
parents 0eb0907d 0567bcd4

README.md

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Sky Walking | [中文](README_ZH.md) 
[![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).

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

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

* Manual instrumentation

  * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers)
@@ -25,7 +25,7 @@ Sky Walking | [中文](README_ZH.md) 
<img src="https://skywalkingtest.github.io/page-resources/3.x-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.
@@ -64,7 +64,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU 
[Open Skywalking Organization Teams and Contributors](https://github.com/OpenSkywalking/Organization/blob/master/README.md)



# Partners

<img src="https://skywalkingtest.github.io/page-resources/3.2.3/partners.png" width="600"/>

<img src="https://skywalkingtest.github.io/page-resources/3.2.4/partners.png" width="800"/>



# License

[Apache 2.0 License.](/LICENSE)

README_ZH.md

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Sky Walking | [English](README.md) 
<img src="https://skywalkingtest.github.io/page-resources/3.x-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.
@@ -68,7 +68,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU 
[Open Skywalking Organization Teams and Contributors](https://github.com/OpenSkywalking/Organization/blob/master/README.md)



# Partners

<img src="https://skywalkingtest.github.io/page-resources/3.2.3/partners.png" width="600"/>

<img src="https://skywalkingtest.github.io/page-resources/3.2.4/partners.png" width="800"/>



# License

[Apache 2.0 License.](/LICENSE)

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

+1 −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.2.4-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

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

+1 −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.2.4-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

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

+1 −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.2.4-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>