Commit Graph

220 Commits

Author SHA1 Message Date
justeene 33c1db4e97 添加北京国槐信息科技有限公司 (#1840)
* 添加北京国槐信息科技有限公司

北京国槐信息科技有限公司

* Update powered-by.md

Change the order in alphabeta.
2018-10-29 14:45:16 +08:00
wuf1900 2b1ad220df Update powered-by.md (#1839)
add:1. Mypharma.com 北京融贯电子商务有限公司 https://www.mypharma.com
2018-10-29 11:30:21 +08:00
吴晟 Wu Sheng 2dd4f54957
Add some missing documents for v6 (#1830)
* Add more documents for v6.

* Make default setting consistent .
2018-10-28 21:45:58 +08:00
彭勇升 pengys 6c92fc5484 1. Delete service component indicator. (#1809)
2. Make service relation and endpoint relation to record component id.
3. Delete service mapping indicator.
4. Make service inventory to record mapping service id.
5. Refactor global topology query and service topology query.
2018-10-25 11:19:31 +08:00
彭勇升 pengys ee10c2361c Update powered-by.md (#1787) 2018-10-18 12:03:08 +08:00
eoeac 1a16f2936a Update powered-by.md (#1781) 2018-10-17 13:01:31 +08:00
Jared.Tan fbc4b63237 prepare chinese docs. (#1729)
* prepare chinese docs.
2018-10-07 22:51:14 +08:00
吴晟 Wu Sheng 7ad619ac91
Prepare new doc for v6 (#1695)
* Replace v5 changes by a link to 5.x branch. New v6 changelog.

* Finish query doc and fix a missing field in alarm doc.

* Add link to official oal in alarm doc.

* Fix words.

* Fix some doc

* Update README.md

* Update README.md

* Update README.md

* Update README.md
2018-10-07 09:51:29 +08:00
Savorboard 9d6c32c358 Fix broken links to the correct page (#1726)
* Fix broken links to the correct page.

* Direct getting started links to the correct doc
2018-10-01 16:26:23 +08:00
chenpengfei d941892664 Add Undertow 2.x plugin (#1700)
* Add Undertow 2.x plugin

* Undertow: Interceptor method executeRootHandler in class Connectors

* Change version number to 6.0.0-alpha-SNAPSHOT
2018-09-26 09:30:42 +08:00
吴晟 Wu Sheng 933ae20b1c Alarm module code core ready (#1644)
* Support alarm message.

* Fix document words.

* Support alarm hook.

* Fix javadoc issue.

* Sync submodule

* Sync submodule
2018-09-25 20:23:36 +08:00
吴晟 Wu Sheng 7e23f49539
Generate all metric for official release, also new func (#1679)
* New generated indicators for real backend system.

* Support cpm and new indicators.

* Fix CI and change document.

* Remove an useless line.
2018-09-17 12:02:01 +08:00
吴晟 Wu Sheng 64d886f197
Add document of contributions and some guides (#1672)
* Change oal doc.

* Remove typo

* Remove document WIP tag.

* Fix few words.

* no message

* Adjust contribution guides.
2018-09-13 21:01:36 +08:00
zaygrzx 8ed49205be Add Anxin Insurance to powered-by.md (#1640)
* Update powered-by.md
2018-09-07 16:09:22 +08:00
XiaoFu 1aa87fa2b5 6.x.doc (#1627)
* update build md

* add   generated-sources  protobuf  in  build.md
2018-09-05 17:55:26 +08:00
XiaoFu a0a4636810 update build md (#1626) 2018-09-05 14:58:09 +08:00
Wu Sheng f2811800b2 Add more ducoments. 2018-09-03 15:46:04 +08:00
Wu Sheng f80b031250 Add many new chapters of v6 document. Make the document more clear. 2018-09-02 23:11:56 +08:00
Wu Sheng 1b0d80c5fc Add a lot of documents. @peng-yongsheng @hanahmily . Also @hanahmily , the k8 cluster management document and deploy document need you to add. 2018-09-01 23:32:59 +08:00
吴晟 Wu Sheng de7994ff71
Update README.md 2018-09-01 19:58:06 +08:00
Wu Sheng 6d74e7829c Fix CI and release guide. 2018-08-31 22:57:19 +08:00
Wu Sheng c58861be74 Add user based on #1609 2018-08-30 20:52:02 +08:00
Wu Sheng 1a5cf2b536 Prepare for merging 6.0 into master 2018-08-30 13:50:30 +08:00
Wu Sheng cd680393f3 Merge commit 'ee5c740be3970be2886d00222b9e3ecb4d1adefa' into 6.0
# Conflicts:
#	docs/powered-by.md
2018-08-30 13:49:05 +08:00
张浩 ee5c740be3 用户接入 上上签 (#1608)
* 用户接入 上上签
2018-08-30 13:47:10 +08:00
caoyixiong f163ac5f78 add ke.com (贝壳找房 链家) user (#1606)
* add user
2018-08-30 13:04:08 +08:00
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