Commit Graph

104 Commits

Author SHA1 Message Date
gaohongtao 318c3db7c9 Update version to 5.0.0-alpha with `mvn versions:set -DnewVersion=5.0.0-alpha` 2017-12-15 10:40:23 +08:00
wusheng 15328202b8 Revove duplicate license headers. 2017-12-11 15:04:26 +08:00
wusheng 05b818e709 Update package name to org.apache.skywalking 2017-12-10 16:32:39 +08:00
wusheng b16d23c148 Update artifactId to "org.apache.skywalking" 2017-12-10 08:21:20 +08:00
wusheng 23133f7d97 Update copyright to Apache Foundation. 2017-12-09 23:38:32 +08:00
peng-yongsheng a9ff0b2812 Merge branch 'master' into feature/alerting
# Conflicts:
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstanceMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricPersistenceWorker.java
#	apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/worker/AlertingListPersistenceWorker.java
2017-12-09 23:16:11 +08:00
wusheng d458622bb4 Update version to 5.0-2018-preview for new iteration. 2017-12-06 22:06:54 +08:00
wusheng 055c760bc0 Set versions, and documents ready for releasing 3.2.6 2017-12-04 22:04:28 +08:00
wusheng 8bc03bddb9 Merge branch 'fix/gRPC-1.8.0'
* fix/gRPC-1.8.0:
  Update netty to 4.1.17
  Update gRPC version. And shade google opencensus in agent.
2017-12-04 21:11:25 +08:00
ascrutae bfbf7aebc9 fix compile failed 2017-12-04 10:49:10 +08:00
吴晟 Wu Sheng a6fb212018
Merge branch 'master' into feature/support-rocketMQ-plugin 2017-12-04 10:20:21 +08:00
吴晟 Wu Sheng 858f66e850
Merge branch 'master' into master 2017-12-04 10:00:32 +08:00
peng-yongsheng 4b78b86067 Merge branch 'fix/gRPC-1.8.0' into feature/alerting 2017-12-03 10:11:50 +08:00
peng-yongsheng 31b872b226 upgrade the version of grpc proto generator of maven plugin to 1.8.0 2017-12-03 09:52:19 +08:00
peng-yongsheng 3d60e05620 Merge branch 'feature/new-batch-model' into feature/alerting 2017-12-03 09:47:24 +08:00
peng-yongsheng 83aa2ce2bf Merge branch 'fix/gRPC-1.8.0' into feature/alerting 2017-12-03 09:45:28 +08:00
wusheng 0b6f430f29 Update netty to 4.1.17 2017-12-01 22:54:04 +08:00
wusheng 994d11c501 Update gRPC version. And shade google opencensus in agent. 2017-12-01 22:37:34 +08:00
wu-sheng 5501387279 Change network protocol and refactor agent core. 2017-11-30 14:20:37 +08:00
peng-yongsheng b322b55af6 Upgrade the version from 3.2.5 to 3.3.0. 2017-11-22 15:12:00 +08:00
gaohongtao c15d1a5676 Fix #603 Elastic-Job plugin 2017-11-20 10:21:15 +08:00
peng-yongsheng eaa0254512 Test success with standalone and cluster mode. 2017-11-19 22:25:11 +08:00
wu-sheng f601293b22 Update the version to 3.2.5 2017-11-16 12:14:26 +08:00
wusheng ad547e00b9 Merge branch 'feature/collector-modelization' into feature/agent-memory-control
* feature/collector-modelization: (55 commits)
  Change the exception to runtime exception in module find and service find method.
  Register graph finish.
  Application register test success.
  Fix a code style issue.
  Move instruments into an independency module in collector, named `apm-collector-instrument`.
  Remove ServiceInstrumentation mechanism for further collector agent design.
  Adjust startup sequence.
  cluster, naming, grpc manager, jetty manager, storage modules test successful.
  Segment standardization
  Parse and listener
  trace workers
  Register workers
  no message
  Add cache service manager in worker construction.
  Fix compile issues.
  Support WayToNode for entry node.
  JVM worker
  Use cache service from cache module.
  Refactor cache module to provide cache services.
  Fix a pom confilct.
  ...
