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

Merge pull request #585 from OpenSkywalking/feature/collector-modelization 

Provide new collector modelization core and graph streaming core
parents 4bdea9e2 e3492228

README.md

+4 −4
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)
@@ -21,11 +21,11 @@ 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.

README_ZH.md

+2 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ Sky Walking | [English](README.md) 


# Architecture

* 3.2+版本架构图

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

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

apm-collector/apm-collector-agentstream/src/test/resources/logback.xml→apm-collector/apm-collector-agent/collector-agent-define/pom.xml

+12 −13
Original line number Diff line number Diff line
@@ -17,18 +17,17 @@ 
  ~ Project repository: https://github.com/OpenSkywalking/skywalking

  -->



<configuration>

    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

        <layout class="ch.qos.logback.classic.PatternLayout">

            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>

        </layout>

    </appender>

<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>apm-collector-agent</artifactId>

        <groupId>org.skywalking</groupId>

        <version>3.2.4-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <logger name="org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer" level="INFO"/>

    <logger name="org.eclipse.jetty" level="INFO"/>

    <logger name="org.apache.zookeeper" level="INFO"/>

    <artifactId>collector-agent-define</artifactId>

    <packaging>jar</packaging>



    <root level="info">

        <appender-ref ref="STDOUT"/>

    </root>

</configuration>
 
 No newline at end of file
 
</project>

apm-collector/apm-collector-agent/collector-agent-define/src/main/java/org/skywalking/apm/collector/agent/AgentModule.java

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2017, OpenSkywalking Organization All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * Project repository: https://github.com/OpenSkywalking/skywalking

 */



package org.skywalking.apm.collector.agent;



import org.skywalking.apm.collector.core.module.Module;



/**

 * @author peng-yongsheng

 */

public class AgentModule extends Module {



    public static final String NAME = "agent";



    @Override public String name() {

        return NAME;

    }



    @Override public Class[] services() {

        return new Class[0];

    }

}

apm-collector/apm-collector-agent/collector-agent-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#

# Copyright 2017, OpenSkywalking Organization All rights reserved.

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#     http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#

# Project repository: https://github.com/OpenSkywalking/skywalking

#



org.skywalking.apm.collector.agent.AgentModule
 
 No newline at end of file