Commit Graph

340 Commits

Author SHA1 Message Date
zhangwei e0b7306e5d Determine EXTEND_SERVICE before invoker createTraceContext (#2755) 2019-05-26 00:14:21 +08:00
Alan Lau 3ebbe7c299 Remove the ex which not thrown. & Remove unused logger. (#2710) 2019-05-20 21:54:05 +08:00
Alan Lau 6fff2a81cf Remove the unused method. & Modify doc. (#2692) 2019-05-16 21:02:45 +08:00
彭勇升 pengys ed78dabe8b Rename metric and indicator to metrics. (#2643)
* Rename metric to metrics.

* Fixed test case execute failure issues.
2019-05-10 08:05:37 +08:00
SataQiu 37c92523d5 add test cases for Base64 (#2630) 2019-05-08 15:08:37 +08:00
SataQiu 19d9c56f27 Clean up unnecessary times(1) for test verify (#2619)
* clean up unnecessary times(1) for test verify

* format code

* fix checkstyle
2019-05-07 21:56:23 +08:00
Alan Lau 4de1fe5816 Remove the unused class loader. (#2612) 2019-05-07 11:03:42 +08:00
Alan Lau da773973be init need not return anything. also this function not used by other places. (#2597) 2019-05-06 14:26:15 +08:00
Alan Lau ec9bea9d43 Fix the typo. (#2596) 2019-05-06 11:23:09 +08:00
Brandon Fergerson ce1c7aadfc Vert.x Core 3.x Plugin (#2386)
* vertx plugin impl
2019-04-16 23:46:49 +08:00
IluckySi 11212c4052 Modify some spell error and prompt error (#2488) 2019-04-16 00:08:45 +08:00
Lemon 9b055cc5d4 Update proto commit (#2383) 2019-03-19 20:37:19 +08:00
Xin,Zhang 5ef9adc8b8
Merge branch 'master' into qualified-spring-mvc-endpoints 2019-03-17 07:24:00 +08:00
Brandon Fergerson ad375891b4
Update apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java
Fix isInAsyncMode never be set.

Co-Authored-By: wu-sheng <wu.sheng@foxmail.com>
2019-03-16 08:21:36 +08:00
Wu Sheng 5a2b223c95 Merge branch 'async-context' of https://github.com/apache/incubator-skywalking into async-context 2019-03-14 20:58:17 +08:00
Wu Sheng 584cd540d4 Fix test cases. 2019-03-14 20:58:00 +08:00
吴晟 Wu Sheng 32c43280ec
Merge branch 'master' into async-context 2019-03-14 20:39:06 +08:00
Wu Sheng 930e73f1a1 Finish the context based on #stopSpan result, rather than listener. 2019-03-14 20:37:38 +08:00
Wu Sheng b3e043569c Fix two javadoc 2019-03-14 16:11:07 +08:00
kezhenxu94 d5d46ae02a bugfix: fix bug when spaces in agent path. resolve #1219 (#2350)
* bugfix: fix bug when spaces in agent path. resolve #1219

* fix code style

* fix code style
2019-03-14 16:06:13 +08:00
Wu Sheng aa2877b2fb Finish the prototype of async mode in Java agent core APIs. 2019-03-14 15:50:22 +08:00
Brandon Fergerson 7322ea86a6 updated to operation name 2019-03-13 08:17:11 -06:00
Brandon Fergerson 2a31e5c660 fix merge 2019-03-12 22:55:41 -06:00
Brandon Fergerson e471b1077a
Merge branch 'master' into qualified-spring-mvc-endpoints 2019-03-12 22:55:12 -06:00
Brandon Fergerson 62f21330ad impl USE_QUALIFIED_NAME_AS_ENDPOINT_NAME 2019-03-12 18:14:44 -06:00
于玉桔 8c3b951785 Customize Enhance code of plugin (#2300)
* Submit custom enhancement kernel code for the first time.

* Submit the code again.

* Optimize ClassUtil code.

* Submit custom enhancement plugin code for the first time.

* To fix CI issue.

* To fix CI header Tmp issue

* To fix CI Tmp header issue

* Customize plugin code submission

* Add md file.

* Fix some bug.

* Fix ci issue

* Fix md desc

* Fix unapproved license

* Fix bug

* Fix collection bug.

* Fix java8 pair ref issue

* Fix CI issue.

* Add more detail for expression.

* Fix review issue

* Fix review issue 2

* Fix review code issue 2

* Fix md issue

* Fix bug and op desc md.

* Update customize-enhance-trace.md

* Update customize-enhance-trace.md

* FIx code review issue.
2019-03-13 07:07:45 +08:00
kezhenxu94 a69d073180 polish code (#2332) 2019-03-08 15:37:20 +08:00
Xin,Zhang 885ae479e0 add instance id configuration item (#2328)
* add instance id configuration item

* add doc about instance uuid
2019-03-08 08:24:33 +08:00
Xin,Zhang 1c32d59542 Add peer to entry span (#2287)
* Add peer to entry span

* Fix CI
2019-02-27 20:19:18 +08:00
5003d6da31 fixed CPU UsagePercent Error (#2222)
fixed CPU UsagePercent Error
The cpu usage storage longitude should be one percent, not one in ten thousand. When the storage unit is one ten thousandth, as long as the usage rate does not exceed 100%. Stored values are less than one. When the current query is forced to be converted to a long type, it will always be 0. This is not correct.
2019-01-30 16:27:19 +08:00
Jared Tan 5914a2b582 add thread-name. (#2209) 2019-01-25 23:21:47 +08:00
吴晟 Wu Sheng 4399299bd5
Optimize the agent grpc channel management. (#2198)
* Optimize the grpc channel management.

* Rename old version concepts

* Notify when rebuild connection.

* Remove notify in new channel created.

* Remove println.
2019-01-24 00:09:09 +08:00
吴晟 Wu Sheng cee0525f74
Make a test case for span limit. (#2157) 2019-01-14 16:46:28 +08:00
吴晟 Wu Sheng b5eb9e304d Support Service Instance Inventory properties and bug fixed (#2156)
* Refactor service instance inventory to properties based entity.

* Fix a bug and refactor properties update.
2019-01-13 22:07:52 +08:00
Xin,Zhang 2a566bb7a3 Support webflux and spring mvc 5 plugin (#1993)
* Support webflux and spring mvc 5 plugin

* Change instrumentation

* Change instrumentation

* fix check style

* Add support 2.1.x instrumentation
2018-12-12 00:10:55 -08:00
Xin,Zhang 1bc5de7af9 Support overwrite tag (#2021)
* Support overwrite tag

* Fix test case
2018-12-09 14:59:15 +08:00
caoyixiong f8d384ee76 fix classloader dead lock in jdk7+ (#2016) 2018-12-07 15:22:24 +08:00
Jared Tan c141376557
fix https://github.com/apache/incubator-skywalking/issues/1820. (#2013) 2018-12-06 21:46:40 +08:00
Jared.Tan dc393b1c12 refactoring PropertyPlaceholderHelper class. (#1989) 2018-12-03 11:50:59 +08:00
Jared.Tan b79030765b feat:Active System.env Config In Both Collector And agent.config. (#1957)
* feat:Active System.env Config In Both Collector And agent.config.
1、moving related codes into apm-util module.
2、update Setting-override.md about how to use.

* resolve docs.

* typo

* finish test case.

* Update README.md
2018-11-26 00:12:01 +08:00
彭勇升 pengys 7c8a683c2f
gRPC client usage improve (#1946)
* Close the clients which are unreachable.
Remote client manager test case and comments.

* Test the GRPCRemote client.

* 1. Catch the throwable for onComplete method cause of it will throw exception when connection lost.
2. Check the gRPC channel state, send message when state is ready, wait 5 second when state is not ready.

Notice: gRPC channel getState with true parameter will trigger reconnect operation.

* gRPC client will reconnect to the server when network recorvered.

* Recovery application.yml

* Recovery proto module commit id.

* no message

* Fixed compile error.
2018-11-22 20:50:27 +08:00
吴晟 Wu Sheng c6ada8c98f
Support new v2 protocol and make concept consistently (#1937)
* Update new protocol

* Support new protocol at agent side.

* Fix test case.

* Make backend supports new trace protocol

* Fix tests.

* Make all new services available in gRPC.

* Fix bugs.

* Finish new document for v2 trace protocol.

* Fix wrong version requirement of zk

* Fix trace query bug.

* Find a client side dictionary bug.

* Fix register bugs.

* Fix break doc links.
2018-11-21 22:33:04 +08:00
honganan da734ac8fe fix comments issue #1935 (#1936) 2018-11-19 14:41:55 +08:00
li.can 138262f95a spring inherit issue (#1914) 2018-11-16 23:00:50 +08:00
吴晟 Wu Sheng 645a9a579d
New v2 header with header key `sw6` (#1894)
* Add some supports to sw6 header. Break many test cases because I turn sw3 default off. For sure, you could open in agent.conf.  FYI @peng-yongsheng @ascrutae

* Fix CI and make user cases still work under v1 header.

* Support BASE64 in v2 header and make entryOperationName and parentOperationName optional in ContextCarrier or ContextSnapshot

* Fix CI.

* @peng-yongsheng This is backend related, please pay attention.

* Fix the carrier item order is incorrect (#1903)
2018-11-12 17:42:17 +08:00
Adrian Cole 513c1b86c6 Copies Base64 from Zipkin (#1891)
* Copies Base64 from Zipkin

This copies the last copy of Base64 from Zipkin which can avoid a
dependency on specific JRE. Notes in javadoc show its heritage. We
didn't have unit tests: they can be backported from the source:

cc1f561250/okio/src/test/kotlin/okio/ByteStringTest.kt (L230)

Thanks to @swankjesse who created the eldest github ancestor :P

* Adds last version of encoding
2018-11-08 11:40:22 +08:00
ScienJus ca08d1a28b Support for overriding config with agent options (#1887)
* Support for overriding config with agent options

* Test the separator of options

* support quotes in agent options

* revert imports change

* add more tests

* clear properties after each test

* add document

* fix code style
2018-11-07 23:15:36 +08:00
吴晟 Wu Sheng e9d4c52a03
Make sure heartbeat working always. (#1873)
* Make sure heartbeat working always. cc @liuhaoyang make sure .net agent hasn't this issue.

* FIx CI.
2018-11-02 23:54:33 +08:00
吴晟 Wu Sheng 8cd327d8bb
Revert #1790 reset feature and provide default alarm settings. (#1833)
* Revert reset feature.

* Set default dist alarm settings and make dist package setting files right.

* Support empty list.
2018-10-28 22:28:21 +08:00
刘新元 Liu XinYuan b11d479337 Add service and instance reset function (#1790)
* Manually trigger agent registration and write registration status to file

* Delete unused variables

* Code optimization, encapsulating some methods

* add clear DataCarrier function

* revert SkyWalkingAgent

* Optimize code and logic, including updating applicatin_id in unRegisterOperationNames

* Server end metadata loss notification

* Server end metadata loss notification

* fix file stream close and other problem

* revert to old

* fix some bug

Signed-off-by: Liu-XinYuan <879928098@qq.com>

* fix some bugs in agent reset

* add close inputStream and fileChannel and fix some bug

* fixed some bugs
2018-10-27 19:58:15 +08:00