Merge pull request #2 from apache/master

Update fork

.github/ISSUE_TEMPLATE

@@ -1,16 +1,24 @@
 Please answer these questions before submitting your issue.
 
-### What version of sky-walking are you using?
+- Why do you submit this issue?
+- [ ] Question or discussion
+- [ ] Bug
+- [ ] Requirement
+- [ ] Feature or performance improvement
 
+___
+### Question
+- What do you want to know?
 
-### What version of your OS?
+___
+### Bug
+- Which version of SkyWalking, OS and JRE?
 
+- Which company or project?
 
-### What version of your JRE?
-
-
-### What company or project?
-
-
-### What did you do?
+- What happen?
 If possible, provide a way for reproducing the error. e.g. demo application, component version.
+
+___
+### Requirement or improvement
+- Please describe about your requirements or improvement suggestions.

.github/PULL_REQUEST_TEMPLATE

@@ -0,0 +1,18 @@
+Please answer these questions before submitting pull request
+
+- Why submit this pull request?
+- [ ] Bug fix
+- [ ] New feature provided
+- [ ] Improve performance
+
+- Related issues
+
+___
+### Bug fix
+- Bug description.
+
+- How to fix?
+
+___
+### New feature or improvement
+- Describe the details and related test reports.

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "skywalking-ui"]
+	path = skywalking-ui
+	url = https://github.com/apache/incubator-skywalking-ui
+[submodule "apm-protocol/apm-network/src/main/proto"]
+	path = apm-protocol/apm-network/src/main/proto
+	url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git

.travis.yml

@@ -1,12 +1,14 @@
 sudo: required
 
-services:
-  - docker
-
 language: java
+before_install:
+  - cd ci-dependencies
+  - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/ojdbc14-10.2.0.4.0.jar
+  - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/resin-4.0.41.jar
+  - cd ..
+
 install:
   - jdk_switcher use oraclejdk8
   - mvn clean install --quiet jacoco:report coveralls:report
+  - mvn clean javadoc:javadoc -Dmaven.test.skip=true --quiet
 
-after_success:
-  - bash ./travis/push_image.sh

DISCLAIMER

