Commit Graph

153 Commits

Author SHA1 Message Date
Brandon Fergerson 778b86e1de
Update ConsumeDriver.java (#4610)
spelling fix
2020-04-06 07:17:31 +08:00
吴晟 Wu Sheng fa9a44b750
Version number changed including a little documentation. (#4597) 2020-03-31 12:57:20 +08:00
吴晟 Wu Sheng 61f98c81f0
Move the main branch to 7.1.0 iteration. (#4537)
* [maven-release-plugin] prepare release v7.0.0

* [maven-release-plugin] prepare for next development iteration
2020-03-19 10:38:41 +08:00
kezhenxu94 dcd66ee6e9
Rewrite the E2E test framework and tests (#4510)
Motivation:

According the feedback from the community, the e2e tests are hard for
them to understand and get them started, so this pull request aims to
rewrite the e2e tests with some improvements:

- debuggable locally, now you can run every individual case directly
inside the IDE, just like running a plain unit test.

- same functionalities of multiple counterparts share the same codes,
cases like different storages and cluster coordinators share the same
codes, easy to add more similar cases.

- the "end" now extends to the Doccker images, meaning that some bugs
like #4483 and #4471 can be more easily and early to be discovered.

- codes style and license headers are checked

Modifications:

- adopt jupeter (a.k.a junit 5), testcontainers as the new test
framework, all containers are orchestrated by docker-compose.yml,
well-known technology that developers should be familiar with.

- rewrite all test cases and verify them.

- reorganize the workflows in GitHub Actions.

Result:

- new e2e test should be easy to add.

- closes https://github.com/apache/skywalking/issues/4472
2020-03-16 23:45:14 +08:00
kezhenxu94 5b255ba3e3
Set up more strict code styles and fix existing issues (#4337)
Motivation:

Review code styles with some bots automatically.

Modifications:

Set up ReviewDog in GitHub Action to review code style.

Add more check rules to checkstyle plugin.

Result:

Obvious code styles can be reviewed and commented automatically.
2020-02-11 17:10:49 +08:00
John Niang 41c63672c0
Refactor ConfigInitializer and improve map type config (#4321)
* Refactor ConfigInitializer

* Rename some variable names and add some java docs

Co-authored-by: kezhenxu94 <kezhenxu94@163.com>
Co-authored-by: 吴晟 Wu Sheng <wu.sheng@foxmail.com>
2020-02-06 17:09:38 +08:00
John Niang 0e105a49bf
Upgrade remainder java compiler versions to 1.8 (#4286)
Co-authored-by: kezhenxu94 <kezhenxu94@163.com>
2020-01-29 14:19:22 +08:00
吴晟 Wu Sheng b570996006
Update JDK compiling level to 8, and remove zip dist. (#4119)
* Update JDK compiling level to 8, and remove zip dist.

* Exclude annotation and shade API.

* Fix more exclusion.

* 1. Update grava and gson 2. Fix compile issue. 3. Keep protoc and maven plugin in old version. Some incompatible of 3rd party grpc proto.

* Fix dependency conflicts, license and notice issue, and dependency check script issue

Co-authored-by: kezhenxu94 <kezhenxu94@163.com>
2019-12-25 15:55:24 +08:00
吴晟 Wu Sheng d7f7799c80
Set the main branch to 7.0.0-SNAPSHOT (#4115)
* [maven-release-plugin] prepare release v6.6.0

* [maven-release-plugin] prepare for next development iteration
2019-12-24 16:37:13 +08:00
Muxin 84792873b8 typo error (#3914) 2019-11-21 21:11:27 +08:00
吴晟 Wu Sheng d7038fe67b
Refactor DataCarrier, support ArrayBlockingQueueBuffer as implementor (#3849)
* Refactor DataCarrier, support ArrayBlockingQueueBuffer as the implementation for blocking queue buffer.

* Fix style issue.

* Remove import.

* Remove uesless codes.
2019-11-15 23:33:40 +08:00
吴晟 Wu Sheng 3fbaec42dc
Move to 6.6.0 SNAPSHOT (#3839)
* [maven-release-plugin] prepare release v6.5.0

* [maven-release-plugin] prepare for next development iteration
2019-11-12 22:33:39 +08:00
kezhenxu94 321a88f575 Bugfix: endpoint grouping rules may be not unique (#3510) 2019-09-23 22:32:28 +08:00
吴晟 Wu Sheng ce20fe107d
Move to 6.5.0 (#3439)
* [maven-release-plugin] prepare release v6.4.0

* [maven-release-plugin] prepare for next development iteration
2019-09-08 16:24:21 -07:00
Stalary 3d00d83fc6 ADD: add operationName length threshold (#3357)
* ADD: add operationName length threshold

* MOD:move operationName threshold to Config, simplified code

* MOD:update agent set-up document, clean code

* MOD:add agent.operation_name_threshold conf prefix
2019-08-28 22:18:11 +08:00
吴晟 Wu Sheng a3241f0a59
Support op group name in agent config core. (#3299)
* Support op group name in agent config core.

* Provide core API for operation name grouping, rest template plugin update, and doc update.

* Fix doc

* Fix test case.

* Fix missing changes.

* add shuyun to powered-by.md (#3341)

* add shuyun to powered-by.md

* update powered-by.md

* Remove static method.
2019-08-27 15:07:44 +08:00
Alvin ffe1df579f Enhance agent logger. (#3250)
* Add pattern logger to replace the easy logger.
* Doc update
* Support console log
2019-08-14 14:31:24 +08:00
吴晟 Wu Sheng b247dc979e
Move project master branch to 6.4.0-SNAPSHOT (#3220)
* [maven-release-plugin] prepare release v6.3.0

* [maven-release-plugin] prepare for next development iteration
2019-08-05 21:19:17 +08:00
Daming 8faa356403 Using ArrayList to instead of LinkedList (#3093)
* Using ArrayList to instead of LinkedList
2019-07-17 13:26:00 +08:00
Roshi 7f3ff150ab One more time for heigher performance (#2930)
V3(this commit) has 20% performance improvement leverages from no `false-sharing` of CPU cache mechanism.
  /**
     * Benchmark                                                 Mode  Cnt         Score         Error  Units
     * AtomicRangeIntegerTest.testGetAndIncrementV1Performance  thrpt    5  13496720.554 ±  240134.803  ops/s
     * AtomicRangeIntegerTest.testGetAndIncrementV2Performance  thrpt    5  39201251.850 ± 1005866.969  ops/s
     * AtomicRangeIntegerTest.testGetAndIncrementV3Performance  thrpt    5  45832615.061 ± 2987464.163  ops/s
     */
2019-06-29 15:18:03 +08:00
吴晟 Wu Sheng 4faa950c14
Move master to 6.3.0 (#2968)
* [maven-release-plugin] prepare release v6.2.0

* [maven-release-plugin] prepare for next development iteration
2019-06-29 13:49:36 +08:00
龟仙老人 f414d72dd5 Rewrite AtomicRangeInteger for higher performance (#2874)
Typical test benchmark for performance improvement. Check PR for more detail.

/**
     * # JMH version: 1.21
     * # VM version: JDK 1.8.0_111, Java HotSpot(TM) 64-Bit Server VM, 25.111-b14
     * # VM invoker: /Library/Java/JavaVirtualMachines/jdk1.8.0_111.jdk/Contents/Home/jre/bin/java
     * # VM options: -Dfile.encoding=UTF-8
     * # Warmup: 3 iterations, 10 s each
     * # Measurement: 5 iterations, 1000 ms each, 1000 calls per op
     * # Timeout: 10 min per iteration
     * # Threads: 1024 threads, ***WARNING: Synchronize iterations are disabled!***
     * # Benchmark mode: Throughput, ops/time
     * # Benchmark: org.apache.skywalking.apm.commons.datacarrier.common.AtomicRangeIntegerTest.testNewGetAndIncrementPerformance
     *
     * # Run progress: 0.00% complete, ETA 00:01:10
     * # Fork: 1 of 1
     * # Warmup Iteration   1: 2078993549.108 ops/s
     * # Warmup Iteration   2: 6408026002.297 ops/s
     * # Warmup Iteration   3: 5455960135.636 ops/s
     * Iteration   1: 165330.972 ops/s
     * Iteration   2: 95420.526 ops/s
     * Iteration   3: 173340.089 ops/s
     * Iteration   4: 94214.669 ops/s
     * Iteration   5: 261606.088 ops/s
     *
     *
     * Result "org.apache.skywalking.apm.commons.datacarrier.common.AtomicRangeIntegerTest.testNewGetAndIncrementPerformance":
     *   157982.469 ±(99.9%) 265443.465 ops/s [Average]
     *   (min, avg, max) = (94214.669, 157982.469, 261606.088), stdev = 68934.825
     *   CI (99.9%): [≈ 0, 423425.934] (assumes normal distribution)
     *
     *
     * # JMH version: 1.21
     * # VM version: JDK 1.8.0_111, Java HotSpot(TM) 64-Bit Server VM, 25.111-b14
     * # VM invoker: /Library/Java/JavaVirtualMachines/jdk1.8.0_111.jdk/Contents/Home/jre/bin/java
     * # VM options: -Dfile.encoding=UTF-8
     * # Warmup: 3 iterations, 10 s each
     * # Measurement: 5 iterations, 1000 ms each, 1000 calls per op
     * # Timeout: 10 min per iteration
     * # Threads: 1024 threads, ***WARNING: Synchronize iterations are disabled!***
     * # Benchmark mode: Throughput, ops/time
     * # Benchmark: org.apache.skywalking.apm.commons.datacarrier.common.AtomicRangeIntegerTest.testOriGetAndIncrementPerformance
     *
     * # Run progress: 50.00% complete, ETA 00:00:43
     * # Fork: 1 of 1
     * # Warmup Iteration   1: 3345520433.355 ops/s
     * # Warmup Iteration   2: 4823749249.799 ops/s
     * # Warmup Iteration   3: 6676209367.819 ops/s
     * Iteration   1: 34885.954 ops/s
     * Iteration   2: 33128.147 ops/s
     * Iteration   3: 31300.865 ops/s
     * Iteration   4: 19188.602 ops/s
     * Iteration   5: 34664.282 ops/s
     *
     *
     * Result "org.apache.skywalking.apm.commons.datacarrier.common.AtomicRangeIntegerTest.testOriGetAndIncrementPerformance":
     *   30633.570 ±(99.9%) 25249.253 ops/s [Average]
     *   (min, avg, max) = (19188.602, 30633.570, 34885.954), stdev = 6557.151
     *   CI (99.9%): [5384.317, 55882.822] (assumes normal distribution)
     *
     *
     * # Run complete. Total time: 00:01:26
     *
     * REMEMBER: The numbers below are just data. To gain reusable insights, you need to follow up on
     * why the numbers are the way they are. Use profilers (see -prof, -lprof), design factorial
     * experiments, perform baseline and negative tests that provide experimental control, make sure
     * the benchmarking environment is safe on JVM/OS/HW level, ask for reviews from the domain experts.
     * Do not assume the numbers tell you what you want them to tell.
     *
     * Benchmark                                                  Mode  Cnt       Score        Error  Units
     * AtomicRangeIntegerTest.testNewGetAndIncrementPerformance  thrpt    5  157982.469 ± 265443.465  ops/s
     * AtomicRangeIntegerTest.testOriGetAndIncrementPerformance  thrpt    5   30633.570 ±  25249.253  ops/s
     */
2019-06-15 13:43:36 +08:00
zhangwei bfd46151ad Replace add with addAll, reduce the invoke time a little. (#2766) 2019-05-27 23:08:11 +08:00
SataQiu 1f39b19937 fix some spelling mistakes (#2615) 2019-05-07 11:40:35 +08:00
Ming Deng 16103c6738 Using PowerMockito to mock System.getent; (#2593)
* Using PowerMockito rathen then using reflection to mock System.getent;

* Run Test

* Trigger CI only on the master
2019-05-07 10:32:43 +08:00
Michael Hausegger ac2cc7339d Added Unit Tests to increase code coverage (#2571) 2019-05-03 08:29:24 +08:00
吴晟 Wu Sheng 9b87086d72
Move to 6.2 (#2563)
* Move submodule plugin.

* Always auto-submodule

* [maven-release-plugin] prepare release v6.1.0

* [maven-release-plugin] prepare for next development iteration

* Change keys location.
2019-04-30 12:16:50 +08:00
Ming Deng e044fe26cd Add unit test for ConsumerPoolFactory, EnvUtil (#2497)
* 1. add unit test for ConsumerPoolFactory, EnvUtil;
2. fix the bug that Env.getLong invoking the Integer.parseInt;

* Add file header
2019-04-20 11:31:15 +08:00
吴晟 Wu Sheng 59d4725091
Fix endpoint name rule package (#2405)
* Add more logs

* no message

* no message

* Exclude test file.
2019-03-26 13:25:07 -07:00
彭勇升 pengys a482eaf37f 1. Fixed the warning of 'parent.relativePath' points issue when running the mvn package command. (#2404)
2. Fixed the warning of duplicate declaration of plugin issue when running the mvn package command.
3. Fixed the warning of duplicate declaration of mysql connector jar when running the mvn package command, because of provided scope include test scope.
4. Fixed the warning of expression ${artifactId} is deprecated issue when running the mvn package command.
5. Fixed the warning of expression ${version} is deprecated issue when running the mvn package command.
2019-03-26 05:10:12 -07:00
吴晟 Wu Sheng 3acd044d25
Support endpoint group in mesh. (#2403)
* Support endpoint group in mesh.

* Fix CI.

* Refactor for reduce string compare.

* Support endpoint naming rule in service level
2019-03-25 21:02:35 -07:00
吴晟 Wu Sheng 58cf5936e6 Improve OAP cluster performance (#2271)
* Refactor for cluster mode.

* Make send to L2 in certain cycle.
2019-02-21 16:33:07 +08:00
吴晟 Wu Sheng c019535ee9
Fix mesh telemetry performance issue and adjust default thread number (#2261)
* Try adjustment.

* Remove heartbeat.

* Make heartbeat back to work. And default threadpool size more sense.

* Make L2 to less than before.

* Make instance heartbeat works.

* Try L1 aggregation thread = core * 2 * 2.
2019-02-20 08:29:17 +08:00
吴晟 Wu Sheng 2f3ccf368c
Backend streaming thread model improvement (#2247)
[Performance Improvement]Backend streaming thread model improvement
2019-02-18 14:55:07 +08:00
吴晟 Wu Sheng b86426c9a2 Add consumer pool to Datacarrier (#2245)
* Extend consume pool to data carrier.

* Change indicator aggregate worker and persistent worker to use default consumer pool.

* Fix CI.
2019-02-13 23:19:47 +08:00
吴晟 Wu Sheng 5a7eb5656a
GA tagged, move to 6.1 (#2180)
* [maven-release-plugin] prepare release v6.0.0-GA

* [maven-release-plugin] prepare for next development iteration
2019-01-18 20:04:23 +08:00
吴晟 Wu Sheng 95214aecf3
update version for next iteration. (#2084) 2018-12-23 09:14:14 +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
吴晟 Wu Sheng 72a39e1f28
Sync 6.0.0-alpha release and version up to beta. (#1883)
* Lock oracle and resin plugins version.

* Move resin and oracle plugin to openskywalking

* Restore submodule active.

* Add another submodule active command.

* Remove the wrong test cases in release and fix some doc issues.

* [maven-release-plugin] prepare release v6.0.0-alpha

* [maven-release-plugin] prepare for next development iteration

* Fix some doc
2018-11-06 15:45:15 +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
吴晟 Wu Sheng d9556c38fc
Make Mesh and Istio receivers ready (#1821)
* Make receiver more effective

* Add Istio test case and all source dispatch in

* Refactor mock data

* FIx rat.

* Support call component.

* Fix ThermodynamicIndicator bug.

* Fix test cases.

* Fix missing calculate in db merging.

* Add codes for debug.

* 1. Fixed elasticsearch bulk process not fresh bug. (#1819)

2. Fixed the bug of source register no queue but wait the end for batch tag.

* Remove debug log, and restore TTL timer for real scenarios.
2018-10-26 15:17:33 +08:00
彭勇升 pengys ee46760dc6 Buffer file implementation (#1607)
* Buffer stream.

* Buffer file reader.
2018-08-30 12:55:05 +08:00
peng-yongsheng d2753037bb Upgrade version to 6.0.0 alpha. 2018-07-07 10:46:41 +08:00
吴晟 Wu Sheng a6e04c97ec
Update version to beta2 for next iteration. (#1233) 2018-05-16 21:21:30 +08:00
lican b4ded22c87 add some basic testcase(apm-util and partial collector-ui-jetty-provider) (#1072)
* commons testcase

* some ui module query testcase

* add testcase

* fix some checkStyle issue

* add some null testcase

* remove

* add license

* fix author error

* remove invalid tag @date

* add license which has been missed
2018-04-13 23:58:47 +08:00
吴晟 Wu Sheng 08267611a2 Prepare beta iteratoration (#944)
* [maven-release-plugin] prepare release apm-5.0.0-alpha

* [maven-release-plugin] prepare for next development iteration
2018-03-13 23:47:38 -05:00
wusheng f7fdd9f854 Fix assmbly for mvn clean install -Papache-release and update version to SNAPSHOT for SNAPSHOT release. 2018-02-26 23:22:10 +08:00
wu-sheng 158b6ff884 Fixing javadoc. And try to trigger a ci fail in this commit, in order to make sure javadoc will be checked in further pull request. 2018-02-26 09:15:10 +08:00
wusheng 8f49c973be Protect the background processes. 2018-01-11 15:53:40 +08:00
goldon f3847972e3
Update StringUtil.java
clean code
2018-01-03 14:14:40 +08:00
wu-sheng 6e152b4fb0 Move `apm-network` module under the new root module `apm-protocol`. And add `apm-ui-query` under the `apm-protocol` module. 2017-12-25 09:51:26 +08:00
wu-sheng 678f30097b Support to set consume cycle. And invoke the existed callbacks when the message blocked at first time. 2017-12-20 14:30:15 +08:00
gaohongtao 318c3db7c9 Update version to 5.0.0-alpha with `mvn versions:set -DnewVersion=5.0.0-alpha` 2017-12-15 10:40:23 +08:00
wusheng 15328202b8 Revove duplicate license headers. 2017-12-11 15:04:26 +08:00
wusheng 05b818e709 Update package name to org.apache.skywalking 2017-12-10 16:32:39 +08:00
wusheng b16d23c148 Update artifactId to "org.apache.skywalking" 2017-12-10 08:21:20 +08:00
wusheng 23133f7d97 Update copyright to Apache Foundation. 2017-12-09 23:38:32 +08:00
wusheng d458622bb4 Update version to 5.0-2018-preview for new iteration. 2017-12-06 22:06:54 +08:00
wusheng 055c760bc0 Set versions, and documents ready for releasing 3.2.6 2017-12-04 22:04:28 +08:00
peng-yongsheng b322b55af6 Upgrade the version from 3.2.5 to 3.3.0. 2017-11-22 15:12:00 +08:00
peng-yongsheng eaa0254512 Test success with standalone and cluster mode. 2017-11-19 22:25:11 +08:00
wu-sheng f601293b22 Update the version to 3.2.5 2017-11-16 12:14:26 +08:00
wusheng 1e0e052496 Merge branch 'master' into feature/collector-modelization
* master:
  Update version for 3.2.4 release.
  add exception handler for disruptorQueue
  support jdbc4 api of postgresql
  support for logback MDC
  AgentStream NullPointerException with RemoteWorker
2017-11-06 23:08:12 +08:00
wusheng 4bdea9e2c9 Update version for 3.2.4 release. 2017-11-06 22:45:00 +08:00
wu-sheng e9a74c85bb Fix a test case. 2017-11-01 15:12:27 +08:00
wu-sheng 04771ffc8c Adjust log APIs. 2017-10-18 16:46:56 +08:00
peng-yongsheng fdb1dc69f5 Check style error 2017-10-13 14:41:16 +08:00
peng-yongsheng 35f0c69598 no message 2017-10-13 13:40:15 +08:00
wusheng c4098a23f9 Revert "Support javadoc generation."
This reverts commit 5c56d41aa2.
2017-10-12 22:43:43 +08:00
wusheng 5c56d41aa2 Support javadoc generation. 2017-10-12 21:43:10 +08:00
peng-yongsheng 52f1420670 Add copyright head in all java files and copyright head check style 2017-10-10 22:27:57 +08:00
wusheng b16963a4bf Change version for next iteration. 2017-09-29 17:18:14 +08:00
peng-yongsheng 0d13b27362 Version change 2017-09-28 10:54:16 +08:00
wusheng 099877c2ce Prepare for 3.2 iteration. 2017-09-17 07:54:25 +08:00
wusheng 4fda33b16c Support retry when use IF_POSSIBLE strategy. 2017-07-28 21:10:14 +08:00
wusheng cba4dc2883 Make sure the JVM stop hook works #295 2017-07-18 21:47:24 +08:00
ascrutae 8143a5b096 independent data carrier project 2017-07-14 10:07:17 +08:00
wusheng eb82d2c989 Update version for next iteration. 2017-06-17 22:40:42 +08:00
wusheng f0e626ff2c 1. Remove the “apm-trace” module, isolate the trace structure between agent and collector for considering performance.
2. Change the head name.
3. Provide potienal mechanism for ignore trace with certain suffix.
2017-06-10 22:46:16 +08:00
wusheng b8e1bd32c9 Merge branch 'master' into feature/sampling
* master:
  add message/stack length check when skywalking convert throwable stack to string.
  Delete _config.yml

# Conflicts:
#	apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java
2017-06-09 22:41:54 +08:00
ascrutae 2e9c96bd3a add message/stack length check when skywalking convert throwable stack to string. 2017-06-09 21:59:43 +08:00
wusheng 14f9154b21 Fix some test cases. 2017-06-09 21:52:11 +08:00
wusheng ae9bc45ccf Fix compile issues. 2017-06-09 20:50:25 +08:00
wusheng 4e2768d7a6 Fix some compile issues. 2017-06-08 22:21:43 +08:00
wusheng 6745e50f4e Fix a test case. 2017-06-08 22:12:16 +08:00
wusheng 673b975738 Optimize span by removing tags map. (Unfinished.) 2017-06-08 21:49:53 +08:00
wusheng 951192d0b6 Provide new data protocol for segment messages. 2017-06-05 21:21:03 +08:00
wusheng 8928716f70 Revert "Add new trace segment for improving sampling performance."
This reverts commit 323468f056.
2017-06-04 20:11:13 +08:00
wusheng d2fe1b77ae Revert "Revert "Add new trace segment for improving sampling performance.""
This reverts commit 5b853ec38b.
2017-06-04 20:11:02 +08:00
wusheng 5b853ec38b Revert "Add new trace segment for improving sampling performance."
This reverts commit 323468f056.
2017-06-04 18:48:58 +08:00
wusheng 323468f056 Add new trace segment for improving sampling performance. 2017-06-04 18:46:36 +08:00
wusheng d69500a40a Revert "Remove the “get” method of String/Boolean/Integer Tags."
This reverts commit 04041ebd7e.
2017-06-04 18:03:00 +08:00
wusheng 04041ebd7e Remove the “get” method of String/Boolean/Integer Tags. 2017-06-04 17:52:31 +08:00
wusheng c2319bcceb Add three test utils, prepare for removing the “get” method from the Tag classes. 2017-06-04 17:48:54 +08:00
吴晟 Wu Sheng 63f0213a8c Merge pull request #197 from wu-sheng/feature/160
add okhttp plugin(provide synchronous http calls )
2017-05-31 09:45:11 +08:00
wusheng 9e4026e9b5 Prototype codes of supporting leaf span 2017-05-17 18:02:11 +08:00
pengys5 7ac504b19c Merge commit 'c3259afae0e4a267397d91c6117737aa4b7a2e54' into feature/160
# Conflicts:
#	apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
#	apm-sniffer/apm-agent/pom.xml
#	apm-sniffer/apm-sdk-plugin/pom.xml
2017-05-16 16:17:57 +08:00
pengys5 39708a9ab1 add okhttp plugin(provide synchronous http calls )
add test case for okhttp interceptor
2017-05-16 10:14:53 +08:00