吴晟 Wu Sheng
8dae33cc5b
Update README.md
2017-08-16 08:35:48 +08:00
吴晟 Wu Sheng
b73426b2cc
Update README.md
2017-08-09 11:36:17 +08:00
吴晟 Wu Sheng
fdbd07ce3c
Update README.md
2017-07-29 14:18:10 +08:00
吴晟 Wu Sheng
7631c54cdd
Update README.md
...
New readme for 3.2
2017-07-28 16:59:32 +08:00
吴晟 Wu Sheng
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
吴晟 Wu Sheng
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
ascrutae
a73597d5c9
add prepared statement test case
2017-07-28 11:49:31 +08:00
吴晟 Wu Sheng
349f78efa4
Update SWPreparedStatement.java
...
Fix the wrong operationName of PreparedStatement#execute(String)
2017-07-28 11:07:40 +08:00
吴晟 Wu Sheng
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
wusheng
eca20c9158
Add process No in register info.
2017-07-27 22:58:15 +08:00
wusheng
45cbf8b5c4
Add OS Info when register and registerRecover.
2017-07-27 22:10:37 +08:00
吴晟 Wu Sheng
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
ascrutae
ca7619d069
fix send duplicate jvm data issue
2017-07-25 11:34:29 +08:00
吴晟 Wu Sheng
cfa8ef1b13
Merge pull request #312 from ascrutae/zhangxin/fix/testcas-failed
...
fix testcase failed
2017-07-22 09:37:30 +08:00
ascrutae
61186fe51c
fix testcase failed
2017-07-22 09:07:48 +08:00
wusheng
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
吴晟 Wu Sheng
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
wusheng
e88f98537c
Support ime-shift-back by Ops or OS, try to keep the id unique.
2017-07-21 23:21:24 +08:00
吴晟 Wu Sheng
a31ee9cf14
Merge pull request #311 from ascrutae/zhangxin/fix/fix-testcase
...
fix test case failed
2017-07-21 22:46:14 +08:00
ascrutae
2444511340
fix test case failed
2017-07-21 22:34:55 +08:00
吴晟 Wu Sheng
2ca2bd792c
Update ID.java
...
Fix decode bug.
2017-07-21 10:44:32 +08:00
吴晟 Wu Sheng
8d8d4e40f7
Merge branch 'master' into feature/new-id
2017-07-21 10:27:21 +08:00
吴晟 Wu Sheng
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
ascrutae
fdde4b7aea
fix issue that httpclient plugin don’t work
2017-07-21 09:59:20 +08:00
wusheng
4628ea6baa
Fix unassigned value.
2017-07-20 23:18:44 +08:00
wusheng
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
wusheng
329f224763
New id mechanism, need to be tested.
2017-07-20 23:17:21 +08:00
吴晟 Wu Sheng
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
ascrutae
89427eeaf5
fix operation id of exit span incorrect issue
2017-07-20 23:03:48 +08:00
吴晟 Wu Sheng
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
吴晟 Wu Sheng
a9add392a1
Update DiscoveryService.proto
...
Add agentUUID in ApplicationInstance
2017-07-20 09:45:54 +08:00
wusheng
543b2d4461
Support empty operation name, and add buffer size of dictionary for avoiding out of memory.
2017-07-19 22:54:57 +08:00
wusheng
57b69fb88c
Support #299 and #301
2017-07-19 22:04:32 +08:00
wusheng
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
wusheng
07ae13a650
Remove multi globalTraceIds in context carrier.
2017-07-19 21:04:24 +08:00
吴晟 Wu Sheng
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
ascrutae
b31ea63506
fix miss transport entryServiceName and entryServiceId value
2017-07-19 15:14:12 +08:00
吴晟 Wu Sheng
123ff78096
Merge pull request #297 from wu-sheng/feature/jvm-shutdown-hook
...
Add jvm shutdown hook
2017-07-19 14:44:09 +08:00
吴晟 Wu Sheng
686a802097
Merge branch 'master' into feature/jvm-shutdown-hook
2017-07-19 14:19:02 +08:00
吴晟 Wu Sheng
3fdc018178
Merge pull request #302 from ascrutae/zhangxin/fix/300
...
fix miss entryServiceId and entryServiceName in ContextSnapshot issue
2017-07-19 14:18:50 +08:00
吴晟 Wu Sheng
83b2b5f517
Merge branch 'master' into feature/jvm-shutdown-hook
2017-07-19 14:12:57 +08:00
吴晟 Wu Sheng
54cc2ae5a2
Merge branch 'master' into zhangxin/fix/300
2017-07-19 14:05:25 +08:00
ascrutae
809158b23b
fix miss entryServiceId and entryServiceName in ContextSnapshot issue
2017-07-19 11:58:34 +08:00
吴晟 Wu Sheng
f57aac38dd
Merge pull request #298 from ascrutae/zhangxin/fix/ot-set-tag-failed
...
fix issue that open tracing activation set tag failed
2017-07-19 11:50:06 +08:00
ascrutae
91d08bbcd9
fix issue that open tracing activation set tag failed
2017-07-19 10:01:10 +08:00
wusheng
cba4dc2883
Make sure the JVM stop hook works #295
2017-07-18 21:47:24 +08:00
wusheng
79a45823b6
Remove unused imports.
2017-07-18 21:35:01 +08:00
wusheng
75ada9feaa
Add jvm shutdown hook
2017-07-18 21:34:30 +08:00
wusheng
6c5636f221
Shorten the cycle of collecting JVM info. #296
2017-07-18 21:26:19 +08:00
吴晟 Wu Sheng
9080b28d9e
Update pom.xml
...
Fix an out-of-date package name.
2017-07-18 11:53:53 +08:00