2017-11-14 17:52:26 +08:00
wusheng 4bdea9e2c9 Update version for 3.2.4 release. 2017-11-06 22:45:00 +08:00
ascrutae 30dbdc8264 support rocket mq plugin 2017-11-05 20:22:04 +08:00
wu-sheng e8a43a198b Support limiting the amount of spans per segment. default 300. 2017-11-03 16:09:42 +08:00
ascrutae 4be6d23e98 Merge branch 'master' into feature/grpc-support
# Conflicts:
#	apm-network/src/main/java/org/skywalking/apm/network/trace/component/ComponentsDefine.java
#	apm-sniffer/apm-agent/pom.xml
#	apm-sniffer/apm-sdk-plugin/pom.xml
2017-10-18 20:15:02 +08:00
ascrutae c17866cf8b support grpc plugin 2017-10-18 20:11:28 +08:00
ascrutae 3c5afae861 add postgresql component 2017-10-17 22:46:05 +08:00
ascrutae 66af58ea8b support postgresql plugin 2017-10-17 17:39:12 +08:00
wusheng d8c0d52ef5 Fix the component name. Relate to https://github.com/OpenSkywalking/skywalking-ui/pull/75 2017-10-15 09:00:25 +08:00
peng-yongsheng 7b72bf2baa Add copyright head in all java files and copyright head check style 2017-10-13 08:28:34 +08:00
gaohongtao 13d123276b Fix #381 Sharding-JDBC 1.5.x plugin 2017-10-13 08:14:44 +08:00
IluckySi e61cc13621 Support SpyMemcached V2.x 2017-10-08 15:46:26 +08:00
吴晟 Wu Sheng caffba4ee8 Revert "Support SpyMemcached V2.x" 2017-10-08 01:53:46 -05:00
wusheng b806bf4692 Change version for next iteration. 2017-10-07 21:54:32 +08:00
IluckySi 1a36dc80e3 Support SpyMemcached V2.x 2017-09-30 11:43:52 +08:00
peng-yongsheng 0d13b27362 Version change 2017-09-28 10:54:16 +08:00
ascrutae 5f880f9576 support jetty plugins 2017-09-27 15:58:02 +08:00
wendal chen d38221350c change: Component name for NUTZ_MVC_ANNOTATION, from NutzMVCAnnotation to NutzMVC 2017-09-22 22:41:00 +08:00
wendal chen e68d48a6d4 Merge branch 'dev/3.2.1' of https://github.com/wu-sheng/sky-walking
# Conflicts:
#	apm-network/src/main/java/org/skywalking/apm/network/trace/component/ComponentsDefine.java
#	apm-sniffer/apm-agent/pom.xml
#	apm-sniffer/apm-sdk-plugin/pom.xml
2017-09-22 11:42:12 +08:00
wendal chen 7597b0f067 Merge branch 'dev/3.2.1' of https://github.com/wu-sheng/sky-walking 2017-09-21 16:09:39 +08:00
ascrutae 9dc2fcbcbe support new api of context carrier 2017-09-21 15:38:06 +08:00
wendal chen 64b6c92292 add: support nutz mvc and nutz http 2017-09-21 11:40:35 +08:00
ascrutae e78e7e4d00 support struts 2 plugin 2017-09-19 23:35:38 +08:00
wusheng 099877c2ce Prepare for 3.2 iteration. 2017-09-17 07:54:25 +08:00
pengys5 87754831ae Fixed check style error 2017-09-10 22:22:52 +08:00
pengys5 f0b1abe834 Delete the is heap property in memory pool entity 2017-09-10 11:46:54 +08:00
ascrutae 77069695a8 add default span layer 2017-08-12 21:04:07 +08:00