@@ -0,0 +1,5 @@
+Apache SkyWalking (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. 
+Incubation is required of all newly accepted projects until a further review indicates 
+that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
+While incubation status is not necessarily a reflection of the completeness or stability of the code, 
+it does indicate that the project has yet to be fully endorsed by the ASF.

NOTICE.txt

@@ -0,0 +1,21 @@
+Apache SkyWalking
+Copyright 2015-2018 The Apache Software Foundation
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+The binary distribution contains software developed by:
+
+raphw (byte-buddy): http://bytebuddy.net/ , Apache 2.0
+INRIA, France Telecom (asm): http://asm.ow2.org/ , [asmdex-license](http://asm.ow2.org/asmdex-license.html)
+Google:
+- grpc: https://grpc.io/ , Apache 2.0
+- guava: https://github.com/google/guava , Apache 2.0
+- gson: https://github.com/google/gson , Apache 2.0
+Elasticsearch BV (Elasticsearch): https://www.elastic.co/products/elasticsearch , Apache 2.0
+H2 Database: http://www.h2database.com/html/main.html , MPL 2.0 or EPL 1.0
+LMAX Ltd.(disruptor): https://github.com/LMAX-Exchange/disruptor , Apache 2.0
+mockito: http://site.mockito.org/ , MIT
+QOS.ch (slf4j): https://www.slf4j.org/ , MIT
+powermock: https://github.com/powermock/powermock , Apache 2.0
+Eclipse (Jetty): https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse Public License 1.0

README.md

@@ -3,10 +3,14 @@ Apache SkyWalking | [中文](README_ZH.md)
 
 <img src="https://skywalkingtest.github.io/page-resources/3.0/skywalking.png" alt="Sky Walking logo" height="90px" align="right" />
 
-**SkyWalking**: APM for Distributed Systems, also known Distributed Tracing System. 
+**SkyWalking**: APM (application performance monitor) tool for distributed systems, especially designed for 
+microservices, cloud native and container-based (Docker, K8s, Mesos) architectures.
+Underlying technology is a distributed tracing system.
+
+[![GitHub stars](https://img.shields.io/github/stars/apache/incubator-skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/incubator-skywalking)
+[![Twitter Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
 [![Build Status](https://travis-ci.org/apache/incubator-skywalking.svg?branch=master)](https://travis-ci.org/apache/incubator-skywalking)
-[![Coverage Status](https://coveralls.io/repos/github/apache/incubator-skywalking/badge.svg?branch=master&u=1)](https://coveralls.io/github/apache/incubator-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)
 
@@ -18,16 +22,15 @@ Apache SkyWalking | [中文](README_ZH.md)
   * Use **@Trace** annotation for any methods you want to trace.
   * Integrate traceId into logs for log4j, log4j2 and logback.
 * Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. 
-* The UI released on [skywalking-ui](https://github.com/apache/incubator-skywalking-ui)
-
-# Architecture
-* Architecture graph for 3.2.5+
-<img src="https://skywalkingtest.github.io/page-resources/3.2.5%2b_architecture.jpg"/>
 
 # Document
-[![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)
+[![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/文档-中文版-blue.svg)](docs/README_ZH.md)
+
+# 5.x Architecture
+<img src="https://skywalkingtest.github.io/page-resources/5.0/architecture.png"/>
 
-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.
+# Code of conduct
+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 wusheng@apache.org.
 
 # Screenshots
 - Discovery topological graph of application clusters automatically.

README_ZH.md

@@ -3,34 +3,36 @@ Apache SkyWalking | [English](README.md)
 
 <img src="https://skywalkingtest.github.io/page-resources/3.0/skywalking.png" alt="Sky Walking logo" height="90px" align="right" />
 
-**SkyWalking**: 针对分布式系统的APM系统，也被称为分布式追踪系统
+**SkyWalking**: 针对分布式系统的APM（应用性能监控）系统，特别针对微服务、cloud native和容器化(Docker, K8s, Mesos)架构，
+其核心是个分布式追踪系统。
+
+[![GitHub stars](https://img.shields.io/github/stars/apache/incubator-skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/incubator-skywalking)
+[![Twitter Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
 [![Build Status](https://travis-ci.org/apache/incubator-skywalking.svg?branch=master)](https://travis-ci.org/apache/incubator-skywalking)
-[![Coverage Status](https://coveralls.io/repos/github/apache/incubator-skywalking/badge.svg?branch=master&u=1)](https://coveralls.io/github/apache/incubator-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开销。
+  * 高性能探针，针对单实例5000tps的应用，在**全量采集的情况下**，只增加 **10%** 的CPU开销。
   * [中间件，框架与类库支持列表](docs/Supported-list.md).
 * 手动探针
   * [使用OpenTracing手动探针API](http://opentracing.io/documentation/pages/supported-tracers)
   * 使用 [**@Trace**](docs/cn/Application-toolkit-trace-CN.md) 标注追踪业务方法
   * 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中
 * 纯Java后端Collector实现，提供RESTful和gRPC接口。兼容接受其他语言探针发送数据 
   * [如何将探针的Metric和Trace数据上传到Collector？](/docs/cn/How-to-communicate-with-the-collector-CN.md)
-* UI工程请查看 [skywalking-ui](https://github.com/apache/incubator-skywalking-ui)
-* 中文QQ群：392443393
-
-# Architecture
-* 3.2.5+版本架构图
-<img src="https://skywalkingtest.github.io/page-resources/3.2.5%2b_architecture.jpg"/>
 
 # Document
-[![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)
+[![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/文档-中文版-blue.svg)](docs/README_ZH.md)
+
+
+# 5.x Architecture
+<img src="https://skywalkingtest.github.io/page-resources/5.0/architecture.png"/>
 
-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.
+# code of conduct
+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 wusheng@apache.org.
 
 # Screenshots
 - 分布式系统拓扑图自动发现
@@ -56,7 +58,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU
 - 自动化集成测试报告
   - [Java探针测试报告](https://github.com/SkywalkingTest/agent-integration-test-report)
 - 性能测试报告
-  - [Java探针测试报告](https://skywalkingtest.github.io/Agent-Benchmarks/)
+  - [Java探针测试报告](https://skywalkingtest.github.io/Agent-Benchmarks/)
 
 # Contact Us
 * 直接提交Issue

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

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.apache.skywalking</groupId>
-        <version>5.0-2018-preview</version>
+        <version>5.0.0-alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.apache.skywalking</groupId>
-        <version>5.0-2018-preview</version>
+        <version>5.0.0-alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java

@@ -27,7 +27,7 @@
 /**
  * {@link TraceIdConverter} is a log4j2 plugin, by annotation as {@link Plugin}.
  * It convert the pattern key: traceId.
- * Use '%traceId' in log4j2's config: <PatternLayout pattern="%d [%traceId] %-5p %c{1}:%L - %m%n"/>,
+ * Use '%traceId' in log4j2's config.
  * '%traceId' will output as TID:xxxx
  * <p>
  * Created by wusheng on 2016/12/7.

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

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.apache.skywalking</groupId>
-        <version>5.0-2018-preview</version>
+        <version>5.0.0-alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.7</version>
+            <version>1.2.3</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

apm-application-toolkit/apm-toolkit-opentracing/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.apache.skywalking</groupId>
-        <version>5.0-2018-preview</version>
+        <version>5.0.0-alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-application-toolkit/apm-toolkit-trace/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.apache.skywalking</groupId>
-        <version>5.0-2018-preview</version>
+        <version>5.0.0-alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-application-toolkit/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apm</artifactId>
         <groupId>org.apache.skywalking</groupId>
-        <version>5.0-2018-preview</version>
+        <version>5.0.0-alpha-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apm-application-toolkit</artifactId>