Commit Graph

3600 Commits

Author SHA1 Message Date
peng-yongsheng 9a6520fbc2 Provide the application topology query, but only completed es storage. 2018-01-26 00:23:58 +08:00
ascrutae f377c3350e [Agent] support spring bean plugin 2018-01-25 21:58:57 +08:00
lytscu 7ccdcbcdfe Merge branch 'servicecomb' of https://github.com/lytscu/incubator-skywalking into servicecomb
y
2018-01-25 10:20:03 +08:00
lytscu 94dcf96e1f Modify catalog 2018-01-25 10:17:26 +08:00
cyberdak 9ff209373e fix collector/start.sh tip.
"Web" to "Collector"
2018-01-25 10:17:24 +08:00
lytscu d2a3a2814f Modify catalog 2018-01-25 09:40:28 +08:00
lytscu f561b6ab90 Merge branch 'master' into servicecomb
y
2018-01-25 09:33:17 +08:00
吴晟 Wu Sheng 3909a5bc3e
Merge branch 'master' into feature/graphql-ui 2018-01-24 01:34:06 +08:00
peng-yongsheng e755bba328 Move the entity into storage module. 2018-01-24 00:13:19 +08:00
peng-yongsheng a25e353e2d Implement the method named getAllApplication in application layer graphql protocol. 2018-01-24 00:12:27 +08:00
Xin,Zhang ed5e49d717
Merge branch 'master' into feature/kafka-plugin 2018-01-23 20:06:29 +08:00
Xin,Zhang 8c859d1ce8
Merge pull request #774 from cyberdak/patch-1
fix collector/start.sh tip.
2018-01-23 20:06:15 +08:00
ascrutae 906a2c4d05 add testcase 2018-01-23 20:03:50 +08:00
cyberdak 8a3d9ef2bb
fix collector/start.sh tip.
"Web" to "Collector"
2018-01-23 16:36:13 +08:00
ascrutae 5fab1fada0 add spanlayer and component for kafka span 2018-01-22 23:09:31 +08:00
ascrutae 22ead46dcc [Agent] Support kafka framework 2018-01-22 19:56:22 +08:00
lytscu 1b499f0dc0 Add [Agent] ServiceComb Plugin #437 2018-01-22 15:56:25 +08:00
peng-yongsheng 843e709fae Provide GraphQL jetty servlet do post method. 2018-01-21 11:52:24 +08:00
peng-yongsheng 96197120b9 Provide GraphQL jetty servlet do get method. 2018-01-21 11:44:06 +08:00
peng-yongsheng 6b3aa98b82 Initialize the java class entity for mapping graphql protocol. 2018-01-20 22:33:33 +08:00
peng-yongsheng 1152135a0b initialize collector ui graphql module. 2018-01-20 22:26:08 +08:00
peng-yongsheng 06f675ac9b Changed dependency graphql-java from 6.0 to 7.0. 2018-01-20 22:21:56 +08:00
吴晟 Wu Sheng 6554aec15a
Merge pull request #768 from apache/alter-graphql-log-time
Time should be Long
2018-01-18 14:22:32 +08:00
吴晟 Wu Sheng 5175e9d54b
Merge branch 'master' into alter-graphql-log-time 2018-01-18 11:20:31 +08:00
wu-sheng cef1ca8410 Time should be Long 2018-01-18 11:14:10 +08:00
吴晟 Wu Sheng d79dc5d24a
Merge pull request #765 from ascrutae/update-docs
[Agent] update supported list
2018-01-18 07:53:41 +08:00
吴晟 Wu Sheng f218674316
Merge branch 'master' into update-docs 2018-01-17 23:21:31 +08:00
吴晟 Wu Sheng e6bcd7d171
Merge pull request #764 from apache/miss-appcode
Add a missing field.
2018-01-17 23:21:02 +08:00
ascrutae 4068931f4f [Agent] update supported list 2018-01-17 13:35:34 +08:00
吴晟 Wu Sheng 0ec6f37a7c
Merge branch 'master' into miss-appcode 2018-01-17 10:52:37 +08:00
吴晟 Wu Sheng d8e3bfd30b
Merge pull request #762 from ascrutae/update-docs
Update supported list
2018-01-17 10:51:36 +08:00
wu-sheng ed30481696 Add a missing field. 2018-01-17 08:20:50 +08:00
ascrutae 40909745e3 Update supported list 2018-01-16 22:26:12 +08:00
Willem Jiang 81a82f2800
Merge pull request #753 from apache/DISCLAIMER
Create DISCLAIMER
2018-01-16 21:26:01 +08:00
吴晟 Wu Sheng 7e3f41200c
Merge branch 'master' into DISCLAIMER 2018-01-16 20:54:48 +08:00
吴晟 Wu Sheng dcd746074a
Merge pull request #761 from apache/new-templete
Add new GitHub template
2018-01-16 17:25:02 +08:00
wu-sheng b4ceba6cf1 Add new GitHub template 2018-01-16 17:07:14 +08:00
吴晟 Wu Sheng dfa88e24c3
Merge pull request #760 from apache/fix/graphql-parentSpanId
Add parentSpanId for Span
2018-01-16 16:19:21 +08:00
wu-sheng b482463f42 Add parentSpanId for Span 2018-01-16 15:53:09 +08:00
Xin,Zhang 50b1d05097
Merge pull request #758 from lytscu/develop
[Agent] Provide plugins for Apache httpcomponent AsyncClient 4.1 #588
2018-01-16 15:10:39 +08:00
Xin,Zhang fcc3aa79cb
Merge branch 'master' into develop 2018-01-16 14:56:49 +08:00
吴晟 Wu Sheng 6b7a429262
Merge pull request #759 from ascrutae/mq-tags
[Agent] Add Topic and Borker tags
2018-01-16 14:39:27 +08:00
ascrutae aeb04783c6 [Agent] Add Topic and Borker tags 2018-01-16 14:15:37 +08:00
李运涛 liyuntao bcac37b534
Merge branch 'master' into develop 2018-01-16 11:02:20 +08:00
吴晟 Wu Sheng ba9c5af101
Merge pull request #757 from peng-yongsheng/feature/graphql
Lowercase the IPv4 and IPv6 attributes.
2018-01-16 09:39:38 +08:00
吴晟 Wu Sheng 4f2c781270
Merge branch 'master' into feature/graphql 2018-01-16 09:26:04 +08:00
peng-yongsheng b525e1e0e2 Lowercase the IPv4 and IPv6 attributes, because of there have a java style check that regulate the first letter must be lowercase. 2018-01-16 09:18:56 +08:00
lytscu 4a0a210348 Modify ComponentsDefine.java 2018-01-15 19:19:49 +08:00
lytscu f58ecdb929 Merge remote-tracking branch 'upstream/master' into develop
y
2018-01-15 15:05:05 +08:00
lytscu c8ca51a547 [Agent] Provide plugins for Apache httpcomponent AsyncClient 4.1 #588 2018-01-15 15:00:32 +08:00