Commit Graph

194 Commits

Author SHA1 Message Date
wqr2016 b9eafa08e9 Update powered-by.md (#1602) 2018-08-29 14:41:34 +08:00
Wu Sheng 42eb8f7376 The prototype codes of alarm bridge only. 2018-08-28 17:25:04 +08:00
Wu Sheng 38212dc97c Remove duplicate words 2018-08-27 22:41:51 +08:00
Wu Sheng 06e62f0dd1 Update user to powered-by doc. 2018-08-27 22:18:06 +08:00
Wu Sheng 53e8608832 Merge branch 'master' into 6.0
# Conflicts:
#	.gitignore
#	LICENSE
#	README.md
#	README_ZH.md
#	apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
#	apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
#	apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
#	apm-application-toolkit/apm-toolkit-opentracing/pom.xml
#	apm-application-toolkit/apm-toolkit-trace/pom.xml
#	apm-application-toolkit/pom.xml
#	apm-checkstyle/pom.xml
#	apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml
#	apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml
#	apm-collector/apm-collector-agent/agent-grpc/pom.xml
#	apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml
#	apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml
#	apm-collector/apm-collector-agent/agent-jetty/pom.xml
#	apm-collector/apm-collector-agent/pom.xml
#	apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml
#	apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml
#	apm-collector/apm-collector-analysis/analysis-alarm/pom.xml
#	apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml
#	apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml
#	apm-collector/apm-collector-analysis/analysis-baseline/pom.xml
#	apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml
#	apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml
#	apm-collector/apm-collector-analysis/analysis-jvm/pom.xml
#	apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml
#	apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml
#	apm-collector/apm-collector-analysis/analysis-metric/pom.xml
#	apm-collector/apm-collector-analysis/analysis-register/pom.xml
#	apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml
#	apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml
#	apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml
#	apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml
#	apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml
#	apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml
#	apm-collector/apm-collector-analysis/pom.xml
#	apm-collector/apm-collector-boot/pom.xml
#	apm-collector/apm-collector-boot/src/main/resources/component-libraries.yml
#	apm-collector/apm-collector-cache/collector-cache-caffeine-provider/pom.xml
#	apm-collector/apm-collector-cache/collector-cache-define/pom.xml
#	apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
#	apm-collector/apm-collector-cache/pom.xml
#	apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
#	apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
#	apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
#	apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
#	apm-collector/apm-collector-cluster/pom.xml
#	apm-collector/apm-collector-component/client-component/pom.xml
#	apm-collector/apm-collector-component/pom.xml
#	apm-collector/apm-collector-component/server-component/pom.xml
#	apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml
#	apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml
#	apm-collector/apm-collector-configuration/pom.xml
#	apm-collector/apm-collector-core/pom.xml
#	apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
#	apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
#	apm-collector/apm-collector-grpc-manager/pom.xml
#	apm-collector/apm-collector-instrument/pom.xml
#	apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
#	apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
#	apm-collector/apm-collector-jetty-manager/pom.xml
#	apm-collector/apm-collector-naming/collector-naming-define/pom.xml
#	apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml
#	apm-collector/apm-collector-naming/pom.xml
#	apm-collector/apm-collector-remote/collector-remote-define/pom.xml
#	apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml
#	apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml
#	apm-collector/apm-collector-remote/pom.xml
#	apm-collector/apm-collector-storage/collector-storage-define/pom.xml
#	apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml
#	apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml
#	apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/pom.xml
#	apm-collector/apm-collector-storage/pom.xml
#	apm-collector/apm-collector-thirdparty-receiver/pom.xml
#	apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/pom.xml
#	apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-define/pom.xml
#	apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/pom.xml
#	apm-collector/apm-collector-ui/collector-ui-define/pom.xml
#	apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml
#	apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
#	apm-collector/apm-collector-ui/pom.xml
#	apm-collector/pom.xml
#	apm-commons/apm-datacarrier/pom.xml
#	apm-commons/apm-util/pom.xml
#	apm-commons/pom.xml
#	apm-dist/pom.xml
#	apm-protocol/apm-network/pom.xml
#	apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
#	apm-protocol/apm-ui-protocol/pom.xml
#	apm-protocol/pom.xml
#	apm-sniffer/apm-agent-core/pom.xml
#	apm-sniffer/apm-agent/pom.xml
#	apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml
#	apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml
#	apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml
#	apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
#	apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml
#	apm-sniffer/apm-test-tools/pom.xml
#	apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml
#	apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml
#	apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml
#	apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml
#	apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml
#	apm-sniffer/apm-toolkit-activation/pom.xml
#	apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
#	apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml
#	apm-sniffer/optional-plugins/pom.xml
#	apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml
#	apm-sniffer/pom.xml
#	apm-webapp/pom.xml
#	docs/README.md
#	docs/README_ZH.md
#	docs/cn/Direct-uplink-CN.md
#	docs/cn/How-to-build-CN.md
#	docs/cn/Optional-plugins-CN.md
#	docs/users.md
#	pom.xml
2018-08-25 22:08:19 +08:00
caoyixiong 60e829fa30 Add the function of the specified agent config 2018-08-25 21:41:42 +08:00
caoyixiong 6e6e13b9f5 add the function of the specified agent config (#1584)
* Fix bug stop stopSpan when not createSpan

* Fix bug stop stopSpan when not createSpan

* change the agent log level to millisecond

* add the function of the specified-agent-config

* Update README_ZH.md

* Use -D  to set the specified config path

* add docs

* update docs

* change method name

* add link

* change the function name

* change the key

* format doc
2018-08-25 19:00:27 +08:00
Adrian Cole 4b17685c11 Sync mvnw to 6.0 , provided by @adriancole 2018-08-22 22:50:50 +08:00
oatiz b3959202df [Agent] Provide plugin for Elasticsearch 5.x (#1500)
* [Agent] Provide plugin for Elasticsearch 5.x

Add [Agent] Elasticsearch transport client plugin

fix component name

add elasticsearch component

add elasticSearch component into component-libraries.yml

* update support list

* update PlainListenableActionFutureInterceptor.java

* fix set span attributes

* clear runtimeContext

* remove extra plugins
2018-08-22 20:23:43 +08:00
Adrian Cole d0b951649f Moves to Maven wrapper to stabilize the version in use (#1569)
* Moves to Maven wrapper to stabilize the version in use

This will ensure those building will have similar experience due to
having a fixed maven version.

* Updates most plugin versions and removes redundant configuration

* Sets up build enforcement for JDK 1.8 until further work occurs
2018-08-22 19:04:15 +08:00
Wu Sheng c2df70674f Adjust documents. 2018-08-20 10:55:13 +08:00
Wu Sheng 01e69ff0a6 Update document. 2018-08-19 21:35:55 +08:00
Wu Sheng 66df7e6f45 Update JVM Scope names. 2018-08-18 15:24:00 +08:00
jinlong c0e79e9657 add new user (#1557)
add new user
2018-08-18 08:45:22 +08:00
jinlong 8302bbfdfd add new user (#1557)
add new user
2018-08-18 08:37:20 +08:00
吴晟 Wu Sheng 4d00324847
Change file name. (#1553) 2018-08-17 17:15:06 +08:00
Wu Sheng ba68d50d11 Add a new section in guides document. 2018-08-16 20:43:49 +08:00
Wu Sheng 1e51702bab Add component library settings document back. 2018-08-16 20:37:27 +08:00
Wu Sheng 550563aa8c Update protocol to 2.0 draft. 2018-08-16 15:54:09 +08:00
Wu Sheng da112c0fec Change protocol documents 2018-08-16 13:12:13 +08:00
吴晟 Wu Sheng 81516a7d56 Fix users. 2018-08-12 15:52:27 +08:00
吴晟 Wu Sheng 86da565a91
Update users (#1540)
* Update users.
2018-08-12 15:47:40 +08:00
mgsheng 7533ec0471 Update uses-list.md (#1537) 2018-08-10 20:25:49 +08:00
mgsheng ae00944ccd Update uses-list.md (#1537) 2018-08-10 12:00:04 +08:00
Wu Sheng 9ac0f07793 Refactor documents. Delete all backend documents, cc @peng-yongsheng , considering backend refactored, then the documents should rebuild manually. 2018-08-07 20:25:11 +08:00
吴晟 Wu Sheng d4590fd0d7
Update users.md 2018-08-07 17:16:54 +08:00
Wu Sheng 676e4ee930 Add a new scope ServiceInstance_JVM_GC 2018-08-06 15:08:15 +08:00
阿洋 d1684a74ab Add Abstract-CN.md (#1501) 2018-08-05 19:56:30 +08:00
XiaoFu de048b448d add ActiveMQ support (#1524) 2018-08-05 18:31:39 +08:00
XiaoFu 98200127fd add ActiveMQ support (#1524) 2018-08-05 09:20:35 +08:00
吴晟 Wu Sheng c10fc67838
Fix typo (#1514) 2018-08-02 10:48:18 +08:00
Wu Sheng c78be3af69 Change name. 2018-08-02 10:02:57 +08:00
Wu Sheng 454611db5e Add a missing word. 2018-07-30 17:32:00 +08:00
Wu Sheng c741e0afa2 Miss a format. 2018-07-30 17:06:15 +08:00
Wu Sheng e81f072fab Change scope document format. 2018-07-30 17:05:19 +08:00
Wu Sheng d28f91782c Add secondary scope for JVM. @hanahmily @peng-yongsheng 2018-07-30 17:02:19 +08:00
Wu Sheng 1a197c2221 Finish GraphQL protocol document. 2018-07-30 15:08:49 +08:00
Jared.Tan 4788ebda64 add Architecture-CN.md doc. (#1499)
* add Architecture-CN.md doc.

* Typo:fix some problems in doc.
2018-07-30 13:26:19 +08:00
吴晟 Wu Sheng 3cbf04feb8 Sync use cases to 6.0 2018-07-27 18:19:44 +08:00
吴晟 Wu Sheng d7fd23ff05
Update use cases (#1503)
* Add a separated use case list

* Update README_ZH.md

* Create use-case-list.md

Add use cases.

* Update README.md

* Update README_ZH.md

* Update README_ZH.md
2018-07-27 17:44:03 +08:00
Wu Sheng 7e4eccef08 Update a document sentence. 2018-07-27 15:47:21 +08:00
阿洋 8635fd3bc6 Add Component-libraries-extend-CN.md (#1487) 2018-07-24 09:17:59 +08:00
crystaldust eabf9a7da2 Polish the document 'overview and core concepts' (#1485) 2018-07-23 19:19:38 +08:00
mumu 06b6f05438 Add how to build in eclipse (#1464)
* Update How-to-build-CN.md
2018-07-18 11:10:56 +08:00
Wu Sheng 48348efe74 @lemon @ascrutae I change the proto file path for preparing 6.0, but didn't change .net namespace. But I think if you sync the protocol submodule, you still need some changes. 2018-07-17 14:20:58 +08:00
Jared.Tan 7744911c32 Typo:fix some duplication problems in docs (#1465)
* Typo:fix some duplication problems in docs

* Update Direct-uplink-CN.md
2018-07-17 12:36:20 +08:00
xinzhuxiansheng 44fc3e0742 Adjust and modify the catalog and doc under Supported-list.md (#1445)
* first commit

* ad

* add

* add

* add

* add

* add

* add

* add

* add

* add

* add

* add

* 调整和修改中间件,框架与类库支持列表 目录文档

* add

* add

* 修改Incubating

* add
2018-07-13 23:22:50 -07:00
Wu Sheng 736d7ae03f Fix some wrong in release doc. 2018-07-11 14:47:34 -07:00
彭勇升 pengys dcdfeb1e14 Feature/oap/cluster plugin (#1440)
* Cluster module implementation finished.
2018-07-10 23:50:08 -07:00
Wu Sheng e2009b294e Submit init version of Service Mesh probe protocol 2018-07-10 22:07:52 -07:00