11ff93ae83
Merge pull request #318 from wu-sheng/wu-sheng-patch-db-operationName
...
Fix the wrong operationName of PreparedStatement#execute(String)
2017-07-28 14:24:53 +08:00
fbf9bf9748
Merge pull request #319 from ascrutae/wu-sheng-patch-db-operationName
...
add prepared statement test case
2017-07-28 14:06:20 +08:00
a73597d5c9
add prepared statement test case
2017-07-28 11:49:31 +08:00
349f78efa4
Update SWPreparedStatement.java
...
Fix the wrong operationName of PreparedStatement#execute(String)
2017-07-28 11:07:40 +08:00
544feee8ff
Merge pull request #316 from wu-sheng/feature/more-register-info
...
Add OS Info when register and registerRecover
2017-07-28 09:22:19 +08:00
eca20c9158
Add process No in register info.
2017-07-27 22:58:15 +08:00
5ad301eadc
Segment parse finish, but not test.
2017-07-27 22:37:44 +08:00
45cbf8b5c4
Add OS Info when register and registerRecover.
2017-07-27 22:10:37 +08:00
c1a47d4d01
service name register finish
2017-07-27 10:32:57 +08:00
54fe8e43f8
Instance register, heartBeat, recover finish
2017-07-27 09:45:45 +08:00
e507bb9e6a
1. Application register successfully.
...
2. Instance discovery table and data define finish.
2017-07-26 23:51:14 +08:00
1bc7250e27
Remote worker call is successful
2017-07-26 18:45:14 +08:00
e4f56ab1c7
add Dao container to cache Dao
2017-07-25 16:40:43 +08:00
426d339a3f
Merge pull request #313 from ascrutae/zhangxin/fix/send-duplidate-jvm-data
...
fix send duplicate jvm data issue
2017-07-25 11:44:11 +08:00
ca7619d069
fix send duplicate jvm data issue
2017-07-25 11:34:29 +08:00
5bd5a69b49
Dao loader and client inject
2017-07-25 10:39:58 +08:00
dedc158fc3
Merge branch 'master' into feature/266
2017-07-24 21:51:54 +08:00
b53a3c5b53
1. remove remote module
...
2. make stream module as a collector define module, contains grpc remote service for call remote workers
3. worker framework is ok
4. Collector start ok
2017-07-24 11:42:39 +08:00
dd6ae268cf
1. remote worker use common service, send data object with bytes and data define id, use define id to find the grpc deserialize object.
...
2. merge the metric data and record data to data object.
2017-07-23 23:32:32 +08:00
cfa8ef1b13
Merge pull request #312 from ascrutae/zhangxin/fix/testcas-failed
...
fix testcase failed
2017-07-22 09:37:30 +08:00
61186fe51c
fix testcase failed
2017-07-22 09:07:48 +08:00
3aa563324c
Replace the padding char of base64 to '*' from '='. This is for avoiding dubbox’s head bug.
2017-07-22 08:41:54 +08:00
ccd23d71f1
Merge pull request #307 from wu-sheng/feature/new-id
...
Provide a new id generation and serialization mechanism
2017-07-21 23:37:14 +08:00
e88f98537c
Support ime-shift-back by Ops or OS, try to keep the id unique.
2017-07-21 23:21:24 +08:00
2042709b02
Storage framework, support auto create elastic search or h2 table
2017-07-21 23:04:18 +08:00
a31ee9cf14
Merge pull request #311 from ascrutae/zhangxin/fix/fix-testcase
...
fix test case failed
2017-07-21 22:46:14 +08:00
2444511340
fix test case failed
2017-07-21 22:34:55 +08:00
2ca2bd792c
Update ID.java
...
Fix decode bug.
2017-07-21 10:44:32 +08:00
8d8d4e40f7
Merge branch 'master' into feature/new-id
2017-07-21 10:27:21 +08:00
b5de29eb72
Merge pull request #308 from ascrutae/zhangxin/fix/httpclient-plugin-not-work
...
fix issue that httpclient plugin don’t work
2017-07-21 10:08:27 +08:00
fdde4b7aea
fix issue that httpclient plugin don’t work
2017-07-21 09:59:20 +08:00
4628ea6baa
Fix unassigned value.
2017-07-20 23:18:44 +08:00
efbdb7450f
Merge branch 'master' into feature/new-id
...
* master:
fix operation id of exit span incorrect issue
2017-07-20 23:18:06 +08:00
329f224763
New id mechanism, need to be tested.
2017-07-20 23:17:21 +08:00
f3bc9d445d
Merge pull request #306 from ascrutae/zhangxin/fix/opeartionId-incorrect
...
fix operation id of exit span incorrect issue
2017-07-20 23:14:20 +08:00
89427eeaf5
fix operation id of exit span incorrect issue
2017-07-20 23:03:48 +08:00
706874c9d7
Add storage module, start storage client and share with other module
2017-07-20 20:23:52 +08:00
76ceb36363
Merge pull request #305 from wu-sheng/wu-sheng/easy-app-register
...
Add agentUUID in ApplicationInstance
2017-07-20 10:03:41 +08:00
e12dc5fa47
1. Add agent jvm module
...
2. Add agent register module
2017-07-20 09:54:16 +08:00
a9add392a1
Update DiscoveryService.proto
...
Add agentUUID in ApplicationInstance
2017-07-20 09:45:54 +08:00
730c606389
add server holder to reuse server with same host, port, server classify
2017-07-19 23:21:24 +08:00
543b2d4461
Support empty operation name, and add buffer size of dictionary for avoiding out of memory.
2017-07-19 22:54:57 +08:00
57b69fb88c
Support #299 and #301
2017-07-19 22:04:32 +08:00
7a91ef7a02
Merge branch 'master' of https://github.com/wu-sheng/sky-walking
...
* 'master' of https://github.com/wu-sheng/sky-walking :
fix miss transport entryServiceName and entryServiceId value
fix miss entryServiceId and entryServiceName in ContextSnapshot issue
fix issue that open tracing activation set tag failed
Make sure the JVM stop hook works #295
Add jvm shutdown hook
# Conflicts:
# apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextSnapshot.java
2017-07-19 21:07:11 +08:00
07ae13a650
Remove multi globalTraceIds in context carrier.
2017-07-19 21:04:24 +08:00
c955f7889b
Add agent server module to get the collector stream server address
...
/agentstream/grpc
/agentstream/jetty
2017-07-19 20:50:27 +08:00
bf9887b06b
Merge pull request #303 from ascrutae/zhangxin/fix/miss-entrysericeName
...
fix miss transport entryServiceName and entryServiceId value
2017-07-19 15:34:57 +08:00
b31ea63506
fix miss transport entryServiceName and entryServiceId value
2017-07-19 15:14:12 +08:00
123ff78096
Merge pull request #297 from wu-sheng/feature/jvm-shutdown-hook
...
Add jvm shutdown hook
2017-07-19 14:44:09 +08:00
686a802097
Merge branch 'master' into feature/jvm-shutdown-hook
2017-07-19 14:19:02 +08:00
吴晟 Wu Sheng
ascrutae
pengys5