Commit Graph

448 Commits

Author SHA1 Message Date
caoyixiong b4ee1f17fb update dependencyManagement (#2660)
* Fix #2546

* Change the stackdepth type

* Fix bug

* Fix CI failed

* fix #2599

* fix ci

* add license

* add ActiveTag error methods

* fix

* fix

* fix doc

* update doc

* update dependencyManagement

* fix
2019-05-14 23:09:42 +08:00
彭勇升 pengys 118485fbb7 Make the elasticsearch json object build to be a public method. (#2648) 2019-05-10 12:43:17 +08:00
彭勇升 pengys 3a31812854 Recover the module name of envoy-metric. (#2645) 2019-05-10 12:02:17 +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
Ming Deng a4eb10d1da 1. Add unit tests for cluster-consul-plugin; (#2572)
2. Add unit tests for cluster-zookeeper-plugin;
3. Add unit tests for cluster-kubernetes-plugin;
2019-05-06 09:11:15 +08:00
Jared Tan 4da0f486b5
add prometheus. (#2580) 2019-05-05 15:52:40 +08:00
Michael Hausegger ac2cc7339d Added Unit Tests to increase code coverage (#2571) 2019-05-03 08:29:24 +08:00
吴晟 Wu Sheng 24393f3b8d Fix query all scope in MySQL and H2 storage. (#2568) 2019-05-01 00:39:29 +08:00
Ming Deng 4b19bd77cf add unit tests for alarm-plugin module (#2542) 2019-04-30 21:46:23 +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
吴晟 Wu Sheng 9901005995 Fix bug about match query in ElasticSearch storage. (#2550)
* Fix bug about match query.

* Update UI and alarm query

* Fix style

* Fix NPE.
2019-04-28 18:11:53 +08:00
康智冬 2dcf27b799 Update all "incubator-skywalking" to "skywalking" ,"incubator-servicecomb-java-chassis" to "servicecomb-java-chassis" correctly, and ".gitmodules" will update at #2531 (#2548) 2019-04-28 15:47:14 +08:00
Jared Tan 5b0419b7c2 support es query segment max size. (#2540)
* support es query span max size.

* refactoring segmentQueryMaxSize.

* fix

* fix
2019-04-26 23:39:40 +08:00
Ming Deng ec7dba3cab Add unit test for GRPCExporter and GRPCExporterProvider (#2498)
* Add unit test for GRPCExporter and GRPCExporterProvider

* MockLongValueIndicator impl the LongValueHolder and MockIntValueIndicator impl the IntValueHolder

* formate the code
2019-04-21 20:19:09 +08:00
Jared Tan 0b2e355b52 extend Metadata limit (#2492)
* fix default MetadataQuery Max size.

* revert mysql
2019-04-17 19:25:46 +08:00
Brandon Fergerson ce1c7aadfc Vert.x Core 3.x Plugin (#2386)
* vertx plugin impl
2019-04-16 23:46:49 +08:00
彭勇升 pengys 73e8853fa5 Provide elasticsearch template operation method. (#2474)
* Provide elasticsearch template operation method.

* Fixed compile failure issue.
2019-04-11 20:08:51 +08:00
彭勇升 pengys 4beaac001b Integration test for elastic search client. (#2464)
* Integration test for elastic search client.

* Just test verify command.

* CI command order change.

* Remove maven clean.

* no message

* Create Jenkinsfile to try the apache build for our CI.
2019-04-10 10:15:54 +08:00
吴晟 Wu Sheng 9ab568faf2
Support shutdown the trace analysis. (#2463) 2019-04-09 18:18:13 +08:00
吴晟 Wu Sheng df362b18f0
Query protocol and codebase for log type record (#2449)
* New query graphql protocol added.

* Finish a new metric, log(abstract) with HTTP Access Log.

* Submit the draft codes of logs.

* Remove @IDColumn

* Fix startup issue.

* Add http_access_log to disable list.

* Finish a wrong service implementation.

* Add trace id in log query condition and result.

* Fix style
2019-04-08 07:53:06 +08:00
Lemon c3cc3d2e56
Fix clr receiver (#2456) 2019-04-07 23:25:08 +08:00
吴晟 Wu Sheng ff6fb90d38
Add jaeger traces support (#2434)
* Make Jaeger receiver works in 12450 as default.

* Finish compile and codebase.

* Make codes runnable.

* Finish Jaeger query tests.

* Add document for jaeger receiver.

* Add readme.

* Fix a break link.

* Finish doc.
2019-04-01 20:52:59 -07:00
吴晟 Wu Sheng e59a488005
Setup Jaeger receiver and revert #2425 (#2431)
* Fix missing licenses in dist.

* Move all CoreRegisterLinker together into SharingReceiver.

* Setup receiver endpoint

* Revert "Provide create, delete, isExists template method by elastic client. (#2425)"

This reverts commit e6a7720f03.
2019-04-01 10:52:29 -07:00
吴晟 Wu Sheng 315c0e69ee
Reorganize the receiver proto (#2426)
* Move all receiver proto files together, in case the class conflict in gogoproto.

* Add jaeger proto and its dependency proto. Also license provided.

* Fix rat.
2019-03-30 18:25:31 -07:00
彭勇升 pengys e6a7720f03 Provide create, delete, isExists template method by elastic client. (#2425) 2019-03-30 13:19:10 -07:00
吴晟 Wu Sheng 601b472ef6 Support Backend acts as pure Zipkin collector (#2424)
* Codebase for zipkin span persistence.

* Fix missing fields in storage.

* Miss the latency field.

* Finish some tests.

* Fix wrong latency.

* Finish doc and reset application.yml

* Make the description more clear.
2019-03-31 01:36:36 +08:00
彭勇升 pengys 1fd5c5790a
Divide two static classes (#2411)
* 1. Remove static worker instances holder.
2. Remove static worker instance id generator.

* Fixed test case failure.
2019-03-30 15:37:19 +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
吴晟 Wu Sheng 9a09e96204 Support disable statement in OAL (#2402)
* Try to make disable work.

* Make disable works.

* Add disable document.
2019-03-26 23:34:31 +08: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 0ecf641c17 Support gRPC metric exporter (#2395)
* Support grpc exporter.

* Support scope(all) metric export and finish document.

* Close exporter even in local debug env. And fix CI.

* Remove the system.out

* Fix absent 4.

* Support subscription from remote.

* Add the doc

* Update application.yml
2019-03-25 15:48:00 +08:00
彭勇升 pengys f38aea3d97 Fixed a logical error cause JVM metrics not dispatched. (#2398) 2019-03-23 08:40:35 -07:00
吴晟 Wu Sheng cea04f3ca0 Wrong host name. (#2397) 2019-03-22 19:55:02 -07:00
吴晟 Wu Sheng 975a06d163 Add catalog to ScopeDeclaration annotation. Make the alarm adapt to it. Now more metric could go through alarm, such as JVM, CLR. (#2391) 2019-03-21 18:38:32 +08:00
Ahoo Wang 3438151693 Sync SmartSql provider setting to all of component-libraries.yml (#2394)
* Add SmartSql provider components in component-libraries config

* sync SmartSql provider setting -> fix https://github.com/apache/incubator-skywalking/issues/2390
2019-03-20 23:06:13 -07:00
kl c69eafefad Added elasticsearch warehouse certification support (#2384)
* Added elasticsearch warehouse certification support

* Add the elasticsearch service for Http Basic instructions

* Update backend-storage.md

Change document.
2019-03-20 21:09:29 -07:00
彭勇升 pengys 7419a59125 Supplement unexpected exception message. (#2389) 2019-03-20 18:02:16 -07:00
Lemon 7047c97e8b Add CLR_Receiver plugin (#2385) 2019-03-20 20:53:42 +08:00
Ahoo Wang 6aefdc4277 Add SmartSql provider components in component-libraries config (#2387) 2019-03-20 18:08:49 +08:00
Lemon 9b055cc5d4 Update proto commit (#2383) 2019-03-19 20:37:19 +08:00
Xin,Zhang 9a1518a652
Merge branch 'master' into qualified-spring-mvc-endpoints 2019-03-17 22:27:52 +08:00
peng-yongsheng 923e47206e Fixed failures with test cases 2019-03-17 10:19:26 +08: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
kezhenxu94 05b0498fed extract immutable object to reduce garbages (#2364) 2019-03-15 14:03:30 +08:00
Brandon Fergerson a2df0e0e3d didn't mean to commit with this PR 2019-03-12 23:00:06 -06:00
Brandon Fergerson e471b1077a
Merge branch 'master' into qualified-spring-mvc-endpoints 2019-03-12 22:55:12 -06: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
彭勇升 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
彭勇升 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
吴晟 Wu Sheng 93347b2340
Envoy heartbeat update bug (#2334) 2019-03-08 17:41:26 +08:00
吴晟 Wu Sheng c2a7e8e539
Bug fix. (#2333) 2019-03-08 16:31:42 +08:00
吴晟 Wu Sheng b4cb7e0bca
Envoy metric support and a bug fix (#2321)
* Extend envoy metric service, scope and OAL lexer/parser.

* Finish metric extension and oal.

* Make test env works.

* Finish test of envoy connection and memory metric.

* Change document.

* Finish docker compose test.
2019-03-07 17:05:46 +08:00
Gao Hongtao 5629bc33f3 Update RegisterPersistentWorker.java (#2307)
Fixed wrong parameter
2019-03-02 14:52:22 +08:00
Lemon 4a54c7687d Add clr metrics scope and oal script (#2297)
* Add CLR metric scope and oal_script

* Add max indicator

* Fix checkstyle
2019-03-02 09:36:48 +08:00
Dhi Aurrahman b8a414edf5 Envoy metrics receiver plugin protos (#2304)
* Add envoy metrics service protos

This patch imports protos from envoyproxy/data-plane-api and
prometheus/client_model to enable metrics service service feature in
SkyWalking OAP.

Signed-off-by: Dhi Aurrahman <dio@tetrate.io>

* Add Envoy related docs

Signed-off-by: Dhi Aurrahman <dio@tetrate.io>

* Update the LICENSE to include new protos license

From:
- envoyproxy/data-plane-api
- prometheus/client_model

Signed-off-by: Dhi Aurrahman <dio@tetrate.io>

* Add a complete config.yaml example

Signed-off-by: Dhi Aurrahman <dio@tetrate.io>

* Add note on Envoy dynamic config

Signed-off-by: Dhi Aurrahman <dio@tetrate.io>

* Add protoc-gen-validate license

Signed-off-by: Dhi Aurrahman <dio@tetrate.io>

* Add samples

Signed-off-by: Dhi Aurrahman <dio@tetrate.io>

* Make CI and license right.

* Update README.md

@dhi typo :P

* Update README.md

Another typo :P

* Delete metrics.json

metrics.json is included in identify.json and not be linked in document.
2019-03-01 22:13:59 +08:00
吴晟 Wu Sheng fb62025da8
Improve OAP extendibility (#2288)
* Make scope meta configurable.

* Fix test cases in ci.

* Change step 1

* Refactor step 2

* Other compile issue done. Prepare the generator changes.

* Revert some wrong changes to Istio receiver.

* Step 3, make compile pass.

* Try to make CI passed.

* Add a check.

* Fix generated code style

* Provide new and extendable dispatcher generator tool

* Fix startup.

* Can't guarantee the dispatchers are always existing. Put explicit comments at there to avoid confusion, since this is different with old version.

* Fix a H2 query for endpoint search.

* Fix a wrong mysql alarm query.

* Provide new document and `generate-tool-grammer` module.

* Add missing last section of document.

* Fix typo

* Relocate the @ScopeDeclaration annotation, make it more sense. Also remove the useless @SourceType annotation. And adjust document for these changes

* ScopeDeclaration can be used once for each class only, now.
2019-02-26 13:43:14 +08:00
Jared Tan c596d0ac82 add serviceInstanceId in Segment storage. (#2146)
* add serviceInstanceId in Segment storage.

* add serviceInstanceId in query condition.
2019-02-23 07:59:19 +08:00
LazyLei 8bacabf741 fix typo (#2274) 2019-02-22 07:32:36 +08: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 479ee33244
Correct trace id in slow db statement (#2254)
* Correct trace id.

* Fix match.

* Add cover token to retry.

* Retry new test plugin.

* Reset to jacoco.

* Update jacoco version.
2019-02-19 13:02:54 +08:00
吴晟 Wu Sheng 333bcd48e0
Provide slow database rule document. (#2253) 2019-02-18 21:23:36 +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
于玉桔 0929ff3453 Support Zookeeper plugin (#2211)
* Zookeeper plugin
2019-02-15 22:13:44 +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 4c6429061a Support to register different host/port at cluster coordinator (#2244)
* Support to register different host/port at cluster coordinator. Only for Zookeeper and Consul

* Provide document for internalComHost and internalComPort

* Reset port to default.
2019-02-13 16:06:43 +08:00
吴晟 Wu Sheng 4babd6ff73 Support Top sql (#2239)
* The prototype of topN sql worker.

* Add scope and new manual dispatcher.

* no message

* Finish topN persistence codes. Not test yet. And query have not added.

* Finish the top n database statement persistent.

* Support different slow thresholds for different db types.

* Fix wrong db default threshold

* Finish new query protocol binding.

* Provide query empty implementation and sync ui.

* Finish all codes, hope it works :P
I will run the tests tonight.

* Fix

* Fix

* Fix a startup issue.

* Add time bucket to persistent.

* Fix wrong query result column name.

* Fix Database query.

* Fix checkstyle.

* Fix wrong order logic, and add a test case to verify, to fix https://github.com/apache/incubator-skywalking/pull/2239#discussion_r255948249
2019-02-12 23:13:02 +08:00
Lemon f7ca26729d Database metrics provided. (#2025)
* Add Database source

* Add DatabaseSource source and database_* script for oal

* Enable Database_Indicator

* Add file license

* Rename DatabaseService to ClientDatabase. In the future, we may have real database server monitoring.

* Add query database from H2

* refactor

* update submodule

* refactor

* Fix style

* Fix: unknown tag error

* fix checkstyle
2019-01-27 08:27:34 +08:00
于玉桔 a36394d9bc Support lettuce plugin (#2152)
* Support lettuce plugin

* lettuce plugin bugfix

* lettuce plugin fix license issue

* lettuce plugin fix cluster and config issue

* plugin lettuce compatible with low 5.0.x version

* lettuce plugin support version accurately describes on Supported-list.md

* plugin lettuce compatible with low 5.0.2 version

* lettuce plugin fix wrong batch method intercept point

* move lettuce to optional plugins

* fix ci issue

* fix ci issue

* Modify the description file

* Pom code optimization

* Optimization operation name

* Optimization operation name2
2019-01-26 13:09:03 +08:00
吴晟 Wu Sheng 2e0104e599 Register lock refactor (#2195)
* Refactor register and reduce the lock time.

* Refactor es id generation mechanism.

* Wrong commit place.
2019-01-23 23:21:36 +08:00
c704ee0f68 for issue#2196 (#2197)
for issue#2196
2019-01-23 18:55:38 +08:00
彭勇升 pengys 9810c5e308 Improve buffer reader speed. (#2188)
* 1. Sleep 500 milliseconds after a batch re-call finish.
2. Re-create register lock index when the system property named debug is setting.
3. Get the register inventory before lock to avoid increment the sequence but not use.
4. Return the exchange flag after all the references and spans in one segment parsed to reduce the number of segment parse.
5. Put the not exchanged segment into a collection then try to exchange no more than 10 times because of the exchange is asynchronous.
6. Cache the segment object to avoid repeated deserialization.

#2185

* #2185
1. Sleep 500 milliseconds after a batch re-call finish.
2. Re-create register lock index when the system property named debug is setting.
3. Get the register inventory before lock to avoid increment the sequence but not use.
2019-01-21 04:21:45 +08:00
吴晟 Wu Sheng d3155220c3
Fix H2 and MySQL endpoint dependency map miss upstream side and add changelogs (#2187)
* fix no language attr value in mesh (#2182)

* Fixed the inventory register lock invalid bug. (#2184)

* #2183

Merge commit into master.

* Make the h2 register lock same as mysql.

* Fix #2186
2019-01-20 18:14:18 +08:00
彭勇升 pengys 33f5cc19b5 Fixed the inventory register lock invalid bug. (#2184)
* #2183

Merge commit into master.

* Make the h2 register lock same as mysql.
2019-01-20 16:41:06 +08:00
Gao Hongtao 334dd03429 fix no language attr value in mesh (#2182) 2019-01-19 10:48:54 +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 18ed80bd95
Fix missing language field. (#2174) 2019-01-18 08:00:51 +08:00
吴晟 Wu Sheng 9cda28f054
Set H2 storage startup right. (#2173) 2019-01-18 00:14:04 +08:00
a198720 b1b5ee5103 fixed the index name to format name in logs (#2165)
* fixed  the index name to format name in logs

* modify the log level from info to debug
2019-01-16 16:34:59 +08:00
a3e03f6133 Un-exchanged endpoint name in ref can't find the id (#2162)
* Update ReferenceIdExchanger.java

Change comments of codes.
2019-01-15 20:38:05 +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
Jared Tan 84a5c8c546
fix log output. (#2153) 2019-01-12 21:42:52 +08:00
Yann.Xia f9fb69336e Fix unessential gson instance (#2151) 2019-01-12 12:01:11 +08:00
于玉桔 43b216aa92 Support redisson plugin (#2083)
* plugin support redisson
2019-01-11 22:32:09 +08:00
吴晟 Wu Sheng 9cc5e76d97
Support service inventory extension fields in json format (#2148)
* Add properties for service inventory

* Fix code bugs

* Provide develop doc for inventory extension.
2019-01-11 21:24:51 +08:00
于玉桔 20aa7f9ba1 Bugfix: logger information has not enough arguments (#2147) 2019-01-11 20:00:23 +08:00
吴晟 Wu Sheng 5f57e561c7 Provide grafana settings for telemetry (#2138)
* Change a label name for  sw instance to avoid confict.

* Fix a wrong metric name.

* Fix too many counter instances.

* Set uptime to second.

* Fix format.

* Fix format

* Remove two unnecessary counter.

* Provide grafana dashboard settings and remove unnecessary metric.

* Provide a simple UI brief doc. Fix #2137
2019-01-10 07:27:23 +08:00
吴晟 Wu Sheng 6499d4f583
Implement Prometheus to oap backend telemetry (#2133)
* Finish the basic codes of telemetry.

* Add many telemetry in oap.

* Fix a test case.

* Finish all telemetry metric.

* Fix format.

* Make telemetry works.

* Support JVM metrics.

* Add doc for telemetry.

* Fix typo.

* Fix #2135
2019-01-08 23:20:13 +08:00
吴晟 Wu Sheng aaa403ec00
Set telemetry module and APIs (#2123)
* Finish the APIs of telemetry module.

* Add prometheus license.

* Active default telemetry provider.
2019-01-07 09:48:53 +08:00
langyan1022 6a4e7ffc6c fix missing ojdbc component id in component-libraries.yml (#2122)
* add ojdbc component id
2019-01-04 20:56:38 +08:00
XiaoFu ee6841fc13 Support Gson Plugin (#2090)
* Support Gson plugin
2019-01-03 23:51:22 +08:00
吴晟 Wu Sheng 0a3af743b4
Fix wrong alarm text. (#2120) 2019-01-03 23:13:52 +08:00
吴晟 Wu Sheng ec391becad
Provide two start up modes and documents. (#2116) 2019-01-03 15:19:45 +08:00
吴晟 Wu Sheng 95214aecf3
update version for next iteration. (#2084) 2018-12-23 09:14:14 +08:00
吴晟 Wu Sheng c592aea8db Refactor register API for making integration easier. (#2075)
* Refactor register API for making integration easier.

* Fix wrong refactor.
2018-12-21 22:32:06 +08:00
XiaoFu addf5101e0 Support canal plugin (#2035)
* fix add Canal plugin

* fix add UnitTest

* fix   format pom.xml

* Delete CanalApplication.java

* fix support cluster url

* fix add Licensed

* fix bug

* fix
2018-12-20 21:07:31 +08:00
吴晟 Wu Sheng c7884694da
Move node type from network address to service level[Need storage module update] (#2051)
* Change srcLayer to nodeType. Add nodeType in service inventory entity.

* NodeType value refactor.

* Format codes.

* Fix compile issue.

* Fix bugs, and make query on service inventory instead of network inventory
2018-12-17 09:05:16 -08:00
ZhHong 0284293458 /instance/register osName, hostName (#2042)
osName and hostName values are reversed。
2018-12-13 07:58:02 -08:00
Jared Tan 2f37158e41
modify code style (#2041)
* modify code style

* ci
2018-12-13 21:59:17 +08:00
彭勇升 pengys dfe2b08599 [OAP Server][Cluster Plugin] Provide consul cluster plugin (#2036)
* Provide consul cluster plugin.

* Change log and application config file.

* Add consul's config item into the docker's application.yml.

* Fixed bug.

* Add consul description into  readme.

* Add okhttp component license.
2018-12-12 08:14:41 -08:00
彭勇升 pengys 7532583d90 Endpoint name need fuzzy query. (#2026) 2018-12-09 13:01:58 +08:00
彭勇升 pengys c12cfa5816 No need to dependency to elasticsearch. (#2024) 2018-12-09 11:27:16 +08:00
XiaoFu 45f44544eb Support rabbitmq plugin (#2000)
* Fix support rabbitmq plugin

* fix Unit test rename sw3 to sw6

* Update pom.xml

* fix adjust rabbitmq Unit test

* fix add rabbitmq component in docker component-libraries.yml

* Update RabbitMQProducerInterceptor.java

* Update RabbitMQProducerInterceptor.java
2018-12-07 21:20:10 +08:00
吴晟 Wu Sheng 40eb651238
OAL tool module established (#2015)
* Move oal tool back into main repo, and fix compile issue.

* Fix two bugs.

* Remove all generated codes.

* Make all oal generated codes out of source control.

* Make mvn compile and package work.

* Fix test cases.

* Make compile right and provide new documents.

* Remove an unnecessary tokens file.
2018-12-07 09:31:16 +08:00
彭勇升 pengys 27c475f74c 1. Make storage and cluster using same name space. (#2014)
2. Zookeeper implementation of the cluster module using name space to support using same zookeeper cluster by different OAP clusters.
2018-12-06 21:03:00 +08:00
吴晟 Wu Sheng 1587b057e1
Merge branch 'master' into clean 2018-12-06 14:40:56 +08:00
吴晟 Wu Sheng f2b158862c
[OAL refactor step 1]Refactor dispatcher manager (#2006)
* Remove the hard codes about DispatcherManager.

* Add comments.
2018-12-06 14:40:29 +08:00
Jared.Tan 1b1a9bf216 Remove unused Debug Switches 2018-12-06 11:00:43 +08:00
吴晟 Wu Sheng 5f5be77601
Fix the alarm being started too many times. (#2003)
* Fix the alarm being started too many times.

* Remove unnecessary interface.

* Fix wrong status changed
2018-12-05 20:56:08 +08:00
吴晟 Wu Sheng bd879fd2d0
Fix mapping update bug in H2, MySQL, TiDB storage (#1999)
* Service inventory mapping  doesn't update right.

* Remove codes.
2018-12-04 16:52:46 +08:00
吴晟 Wu Sheng fc79182c31
Make endpoint alarm setting not active in default (#1998) 2018-12-03 22:58:23 +08:00
Gao Hongtao 1fa3091984 Istio/namespace (#1994)
* Update submodule skywalking-ui

* Fix #1925 Add namespace to service name
2018-12-03 16:25:03 +08:00
Jared.Tan dc393b1c12 refactoring PropertyPlaceholderHelper class. (#1989) 2018-12-03 11:50:59 +08:00
吴晟 Wu Sheng 93a036499e Make sure all mapping data loaded. (#1992) 2018-12-02 23:09:32 +08:00
吴晟 Wu Sheng 44a85a4f5a Support service instance metric. (#1988) 2018-12-01 22:57:28 +08:00
吴晟 Wu Sheng 2d8f390351 Make endpoint and instance alarm active (#1987)
* Support alarm in service instance and endpoint.

* Fix alarm default settings and document.

* Fix wrong default setting

* Make service instance and endpoint scopes available in alarm core.

* Fix alarm bug.
2018-12-01 14:18:31 +08:00
彭勇升 pengys 5777103a2b
Print exception stack into console or log files because of I found some NPE message in the log files. But I don't known where are they from without exception stack. (#1986) 2018-12-01 00:09:39 +08:00
Jared.Tan 728033ce85 update application.yml for namespace. (#1975)
* Correct namespace description
2018-11-30 13:57:32 +08:00
彭勇升 pengys 76d2fa34e0 Parse segment binary with version 1 prototype by default. (#1980) 2018-11-30 13:15:04 +08:00
吴晟 Wu Sheng 5577f67de7 Support backend sampling (#1977)
* Support sampling trace at server side and keep metric right.

* Add a trace sampling document

* Fix wrong default value.

* Fix document issue.

* Fix assemble issue.

* Fix wrong settings and doc.
2018-11-29 23:33:07 +08:00
Jared.Tan 9c642d50d8 fix https://github.com/apache/incubator-skywalking/pull/1921/. (#1974) 2018-11-29 12:39:58 +08:00
吴晟 Wu Sheng 215eab7428
Mysql style storage implementation (#1964)
Also fixed several bugs in this merge.
2018-11-28 22:59:02 +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
a198720 578fd70395 fixed bug: multiple formatIndexName in forceUpdate method (#1960) 2018-11-25 22:14:08 +08:00
彭勇升 pengys 983f7613b6 1. Close the output stream when switch to write next file. (#1958)
2. Close the input stream when switch to read next file.

#1665
2018-11-25 16:49:35 +08:00
Jared.Tan e697385b53 feat:support set config from system.envs. (#1919)
* support set config from system.envs.
2018-11-23 14:52:37 +08:00
彭勇升 pengys fd47fcb830 Remote clients selector error: / by zero (#1949)
* Fixed the bug of hash selector error cause of remote clients not build.

#1948

* Fixed a style check error.
2018-11-22 22:28:36 +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
彭勇升 pengys 0ae26f8e6e Fixed a bug which the segment record index does not delete the history data because of the saving time bucket is a second format date, but the query delete is minute format date. (#1943)
#1942
2018-11-21 13:08:08 +08:00
吴晟 Wu Sheng 6b35113536 Restore Zipkin receiver based on new core (#1932)
* Change some codes to make zipkin receiver works, not done yet.

* @adriancole Zipkin receiver is coming back again.

* Fix document and fix for Zipkin receiver.

* Fix some bugs.

* Fix register bug.

* Fix transfer bug for new backend core.
2018-11-18 22:46:27 +08:00
彭勇升 pengys afd6164335 OAP server testing module. (#1931)
* OAP server testing module.

#1930

* #Missing delete code.
2018-11-18 20:22:56 +08:00
彭勇升 pengys e727de96b2 Upgrade gRPC library. (#1928)
* Upgrade gRPC library.

* License update.
2018-11-18 13:11:52 +08:00
彭勇升 pengys cb492abea1 Synchronous configuration section. (#1927)
#1915
2018-11-18 08:41:27 +08:00
彭勇升 pengys a4b2cd4df2 Make ZooKeeper Version Compatibility clear in document (#1916)
* ZooKeeper Version Compatibility

* Update backend-cluster.md

Reorganize words. cc @peng-yongsheng

* Update application.yml

* Update application.yml
2018-11-16 15:39:21 +08:00
吴晟 Wu Sheng 7188c9c776
Support init mode and document with it. (#1900) 2018-11-15 21:50:00 +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
吴晟 Wu Sheng 6dd98b37bf Extend StorageEntity annotation to support source scope metadata (#1904)
* Add source attr into StorageEntity, and remove the this attr from InventoryType.

* Make RegisterLockInstaller works based on InventoryProcess registered info.
2018-11-12 14:19:16 +08:00
吴晟 Wu Sheng 83e0e5758f Make compare right. (#1899) 2018-11-09 22:23:50 +08:00
ScienJus 926911700e Fix logs with missing variables (#1884) 2018-11-06 18:32:02 +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
Jared.Tan 7537af0598 Fix the test case. (#1879) 2018-11-06 09:21:35 +08:00
吴晟 Wu Sheng 4399c66278
Make metric value to long to avoid too big integer issue. (#1876)
* Make metric value to long to avoid too big integer issue.

* Update protocol.

* Add a new filter to service number.
2018-11-03 23:25:28 +08:00
彭勇升 pengys 884dd8c59e Add detect point to be a part of unique key of the endpoint id. (#1874) 2018-11-03 00:55:00 +08:00
吴晟 Wu Sheng 76e4c5996d
avoid NPE. (#1869) 2018-11-02 15:00:33 +08:00
吴晟 Wu Sheng 75e4c67952 Endpoint register to client and server side based on detect point. (#1866) 2018-11-02 12:07:25 +08:00
彭勇升 pengys 6b1014c336 Fixed the collector OOM bug. (#1862)
* Fixed the bug of remote client not blocked when not received on complete message, it will carry the out of a memory exception.

* Sleep 10ms, not to sleep max 10ms.

* No more than 10 stream observers are allowed at the same time to send remote message. Otherwise block the remote queue.

* no message
2018-11-02 10:33:24 +08:00
吴晟 Wu Sheng 13f8825904 Bug fix (#1857)
* Fix mesh receiver doesn't update heartbeat.

* Fix bug of mesh heartbeat and rest receiver.

* Fix issue: opencensus is included in agent without shade. @tuohai666
2018-11-01 16:50:07 +08:00
吴晟 Wu Sheng 07e799e422 Fix bugs (#1854)
* Avoid service inventory object concurrency situation.

* Fix concurrency for minute persistence and others

* Fix document todo.

* Update license. Fix package with dirty agent plugin jar files.

* Fixed not combine error in persistence register worker.
2018-10-31 23:11:52 +08:00
Gao Hongtao 279c81e9fc
Fix k8s api connection leak (#1848)
* Update submodule skywalking-ui

* Fix k8s api bugs

* Fix api connection leak
2018-10-30 16:05:18 +08:00
吴晟 Wu Sheng dbf0444ec1
Fix NPE in protobuf and illegal query parameter. (#1847) 2018-10-30 12:17:17 +08:00
吴晟 Wu Sheng b6241b2ad2
Optimize collector settings and indicator (#1841)
* Support maxConcurrentCallsPerConnection and maxMessageSize in grpcServer

* Make percent percent is 1/10000

* Fix test cases.

* Make service instance indicator dispatch based on server side only.

* Set init data right in AlarmMeta.

* Make endpoint query based on server side only.
2018-10-29 20:45:44 +08:00
彭勇升 pengys 948ef6d1c4 Fixed the bugs of the OAP server running in cluster mode. (#1844)
* 1. Fixed the bug of the cluster node sync failure cause by curator instance cache is null.
2. Fixed the bug of the collection in remote data builder is not initialized.

* 1. Re-generate indicator.

* Fixed the bug of the collection in remote data builder is not initialized.

* Fixed the bug of the remote client created but not  initialize.
2018-10-29 17:31:30 +08:00
Gao Hongtao 90bb8c6c9d Fix k8s api bugs (#1842)
* Update submodule skywalking-ui

* Fix k8s api bugs
2018-10-29 16:02:20 +08:00
吴晟 Wu Sheng 974192ecd8 Keep service instance register based on UUID, but change name to a meaning string. (#1836) 2018-10-29 09:28: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
吴晟 Wu Sheng 2dd4f54957
Add some missing documents for v6 (#1830)
* Add more documents for v6.

* Make default setting consistent .
2018-10-28 21:45:58 +08:00
吴晟 Wu Sheng a9489b7067
H2 storage (#1712)
* H2 storage code skeleton.

* Add batch dao for H2.

* Fix wrong refactor.

* Add codes of other dao. No metric dao, wait for @peng-yongsheng new PR.

* Change license of distribution

* Add topology query in H2.

* Add more daos.

* Add some daos.

* Commit all H2 daos. Wait @peng-yongsheng to submit new IAggregationQueryDAO interface.

* Fix some CIs

* Fix wrong refactor, which causes h2 plugin failure.

* Fix all codes of H2 storage. :) and CI should pass. No test.

* Fix CI and typo

* Fix connection closed.

* Fix register bug

* no message

* Fixed service inventory register bug.

* Fix a compile issue.

* Sync change

* Reset es as default storage.

* Fix rat

* Fix H2 compile issue.

* Fix bugs for H2 storage.

* Fix bug in mesh.

* 1. Fix Thermodynamic query bug
2. Fix service inventory query bug
3. Fix missing traceid in trace query bug

* Fix query bug.

* Submit reverse caused by prev PR.

* Fix duplicate spans.

* Use H2 as default storage implementor.

* Fix bug in topology query.

* Fix CI

* Fix rat

* Fix two query in H2 storage.

* Fix H2 query

* Make release running in H2 mode and develop mode running is ES mode in default
2018-10-28 10:31:58 +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
Xin,Zhang 072ee39746 Fix issue that the oap package miss configure file (#1826) 2018-10-27 12:33:02 +08:00
彭勇升 pengys 9b3192fbac Set span layer into network inventory for distinguish what the network address is. MQ? DB? ... (#1824) 2018-10-26 22:57:05 +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 24e958fec0 1. Fixed the bug of inventory equals method. (#1814)
2. Fixed the bug of agent mock register order.
3. Fixed the bug of all heatmap.
2018-10-25 21:23:20 +08:00
彭勇升 pengys 6c92fc5484 1. Delete service component indicator. (#1809)
2. Make service relation and endpoint relation to record component id.
3. Delete service mapping indicator.
4. Make service inventory to record mapping service id.
5. Refactor global topology query and service topology query.
2018-10-25 11:19:31 +08:00
彭勇升 pengys 7bb577a4e9 Provide auto delete history data service. (#1797) 2018-10-22 20:20:29 +08:00
彭勇升 pengys 4063397988 Trigger service heartbeat when received service instance heartbeat. (#1785)
Fixed some meta query bugs.
2018-10-17 22:44:21 +08:00
彭勇升 pengys 064595eb81 Fixed the segment parse bug. Each use requires the creation of a new instance. (#1784) 2018-10-17 19:13:08 +08:00
彭勇升 pengys 4e99e896c2
Set instance attributes into return value. (#1783)
* Set instance attributes into return value.

* Delete unused code.
2018-10-17 18:40:10 +08:00
吴晟 Wu Sheng cb0b817ffb
Fix indicator merge failue. (#1782) 2018-10-17 16:42:03 +08:00
彭勇升 pengys a12e8badb8 Provide new getEndpointInfo service in query protocol. (#1780) 2018-10-17 12:19:33 +08:00
彭勇升 pengys b367c36db9
Fixed the endpoint topology bug. (#1778)
* Delete the client side endpoint relation indicator.
Fixed the endpoint topology bug.

* Fixed package failure bug.
2018-10-17 11:28:16 +08:00
彭勇升 pengys f78abfb28c Fixed the bug of service topology and global topology. (#1775) 2018-10-16 18:40:42 +08:00
彭勇升 pengys 72f2b1cd78 Provide rest protocol for register and trace receiver. (#1774) 2018-10-16 17:01:49 +08:00
彭勇升 pengys c467e5c723 Fixed JVM handler error. Forgot to use break in switch case code. (#1766) 2018-10-15 16:02:51 +08:00
彭勇升 pengys b426390b79
Support metrics downsampling. (#1765)
* Support metrics downsampling.

* Fixed a check style error.
2018-10-15 15:27:38 +08:00
彭勇升 pengys a81b9920cd Set the function attribute for indicator and use AVG function to be the default value. (#1757) 2018-10-12 12:29:22 +08:00
吴晟 Wu Sheng 474b25e768 Set assemble based on assemble setting files. (#1756) 2018-10-12 10:45:24 +08:00
彭勇升 pengys 966d5f54f1 Fixed the bugs, #1750, #1749, #1748, #1746, #1745 (#1755) 2018-10-11 19:37:57 +08:00
彭勇升 pengys 7c192b19d6
Alarm query and alarm persistence test. (#1753)
* Alarm query and alarm persistence test.

* Fixed the package error.
2018-10-11 15:55:04 +08:00
吴晟 Wu Sheng 3f8af95df0 Alarm silence init wrong. (#1752) 2018-10-11 10:38:52 +08:00
彭勇升 pengys ef63bc63cb The heartbeat implementation for all the scopes. (#1742) 2018-10-10 16:25:50 +08:00
吴晟 Wu Sheng b643190005 Add alarm timestamp. (#1741) 2018-10-10 14:15:24 +08:00
彭勇升 pengys 9e208d0484 Fixed the bug of the getValues method in metric query. (#1739) 2018-10-10 13:05:40 +08:00
彭勇升 pengys 1955e9d3cf Add alarm message persistent method. (#1738) 2018-10-09 23:32:56 +08:00
彭勇升 pengys 1a49f7053c Get the value column name from value column annotation manager. (#1737) 2018-10-09 21:58:26 +08:00
彭勇升 pengys a062fdae71 Fixed the bug from topology. (#1736)
* Fixed the bug from topology.

* no message
2018-10-09 20:33:04 +08:00
Gao Hongtao 3f975d2b83 Add isValue parameter to annotation (#1735) 2018-10-09 13:17:38 +08:00
吴晟 Wu Sheng 15d00ca08d
Fix wrong column name. (#1734) 2018-10-09 12:48:19 +08:00
彭勇升 pengys 065a384f10 Trace buffer test success. (#1733) 2018-10-08 23:17:15 +08:00
Gao Hongtao 46c55ebdb9 Fix linear data npe (#1731)
* Avoid null point exception
2018-10-08 22:37:22 +08:00
彭勇升 pengys 363b925ade Update the version of submodule named query protocol. (#1732) 2018-10-08 21:44:14 +08:00
吴晟 Wu Sheng 7ad619ac91
Prepare new doc for v6 (#1695)
* Replace v5 changes by a link to 5.x branch. New v6 changelog.

* Finish query doc and fix a missing field in alarm doc.

* Add link to official oal in alarm doc.

* Fix words.

* Fix some doc

* Update README.md

* Update README.md

* Update README.md

* Update README.md
2018-10-07 09:51:29 +08:00