a7c11a1baf
delete the define id in every data define.
...
#336 #338
2017-08-08 10:03:34 +08:00
eb72cb04ba
Change the static json key name to full name in json reader.
2017-08-08 09:41:25 +08:00
82f79a734d
Service reference save to elastic search test success.
...
Entry service save to elastic search test success.
#338
2017-08-08 00:18:47 +08:00
630705c1f0
Merge remote-tracking branch 'upstream/master' into zhangxin/feature/entry-application-instanceID
...
# Conflicts:
# apm-network/src/main/proto/TraceSegmentService.proto
2017-08-07 23:09:12 +08:00
9559c75c58
Merge pull request #343 from wu-sheng/feature/341
...
add entryApplicationInstanceId attribute
2017-08-07 10:04:38 -05:00
93fae09b7f
Merge branch 'master' into feature/341
2017-08-07 10:04:14 -05:00
4d7ad33771
add entryApplicationInstanceId attribute that let collector known the entry service which application instance send.
2017-08-07 22:59:11 +08:00
81f73fb5e8
Add entryApplicationInstanceID field for service topological
2017-08-07 22:40:29 +08:00
7765378d1d
Merge branch 'master' into feature/336
2017-08-06 19:46:26 -05:00
119d21d525
Service entry test success.
2017-08-06 23:26:17 +08:00
6856b896e1
Fixed style check error
2017-08-06 22:15:12 +08:00
911de3fe4a
1. Provide jetty http interface for application and instance register.
...
2. Provide jetty http interface for receive trace segment.
3. Test segment receive trace segment success. segment, node reference, node reference sum, node component, node mapping, global trace data are all correct.
2017-08-06 21:54:55 +08:00
3492b0d86e
fixed package error
2017-08-05 13:39:32 +08:00
a0d1f5a752
Fixed package error
2017-08-05 13:21:24 +08:00
82dd3c4474
Save exchanged and not exchanged data to storage. e.g. node reference, A -> B will be 1->2 or 1->10.0.0.1
2017-08-05 13:10:37 +08:00
42e53aad88
Merge pull request #334 from wu-sheng/feature/improve-operationid
...
Optimize the entry span’s operationName
2017-08-04 09:56:32 -05:00
b67ad99c26
Optimize the entry span’s operationName.
2017-08-04 21:21:45 +08:00
786263cc0a
Merge pull request #333 from wu-sheng/feature/331
...
Just component finish the exchange coding.
2017-08-03 20:07:58 -05:00
f71bb057a5
no message
2017-08-03 17:02:14 +08:00
5db840393e
1. Use guava cache to support id name exchange.
...
2. Add abstract ExchangeWorker to aggregate the data wait to exchange.
3. Once per second, timer call the implementation work of ExchangeWorker to exchange.
4. Exchanged data send to AggregationWorker, the data exchange 10 times but not exchanged, then give up.
5. Just component finish the exchange coding.
2017-08-03 00:10:27 +08:00
a12bcce3ba
Merge pull request #330 from wu-sheng/fix/327
...
Fixed #327 .
2017-08-01 07:31:28 -05:00
f2a98193d4
Fixed #327 .
...
When collector server restart at short intervals that zookeeper will not find remove this server path.
But in another situation, there was a same address server has been running, the restart server could not remove this path and recreate it.
So when this situation happened, throw exception to stop this restart server.
2017-08-01 20:14:47 +08:00
3de64ff0f8
Merge pull request #326 from wu-sheng/feature/266
...
Feature/266 collector support modularization development
2017-08-01 03:11:10 -05:00
8e8dab9391
Update GlobalIdGenerator.java
2017-08-01 16:09:33 +08:00
638789aa94
Cobertura did not support java 8 lambda.
...
So change coverage tools from Cobertura to JaCoCo
2017-08-01 15:57:19 +08:00
667c0f470d
Delete test case because of the test case will use network to call the collector.
2017-08-01 13:44:13 +08:00
8c27542784
trace stack es save and ui search success
2017-07-31 23:08:30 +08:00
c387cfb90d
Trace stack UI: top segment list ok.
2017-07-31 12:05:12 +08:00
527f8a55ae
trace dag ui seem good
2017-07-30 23:06:33 +08:00
a220ae9c78
Create ui module
2017-07-30 21:23:44 +08:00
9922278523
Segment cost save to es success
2017-07-30 11:23:04 +08:00
430fe745a4
node reference summary save to es success
2017-07-29 23:52:32 +08:00
e216a369b3
Segment save to es success
2017-07-29 23:01:22 +08:00
33fcede9a3
node reference save to es success
2017-07-29 13:00:15 +08:00
1ca8da9570
Node mapping save to es success.
2017-07-29 12:38:24 +08:00
d80e2ff43d
node component save to es success.
2017-07-29 12:07:42 +08:00
4fda33b16c
Support retry when use IF_POSSIBLE strategy.
2017-07-28 21:10:14 +08:00
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
pengys5
ascrutae
吴晟 Wu Sheng