Commit Graph

4229 Commits

Author SHA1 Message Date
彭勇升 pengys ee46760dc6 Buffer file implementation (#1607)
* Buffer stream.

* Buffer file reader.
2018-08-30 12:55:05 +08:00
Wu Sheng 085097531c Finish the codebase of Alarm. 2018-08-29 22:24:31 +08:00
wqr2016 b9eafa08e9 Update powered-by.md (#1602) 2018-08-29 14:41:34 +08:00
Wu Sheng 59a30ed0ac Fix CI and Add new alarm bridge by using latest code generator. 2018-08-28 20:55:53 +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 aef1a94c5a Merge commit 'af03e9260745cf3755ff2682d0509eda686d9512' into 6.0 2018-08-26 22:35:00 +08:00
吴晟 Wu Sheng af03e92607
RC CHANGES (#1560)
* Update CHANGES.md
2018-08-26 22:34:25 +08:00
Gao Hongtao d9384cdd82 Submodule/ui (#1587)
* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywaling-ui

* Update submodule skywalking-ui
2018-08-26 21:59:27 +08:00
Wu Sheng 77e1393955 Fix CI。 2018-08-25 22:19:39 +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
Gao Hongtao b174f4fdd9 Add oal ui oal demo based on ui graphql v5 2018-08-25 21:31:17 +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
Fatih ERDEM 47cba6c56c Moved hardcoded dependency versions to properties tag in pom.xml (#1583) 2018-08-24 10:18:48 +08:00
Fatih ERDEM cf6721d715 Moved hardcoded dependency versions to properties tag in pom.xml (#1582) 2018-08-24 09:29:03 +08:00
Fatih ERDEM 15263bce89 Moved hardcoded dependency versions to properties tag in pom.xml (#1583) 2018-08-24 09:28:25 +08:00
Fatih ERDEM 999762e19f Moved hardcoded dependency versions to properties tag in pom.xml (#1582) 2018-08-23 22:02:16 +08:00
Gao Hongtao e2d1a13ed2 Submodule/ui (#1581)
* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywaling-ui
2018-08-23 21:49:28 +08:00
caoyixiong 6fe2fa0c4b change the agent log level to millisecond (#1580)
* Fix bug stop stopSpan when not createSpan

* Fix bug stop stopSpan when not createSpan

* change the agent log level to millisecond
2018-08-23 21:49:16 +08:00
Gao Hongtao 59fdc3bfe0 Submodule/ui (#1581)
* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywalking-ui

* Update submodule skywaling-ui
2018-08-23 17:50:58 +08:00
caoyixiong 31e4ceb0b1 change the agent log level to millisecond (#1580)
* Fix bug stop stopSpan when not createSpan

* Fix bug stop stopSpan when not createSpan

* change the agent log level to millisecond
2018-08-23 17:17:27 +08:00
Adrian Cole 8b8039b730 Re-adds maven wrapper downloader so users won't crash if wget is missing (#1576)
https://github.com/apache/incubator-skywalking/pull/1574 removed the
maven wrapper jar. The shell script will try wget and then this
downloader if missing. It is very likely in windows and small vms for
people to not have wget installed, so this will prevent support problems
(and is why the wrapper includes this)
2018-08-23 13:10:00 +08:00
Adrian Cole 26f88ba522 Re-adds maven wrapper downloader so users won't crash if wget is missing (#1576)
https://github.com/apache/incubator-skywalking/pull/1574 removed the
maven wrapper jar. The shell script will try wget and then this
downloader if missing. It is very likely in windows and small vms for
people to not have wget installed, so this will prevent support problems
(and is why the wrapper includes this)
2018-08-23 13:06:05 +08:00
吴晟 Wu Sheng 15fed8cc26
Remove jar from source (#1574)
* Delete maven-wrapper.jar

* Update .gitignore
2018-08-23 06:18:43 +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
Xin,Zhang d1cdeecc3f Support ojdbc8 (#1571) 2018-08-22 17:44:32 +08:00
Xin,Zhang 1c8431c86f Support ojdbc8 (#1571) 2018-08-22 17:43:57 +08:00
caoyixiong ba92364a65 Fix bug stop stopSpan when not createSpan in Spring Callback (#1572)
* Fix bug stop stopSpan when not createSpan
2018-08-22 14:33:12 +08:00
caoyixiong 18d2d352fd Fix bug stop stopSpan when not createSpan in Spring Callback (#1572)
* Fix bug stop stopSpan when not createSpan
2018-08-22 14:30:58 +08:00
Gao Hongtao 89f978d156 Add yaml file 2018-08-22 10:18:38 +08:00
chenqy 9f457f244c Fix the timeBucket equal to 0 problem (#1570) 2018-08-21 17:23:39 +08:00
chenqy 46c0e76ef9 Fix the timeBucket equal to 0 problem (#1570) 2018-08-21 17:22:39 +08:00
Xin,Zhang 26cebf74ad Fix #1549 (#1568) 2018-08-21 13:53:52 +08:00
Xin,Zhang 0162fdd8ae Fix #1549 (#1568) 2018-08-21 13:53:00 +08:00
Xin,Zhang e3c6a4b1b1 add components for nodejs agent (#1565)
* Add egg component

* add koa component
2018-08-21 12:12:22 +08:00
caoyixiong 7c2aa4c43a FIX NPE in tomcat plugin ForwardInterceptor (#1562) 2018-08-21 12:11:40 +08:00
Xin,Zhang 513b8d689b
add components for nodejs agent (#1565)
* Add egg component

* add koa component
2018-08-21 10:09:49 +08:00
caoyixiong dd942d15a3 FIX NPE in tomcat plugin ForwardInterceptor (#1562) 2018-08-21 07:18:40 +08:00
Wu Sheng 03af5f1806 Support m2 cache in CI. 2018-08-20 22:05:31 +08:00
Wu Sheng 08df2218d7 Rename match expression classes. 2018-08-20 15:45:49 +08:00
peng-yongsheng 2c4d221b25 Merge branch '6.0' of https://github.com/apache/incubator-skywalking into 6.0 2018-08-20 11:49:26 +08:00
peng-yongsheng b4df95ce7c Fixed the check style error. 2018-08-20 11:49:07 +08:00
Wu Sheng 5386302fbe Fix a test case. 2018-08-20 11:39:02 +08:00
peng-yongsheng 77e5b65b53 Invoke the function in indicator to calculate result and persistent to storage. 2018-08-20 11:09:24 +08:00
peng-yongsheng d39b6baf35 Merge branch '6.0' of https://github.com/apache/incubator-skywalking into 6.0 2018-08-20 11:02:05 +08:00
peng-yongsheng ffece1617a Indicator analysis test successfully. 2018-08-20 11:01:33 +08:00