kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,726 Commits 1 Branch 0 Tags 166 MiB
Commit Graph

3726 Commits

Author SHA1 Message Date
peng-yongsheng 40eeb8739a 1. Get the service id only when agent register service name. 
2. Setting the src span type when agent register service name.
3. Revert the topology build logic.
 2018-03-04 00:22:45 +08:00
peng-yongsheng 09f9c1200e Fixed the pagination bug. 2018-03-03 20:15:49 +08:00
peng-yongsheng bdc0601c6d Fixed the call type in calls of topology. 2018-03-03 20:03:45 +08:00
peng-yongsheng 41840ce851 Fixed the bug which the memory max non heap metric value is -1 when using JDK 1.8. 2018-03-03 16:05:21 +08:00
peng-yongsheng 6ba5453086 Use JVM metric to update instance heart beat time when using java agent. 2018-03-03 15:22:35 +08:00
peng-yongsheng 58259141f9 Fixed the Dashboard and Topology bug. 2018-03-03 15:16:52 +08:00
吴晟 Wu Sheng eee27e0459
Merge pull request #864 from hanahmily/submodule/update-ui 
Submodule/update-ui
 2018-03-03 09:15:42 +08:00
吴晟 Wu Sheng 25ac1ca610
Merge branch 'master' into submodule/update-ui 2018-03-03 08:42:38 +08:00
吴晟 Wu Sheng 560d9bf535
Merge pull request #860 from peng-yongsheng/feature/Alarm 
"getClusterTopology","getApplicationTopology","loadAlarmList","getAlarmTrend"
 2018-03-03 08:42:17 +08:00
gaohongtao f293abc4c7 Update skywalking-ui submodule 2018-03-03 08:20:08 +08:00
Gao Hongtao 43f3e8e25e
Merge pull request #5 from apache/master 
Merge from origin
 2018-03-03 08:14:13 +08:00
吴晟 Wu Sheng 718d88c75f
Merge branch 'master' into feature/Alarm 2018-03-03 08:00:34 +08:00
吴晟 Wu Sheng e7a6a246de
Merge pull request #863 from peng-yongsheng/feature/appCodeInServer 
Feature/app code in server
 2018-03-03 08:00:08 +08:00
彭勇升 pengys d615a6957f
Merge branch 'master' into feature/appCodeInServer 2018-03-03 00:16:19 +08:00
peng-yongsheng 75a9283d24 1. Add application code into instance table. 
2. Search server by application code by searchServer method.
 2018-03-03 00:15:10 +08:00
吴晟 Wu Sheng 1b7ac0f46d
Merge branch 'master' into feature/Alarm 2018-03-02 23:56:09 +08:00
吴晟 Wu Sheng 766a78dd12
Merge pull request #861 from apache/re-organize-dist 
Reorganize dist
 2018-03-02 23:54:45 +08:00
peng-yongsheng fc5f67f084 Setting the alarm attributes in topology. 2018-03-02 22:55:02 +08:00
peng-yongsheng 3863aa71ee 1. Generate alarm content. 
2. loadAlarmList ok.
 2018-03-02 22:32:48 +08:00
wusheng 6b04ad6583 Fix source package of agent. 2018-03-02 19:06:37 +08:00
wusheng 56fd10949e Rename dist. 2018-03-02 17:08:26 +08:00
wusheng 710cce162b Include the agent into `dist` 2018-03-02 17:00:43 +08:00
peng-yongsheng 36d0eb5f69 getAlarmTrend ok. 2018-03-02 13:52:42 +08:00
peng-yongsheng f9c241c5a9 Pagination calculate 2018-03-02 13:31:40 +08:00
吴晟 Wu Sheng 6ba42f364a
Merge pull request #857 from apache/sync-ui 
UI up to date.
 2018-03-01 23:15:38 +08:00
wusheng c2ddbe9861 UI up to date. 2018-03-01 22:42:22 +08:00
吴晟 Wu Sheng accaf60afa
Merge pull request #856 from peng-yongsheng/feature/queryBasicTraces 
Change the traceId type to be collection in trace graphql protocol.
 2018-03-01 18:33:06 +08:00
