Commit Graph

292 Commits

Author SHA1 Message Date
wusheng f7fdd9f854 Fix assmbly for mvn clean install -Papache-release and update version to SNAPSHOT for SNAPSHOT release. 2018-02-26 23:22:10 +08:00
wu-sheng 158b6ff884 Fixing javadoc. And try to trigger a ci fail in this commit, in order to make sure javadoc will be checked in further pull request. 2018-02-26 09:15:10 +08:00
ascrutae 8d381976cd [Agent] fix HierarchyMatch donot support generic type 2018-02-25 17:03:24 +08:00
wu-sheng ca11058f8e Add a new field for operation register. 2018-02-07 15:58:05 +08:00
carlvine 5c44dd96a2 bugfix:no data collected after application started 20+seconds 2018-02-07 09:53:19 +08:00
ascrutae 906a2c4d05 add testcase 2018-01-23 20:03:50 +08:00
ascrutae aeb04783c6 [Agent] Add Topic and Borker tags 2018-01-16 14:15:37 +08:00
彭勇升 pengys 6c11a8404b
Merge branch 'master' into fix/ScheduledFuture-failsafe 2018-01-11 22:33:14 +08:00
ascrutae c6e593f6f4 refactory MultiClassNameMatch code 2018-01-11 17:28:01 +08:00
wusheng 8f49c973be Protect the background processes. 2018-01-11 15:53:40 +08:00
wusheng ef284dc6d5 Make the applicationCodeRegister only for single code. 2018-01-04 23:07:49 +08:00
wusheng e7b72eb2f9 catch up the TODO list. 2018-01-04 21:50:43 +08:00
wu-sheng 92b320ebc2 Add warning log outputs, if too many spans created in one segment. 2018-01-04 10:29:22 +08:00
wu-sheng 498e8a52cc Isolate NetworkAddressRegisterService from ApplicationRegisterService 2018-01-02 16:51:42 +08:00
wu-sheng 8a97aad021 Fix a comment word. 2017-12-25 15:16:06 +08:00
wu-sheng be73665853 Add a ProtectiveShieldMatcher to prevent match exception. 2017-12-25 15:06:10 +08:00
wu-sheng 375abe96b9 Make sure the log config works. 2017-12-21 15:58:22 +08:00
wu-sheng 09b979c5af Fix npe 2017-12-19 15:27:14 +08:00
wusheng 6f1f4cf14f Change network protocol for 5.0 2017-12-18 21:27:24 +08:00
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
wu-sheng 14c4734f58 Update more license. 2017-12-15 09:50:53 +08:00
ascrutae 9f4532c03b fix miss transform ref data for each span issue 2017-12-14 10:50:14 +08:00
ascrutae ad5fd07343 remove unimport class 2017-12-14 10:10:51 +08:00
Xin,Zhang 7dd91fff96
Merge branch 'master' into feature/trace-context 2017-12-14 10:03:43 +08:00
ascrutae b85ada779c fix the local span cannot ref other trace segment 2017-12-14 10:02:45 +08:00
ascrutae 73d662b1b4 add relocation config of org.apache.http and org.apache.commons 's package 2017-12-13 18:28:03 +08:00
wusheng 03d4d31a84 Fix a potential bug for override args of static method. Feedback from @YunaiV @ascrutae 2017-12-12 20:26:01 +08:00
wu-sheng b3d98f3c50 Fix test case. 2017-12-11 16:04:45 +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
Xin,Zhang a086804753
Merge branch 'master' into fix/match-failed 2017-12-05 01:02:21 +08:00
ascrutae e63e033263 fix match failed issue 2017-12-05 00:56:58 +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
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 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
wu-sheng b53c178b49 Add comments for new config item. 2017-11-27 16:57:55 +08:00
wu-sheng 931effb648 Output all instrumented classes into physical files. 2017-11-27 16:32:51 +08:00
peng-yongsheng b322b55af6 Upgrade the version from 3.2.5 to 3.3.0. 2017-11-22 15:12:00 +08:00
ascrutae 9a4d4a21b8 fix the naming service url and port is incorrect 2017-11-20 13:04:12 +08:00
吴晟 Wu Sheng c85db8c4f9
Merge branch 'master' into feature/split-agent-module 2017-11-19 22:42:56 +08:00
peng-yongsheng eaa0254512 Test success with standalone and cluster mode. 2017-11-19 22:25:11 +08:00
wusheng d2df4db284 Adjust the find server codes. 2017-11-18 10:32:25 +08:00
wu-sheng f601293b22 Update the version to 3.2.5 2017-11-16 12:14:26 +08:00