Commit Graph

337 Commits

Author SHA1 Message Date
wu-sheng 2adfcc0d55 Correct the log4j config file. 2017-11-28 15:07:10 +08:00
wu-sheng 34ac6442c5 Fix log file names. 2017-11-28 11:23:13 +08:00
吴晟 Wu Sheng 6a5172a449
Merge branch 'master' into feature/history-data-delete 2017-11-22 16:41:44 +08:00
peng-yongsheng b322b55af6 Upgrade the version from 3.2.5 to 3.3.0. 2017-11-22 15:12:00 +08:00
wu-sheng eb59a917ff Do some rename works. :) And I think 7 ttl days is more common. 2017-11-22 11:35:16 +08:00
peng-yongsheng f7700d50a3 Merge branch 'master' into feature/history-data-delete 2017-11-21 22:01:23 +08:00
peng-yongsheng a9eaa2eecf 1. The collectors provider vote about leader which collector execute the delete operation.
2. Delete the history data before the setting that you can find the property name of history_delete_before_days in the application.yml file.
2017-11-21 21:58:26 +08:00
吴晟 Wu Sheng 6af1644697
Merge pull request #610 from ascrutae/feature/support-docker-image
support collector docker images
2017-11-21 21:43:09 +08:00
ascrutae 4c1c70b6a9 support collector docker images 2017-11-21 21:38:45 +08:00
wu-sheng 80b5851779 Reset ports. 2017-11-21 15:33:03 +08:00
吴晟 Wu Sheng 513ae0136c
Merge pull request #606 from OpenSkywalking/feature/582
Add TIME column for table segment data
2017-11-21 09:41:38 +08:00
peng-yongsheng 4d415a8aee Add the time bucket setting in segment DAO class. 2017-11-21 09:11:27 +08:00
peng-yongsheng 90bd26c89e Add TIME column for table segment data
#582
2017-11-20 13:30:59 +08:00
吴晟 Wu Sheng 461672c954
Merge branch 'master' into feature/support-start-script 2017-11-19 23:08:30 +08:00
peng-yongsheng 14967e4949 Fixed maven package error from style check. 2017-11-19 22:44:33 +08:00
peng-yongsheng eaa0254512 Test success with standalone and cluster mode. 2017-11-19 22:25:11 +08:00
ascrutae b13049a429 support start script 2017-11-19 08:54:51 +08:00
peng-yongsheng f3e85ef6e3 Change apm-collector-stream from collector module to common codes.
Make agent gRPC to be a collector module.
Make agent jetty to be a collector module.
Make agent stream to be a collector module.
2017-11-17 13:57:20 +08:00
吴晟 Wu Sheng df97dc3428
Merge branch 'master' into feature/stream-jetty 2017-11-16 07:06:58 -06:00
peng-yongsheng 0c0a480a29 Application, instance, service name register by http json test success.
Trace segment compute by http json stream test success.
2017-11-16 20:59:24 +08:00
peng-yongsheng 8c3fbe4c03 Provider agent register and trace stream by http json request. 2017-11-16 15:13:05 +08:00
wu-sheng f601293b22 Update the version to 3.2.5 2017-11-16 12:14:26 +08:00
wu-sheng 19367166a9 Appand modules: apm-collector-baseline and apm-collector-baseline-computing for jd contributor team. 2017-11-16 11:32:45 +08:00
peng-yongsheng e349222817 All success. 2017-11-16 01:13:00 +08:00
peng-yongsheng bc4f1830eb Trace dag ui with h2 storage provider test success. 2017-11-16 01:06:25 +08:00
peng-yongsheng 779638bea0 Trace stack ui with elasticsearch storage provider test success. 2017-11-16 00:29:31 +08:00
peng-yongsheng 085da8394e trace dag ui with elasticsearch storage module provider test success. 2017-11-16 00:07:32 +08:00
peng-yongsheng 8d104e4f4f Delete the name column in all storage tables. 2017-11-15 23:08:53 +08:00
peng-yongsheng e5c9e2951a Distruptor queue exits unexpectedly, collector hangs up 2017-11-15 22:28:54 +08:00
peng-yongsheng e0e9ba0371 Merge branch 'feature/collector-modelization' of https://github.com/OpenSkywalking/skywalking into feature/collector-modelization 2017-11-15 22:21:03 +08:00
peng-yongsheng 8feaf766b3 Trace stream aggregation test success. 2017-11-15 22:20:08 +08:00
wu-sheng 3202a546d7 Fix a license error. 2017-11-15 16:47:45 +08:00
peng-yongsheng c10b7b1819 Change all daos to be services. 2017-11-15 11:40:49 +08:00
peng-yongsheng b744d4028c Trace segment stream finish. 2017-11-15 00:12:24 +08:00
peng-yongsheng 34aad0f00a jvm stream finish. 2017-11-14 23:40:39 +08:00
peng-yongsheng 714b4ccbf7 Move service register to prepare method. 2017-11-14 21:59:27 +08:00
peng-yongsheng 0567bcd43d Change the exception to runtime exception in module find and service find method. 2017-11-14 00:40:57 +08:00
peng-yongsheng 5967cf4be6 Register graph finish. 2017-11-14 00:39:37 +08:00
peng-yongsheng d8ba62e90b Merge branch 'feature/collector-modelization' of https://github.com/OpenSkywalking/skywalking into feature/collector-modelization 2017-11-13 15:38:02 +08:00
peng-yongsheng 8922e974aa Application register test success. 2017-11-13 15:37:07 +08:00
wusheng e8e4915db0 Fix a code style issue. 2017-11-13 00:39:48 +08:00
wusheng d7a2a198e0 Move instruments into an independency module in collector, named `apm-collector-instrument`. 2017-11-13 00:35:45 +08:00
wusheng 9dbd4ef683 Remove ServiceInstrumentation mechanism for further collector agent design. 2017-11-13 00:19:34 +08:00
wusheng b1002a98e1 Adjust startup sequence. 2017-11-13 00:07:59 +08:00
peng-yongsheng 1cb05658d6 cluster, naming, grpc manager, jetty manager, storage modules test successful. 2017-11-12 19:47:57 +08:00
peng-yongsheng 71d27b1840 Segment standardization 2017-11-12 10:24:34 +08:00
peng-yongsheng f74a5a9c27 Parse and listener 2017-11-12 10:23:55 +08:00
peng-yongsheng 863933afc4 trace workers 2017-11-11 23:30:10 +08:00
peng-yongsheng 5bd379fd50 Register workers 2017-11-11 19:13:58 +08:00
peng-yongsheng d85f9daeb9 Merge branch 'feature/collector-modelization' of https://github.com/OpenSkywalking/skywalking into feature/collector-modelization
# Conflicts:
#	apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java
#	apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java
#	apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java
2017-11-11 17:25:20 +08:00