Commit Graph

4665 Commits

Author SHA1 Message Date
Brandon Fergerson ffb6a1bde2 spelling 2019-03-17 10:31:02 -06:00
Brandon Fergerson 257af0bda7 moved accepted method types to beginning of url 2019-03-17 10:29:42 -06:00
Xin,Zhang 9a1518a652
Merge branch 'master' into qualified-spring-mvc-endpoints 2019-03-17 22:27:52 +08:00
吴晟 Wu Sheng 4962cbbbf9
Merge pull request #2370 from peng-yongsheng/feature/oal_expression
Added 4 expressions in OAL syntax: >, <, >=, <=.
2019-03-17 20:19:41 +08:00
peng-yongsheng 923e47206e Fixed failures with test cases 2019-03-17 10:19:26 +08:00
Brandon Fergerson fe9f81bc1b meant to append 2019-03-16 20:14:24 -06:00
Brandon Fergerson 94555f62e3 Merge remote-tracking branch 'origin/qualified-spring-mvc-endpoints' into qualified-spring-mvc-endpoints 2019-03-16 20:12:12 -06:00
Brandon Fergerson 65692887f2 meant to append 2019-03-16 20:12:05 -06:00
Xin,Zhang 5ef9adc8b8
Merge branch 'master' into qualified-spring-mvc-endpoints 2019-03-17 07:24:00 +08:00
peng-yongsheng 610a53784f fixed expressions error. 2019-03-17 00:21:20 +08:00
peng-yongsheng 940130e24a Added 4 expressions in OAL syntax: >, <, >=, <= 2019-03-17 00:15:51 +08:00
吴晟 Wu Sheng a3a85e520e Support Exporter in core (#2368)
* Rename ALarmSupported to WithMetadata

* Finish the base of exporter.

* Fix class comment.
2019-03-16 23:27:15 +08:00
吴晟 Wu Sheng 3eafda2865
Merge pull request #2360 from apache/async-context
Async core APIs in java agent
2019-03-16 16:26:07 +08:00
吴晟 Wu Sheng 397162f635
Merge branch 'master' into async-context 2019-03-16 08:57:38 +08:00
Joe Zou e819a805ff Update powered-by.md (#2369)
* Update powered-by.md

Change order
2019-03-16 08:57:24 +08:00
吴晟 Wu Sheng cbc29c6164
Merge branch 'master' into async-context 2019-03-16 08:22:34 +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 14db2ede7f
Update Trace-Data-Protocol-v2.md (#2367) 2019-03-15 19:24:28 +08:00
吴晟 Wu Sheng a48dab5f3b
Merge branch 'master' into async-context 2019-03-15 15:54:25 +08:00
kezhenxu94 05b0498fed extract immutable object to reduce garbages (#2364) 2019-03-15 14:03:30 +08:00
彭勇升 pengys 901a595c79 Set the version by properties value in dependency management. (#2362)
Remove the version setting in dependencies.
Remove the scala compiler version property.
2019-03-15 07:34:13 +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
guyu 30e4089128 complete Intellij IDEA build process for envoy-metrics-receiver-plugin (#2358) 2019-03-14 13:25:54 +08:00
Brandon Fergerson 7322ea86a6 updated to operation name 2019-03-13 08:17:11 -06:00
Brandon Fergerson a2df0e0e3d didn't mean to commit with this PR 2019-03-12 23:00:06 -06:00
Brandon Fergerson 2493865a92 use MethodUtil 2019-03-12 22:56:41 -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 7e3133136f add to docs 2019-03-12 22:45:47 -06:00
Brandon Fergerson ba15f2b47c Merge branch 'master' into qualified-spring-mvc-endpoints 2019-03-12 22:41:04 -06:00
Brandon Fergerson 62f21330ad impl USE_QUALIFIED_NAME_AS_ENDPOINT_NAME 2019-03-12 18:14:44 -06:00
dingshaocheng c7644c1270 mysql-8x-plugin and multihost support for mysql5.x (#2292)
* fix issue #2258

* fix #2097 #1947

* remove Description and date tag

* split the diferent version to different plugins

* resolve conflict

* record all ips on multiple host mode of mysqlconnector-5x

* fix jdk 6.x

* optimise the code

* optimise code

* modify class name

* fix #2097 #1947

* i do not think it is a good idea to move the Instrumentation to mysql-common,the better way is extract a public method to return the InteceptorPionts in mysql-common

* fix #2097 #1947

* remove witnessClasses of subclasses
2019-03-13 07:48:40 +08: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
彭勇升 pengys 70e6c203ab Shutdown the OAP server when catch any exception. (#2352) 2019-03-12 22:52:38 +08:00
吴晟 Wu Sheng 0951b9434b Make k8s-Coordinator works in role mode. (#2347)
* Make k8s-Coordinator back in role mode.

* Start query API server after the core started.

* Do lock when port has been intialized.

* Rename service.

* Fix text cases.

* Declare ConfigService.class in core module.

* Implement in an easier way.

* Envoy print whole metric, now in debug.

* Forcedly fix envoy timestamp issue.
2019-03-12 15:36:36 +07:00
Brandon Fergerson 68376fb505 vertx plugin work 2019-03-11 22:14:19 -06:00
Jared Tan eb19715f99 set es storage namespace to lower case. (#2348) 2019-03-12 07:17:00 +08:00
吴晟 Wu Sheng 499638775f
New architecture graph, new documents. (#2345) 2019-03-11 18:12:59 +08:00
彭勇升 pengys ab398f79c9 The role of OAP server. (#2344)
* The role of OAP server.
Mixed: Receive agent data, level 1 aggregate, level 2 aggregate
Receiver: Receive agent data, level 1 aggregate
Aggregator: level 2 aggregate

* Mistake, stadalone default.

* Update application.yml
2019-03-11 16:34:30 +08:00
吴晟 Wu Sheng 8ec12cd7e5
Fix a small setting. (#2343) 2019-03-11 15:13:38 +08:00
彭勇升 pengys 6d00642386 Separation the remote gRPC server from the receiver gRPC server. (#2335)
* #2327

Add a new module for share receiver server or to be a bridge of core server.

* Rename the module name.
2019-03-11 14:23:57 +08:00
吴晟 Wu Sheng 7c726905c3 If the node has no interaction, then it disappear in topology. (#2336) 2019-03-10 22:10:20 +08:00
kezhenxu94 4454721030 doc: fix typo and list numbers (#2339) 2019-03-10 18:36:39 +08:00
吴晟 Wu Sheng 93347b2340
Envoy heartbeat update bug (#2334) 2019-03-08 17:41:26 +08:00