Commit Graph

3285 Commits

Author SHA1 Message Date
wu-sheng 6ce5bfd569 Make ci works with resin and ojdbc again. Try to build. 2018-01-12 10:24:21 +08:00
mck 195cc2a6a1
Merge pull request #737 from michaelsembwever/mck/manually-download-apache-incompatible-dependencies
Remove OJDBC and resin artifacts from ci-dependencies driectory as they as not Apache license compatible
2018-01-12 11:56:35 +11:00
Mick Semb Wever 561bbc18ab
Remove OJDBC and resin artifacts from ci-dependencies driectory as they as not Apache license compatible.
The user can onetime manually download them, and the maven reactor will automatically build the corresponding plugins.

OJDBC is OTN which requires a user click-through agreement.
Resin is GPLv3, meaning any derivative work must also be GPLv3 licensed.
https://www.apache.org/licenses/GPL-compatibility.html

ref: https://github.com/apache/incubator-skywalking/pull/737
2018-01-12 11:10:34 +11:00
吴晟 Wu Sheng 1ed8df8024
Merge pull request #741 from apache/fix/ScheduledFuture-failsafe
Protect the background processes.
2018-01-12 06:03:08 +08:00
彭勇升 pengys 6c11a8404b
Merge branch 'master' into fix/ScheduledFuture-failsafe 2018-01-11 22:33:14 +08:00
吴晟 Wu Sheng 2713b5fd3b
Merge pull request #743 from ascrutae/support/postgresql-jdbc
[Agent] Support jdbc4, jdbc3 and jdbc42 of postgresql driver
2018-01-11 21:18:09 +08:00
ascrutae c6e593f6f4 refactory MultiClassNameMatch code 2018-01-11 17:28:01 +08:00
ascrutae 97b577864f [Agent] Support jdbc4, jdbc3 and jdbc42 of postgresql driver 2018-01-11 16:08:48 +08:00
wusheng 8f49c973be Protect the background processes. 2018-01-11 15:53:40 +08:00
吴晟 Wu Sheng 3613691105
Merge pull request #739 from ascrutae/feature/support-postgresql-9.x
[Agent] Support the version 9.4.x of postgresql jdbc driver
2018-01-11 12:35:29 +08:00
Xin,Zhang 4223d22028
Merge branch 'master' into feature/support-postgresql-9.x 2018-01-11 11:55:17 +08:00
ascrutae b3c263fd1f [Agent] Support the version 9.4.x of postgresql jdbc driver 2018-01-11 11:36:51 +08:00
吴晟 Wu Sheng 6e1ac504f2
Merge pull request #736 from apache/tweeter
Update README.md
2018-01-10 17:31:38 +08:00
吴晟 Wu Sheng a0fba78f2a
Update README_ZH.md 2018-01-10 17:16:40 +08:00
吴晟 Wu Sheng dc90d90bf9
Update README.md 2018-01-10 17:14:15 +08:00
吴晟 Wu Sheng 1e117cf719
Merge pull request #734 from peng-yongsheng/feature/data_refactor
Pyramid aggregate.
2018-01-09 20:28:35 +08:00
peng-yongsheng f461e1a991 Fixed package error. 2018-01-09 20:04:12 +08:00
YunaiV 825d5e69bc Fix ServiceNameCacheGuavaService split error 2018-01-09 19:48:27 +08:00
peng-yongsheng ec08a29164 Instance heart beat implement and test successful. 2018-01-09 19:38:11 +08:00
peng-yongsheng 8361f4156b CPU metric pyramid aggregate test successful. 2018-01-09 16:03:40 +08:00
peng-yongsheng 69bdfbad25 GC metric pyramid aggregate test successful. 2018-01-09 15:38:38 +08:00
peng-yongsheng 1985fad1a6 Memory metric pyramid aggregate test successful. 2018-01-09 15:07:28 +08:00
peng-yongsheng 3f82baa9fa Memory pool metric pyramid aggregate test successful. 2018-01-09 14:42:14 +08:00
peng-yongsheng 8f753f1188 Alarm test successful. 2018-01-09 11:28:09 +08:00
peng-yongsheng e12ddf321d Application metric pyramid aggregate test successful. 2018-01-09 00:22:38 +08:00
peng-yongsheng 7e84aeddd0 Instance metric pyramid aggregate test successful. 2018-01-09 00:11:46 +08:00
peng-yongsheng 8745cb2b7e Application reference metric pyramid aggregate test successful. 2018-01-08 23:59:19 +08:00
peng-yongsheng 06d638f6a8 Instance reference metric pyramid aggregate test successful. 2018-01-08 23:44:44 +08:00
peng-yongsheng ac17da39e4 Service metric pyramid aggregate test successful. 2018-01-08 23:16:13 +08:00
peng-yongsheng 0eb26f1d67 Service reference metric pyramid aggregate test successful. 2018-01-08 22:59:45 +08:00
peng-yongsheng 92bdb739d9 Segment and segment cost test successful. 2018-01-08 21:04:01 +08:00
peng-yongsheng 89dfe7d3c5 Delete service entry analysis. 2018-01-08 20:52:34 +08:00
peng-yongsheng 17edfe8fb2 Instance mapping pyramid aggregate test successful. 2018-01-08 20:37:31 +08:00
peng-yongsheng e909ea02bc Application mapping pyramid aggregate successful. 2018-01-08 18:57:08 +08:00
peng-yongsheng a39f95fc0d Application component pyramid aggregate successful. 2018-01-08 18:32:32 +08:00
peng-yongsheng 11a4cfd364 Application component pyramid es table define. 2018-01-08 16:06:16 +08:00
peng-yongsheng 9698fb0a93 Merge remote-tracking branch 'upstream/master' into feature/data_refactor 2018-01-08 15:37:44 +08:00
peng-yongsheng eb656cd462 Compile successful. 2018-01-08 15:19:23 +08:00
peng-yongsheng 63e9c54f97 Memory pool metric pyramid aggregate. 2018-01-08 00:15:55 +08:00
peng-yongsheng 2428e8a80b Memory metric pyramid aggregate. 2018-01-08 00:02:04 +08:00
peng-yongsheng d822fe20ef GC metric pyramid aggregate. 2018-01-07 23:46:48 +08:00
peng-yongsheng f77c10d59d Cpu metric pyramid aggregate. 2018-01-07 23:31:19 +08:00
peng-yongsheng 6a3e2f9207 Register and segment. 2018-01-07 22:54:06 +08:00
peng-yongsheng 8e2e5f4e75 Application component pyramid aggregate. 2018-01-07 22:36:30 +08:00
peng-yongsheng 0b5e3f1db4 Application mapping pyramid aggregate. 2018-01-07 22:08:53 +08:00
peng-yongsheng 7effeccc5b Instance mapping pyramid aggregate. 2018-01-07 20:58:36 +08:00
peng-yongsheng b18df84d64 Service entry. 2018-01-07 20:37:08 +08:00
peng-yongsheng a09aee872b Application metric pyramid aggregate. 2018-01-07 20:32:00 +08:00
peng-yongsheng 0145361ad9 Instance metric pyramid aggregate. 2018-01-07 20:15:20 +08:00
peng-yongsheng f3fc91926e Service metric pyramid aggregate. 2018-01-07 20:00:30 +08:00