peng-yongsheng 08d26eca09 Change the traceId type to be collection in trace graphql protocol. 2018-03-01 17:57:01 +08:00
吴晟 Wu Sheng a498a91fce
Merge pull request #854 from peng-yongsheng/feature/TraceQuery 
"queryBasicTraces","queryTrace"
 2018-03-01 15:23:37 +08:00
peng-yongsheng b7f1f4c521 queryBasicTraces: 
1. Query segment id from global trace table by trace id.
2. Query BasicTrace from segment duration table by segment id.
 2018-03-01 14:49:36 +08:00
吴晟 Wu Sheng ce3bff899a
Merge pull request #853 from peng-yongsheng/feature/ServiceQuery 
"searchService","getServiceResponseTimeTrend","getServiceTPSTrend","getServiceSLATrend","getServiceTopology"
 2018-03-01 06:08:32 +08:00
彭勇升 pengys 7e5ad62fbc
Merge branch 'master' into feature/ServiceQuery 2018-03-01 00:34:57 +08:00
peng-yongsheng 573291ef54 Refactor service topology build logic. 2018-03-01 00:30:13 +08:00
彭勇升 pengys fc5eadae39
Merge pull request #852 from hanahmily/module/apm-backend-dist 
Module/apm backend dist
 2018-02-28 23:43:03 +08:00
吴晟 Wu Sheng 28d2911749
Merge branch 'master' into module/apm-backend-dist 2018-02-28 23:13:57 +08:00
吴晟 Wu Sheng b76b373666
Merge pull request #847 from carlvine500/add-http-time-out 
HttpGet:add http timeout
 2018-02-28 23:05:00 +08:00
gaohongtao cfb64629da Amend bash 2018-02-28 22:56:01 +08:00
peng-yongsheng 5af1c91500 getServiceSLATrend: 
1. Change the parameter name:
Start -> startTimeBucket
End -> endTimeBucket
 2018-02-28 22:45:03 +08:00
peng-yongsheng c33ac107e2 getServiceTPSTrend: 
1. Change the parameter name:
Start -> startTimeBucket
End -> endTimeBucket
2. Calculate callsPerSec metric.
 2018-02-28 22:40:31 +08:00
gaohongtao 9cb0a533db Convert CRLF to LF 2018-02-28 22:36:19 +08:00
peng-yongsheng 96b5b20398 searchService: add the src span type condition by the value of SpanType.Entry_VALUE. 2018-02-28 22:23:19 +08:00
吴晟 Wu Sheng 880bc8b544
Merge branch 'master' into add-http-time-out 2018-02-28 22:23:17 +08:00
彭勇升 pengys 7e740a262c
Merge pull request #850 from peng-yongsheng/feature/getServerResponseTimeTrend 
"getServerResponseTimeTrend","getServerTPSTrend","getCPUTrend","getGCTrend","getMemoryTrend"
 2018-02-28 22:06:44 +08:00
彭勇升 pengys cc1c25ad6a
Merge branch 'master' into feature/getServerResponseTimeTrend 2018-02-28 21:40:19 +08:00
吴晟 Wu Sheng 6fd9c3bda8
Merge pull request #849 from peng-yongsheng/feature/searchServer 
"searchServer" and "getAllServer"
 2018-02-28 21:39:41 +08:00
彭勇升 pengys 91a2209215
Merge branch 'master' into feature/getServerResponseTimeTrend 2018-02-28 21:36:03 +08:00
peng-yongsheng 48981e87f2 1. Change the parameter name: 
Start -> startTimeBucket
End -> endTimeBucket
 2018-02-28 21:29:01 +08:00
peng-yongsheng 45a718de46 1. Change the parameter name: 
Start -> startTimeBucket
End -> endTimeBucket
 2018-02-28 21:11:59 +08:00
吴晟 Wu Sheng 43ddc8489e
Merge branch 'master' into feature/searchServer 2018-02-28 21:07:06 +08:00
彭勇升 pengys 4057f37e2d
Merge pull request #848 from peng-yongsheng/feature/getServerThroughput 
"getServerThroughput" Changed the attribute name from TPS to callsPerSec.
 2018-02-28 20:56:33 +08:00