Commit Graph

280 Commits

Author SHA1 Message Date
吴晟 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
于玉桔 43b216aa92 Support redisson plugin (#2083)
* plugin support redisson
2019-01-11 22:32:09 +08:00
XiaoFu ee6841fc13 Support Gson Plugin (#2090)
* Support Gson plugin
2019-01-03 23:51:22 +08:00
吴晟 Wu Sheng 95214aecf3
update version for next iteration. (#2084) 2018-12-23 09:14:14 +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
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 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
吴晟 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 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 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
chenpengfei d941892664 Add Undertow 2.x plugin (#1700)
* Add Undertow 2.x plugin

* Undertow: Interceptor method executeRootHandler in class Connectors

* Change version number to 6.0.0-alpha-SNAPSHOT
2018-09-26 09:30:42 +08:00
吴晟 Wu Sheng 7c619e3ce6
Fix elastic search plugin not work. (#1691) 2018-09-22 08:42:07 +08:00
彭勇升 pengys 99fdf02b8a Feature/trace query (#1685)
* Implementation of trace query.

* Implementation of trace query.
2018-09-20 17:31:57 +08:00
Wu Sheng bed801b5fe Remove graphQL protocol. Integrated in query module of oap backend. 2018-09-04 11:28:28 +08:00
dylan 69933eb614 5.x grpcbug (#1603)
* update 5.x grpc version form 1.10 to 1.14 and  Solve the resulting guava and log4j version conflicts

* Specify guava version 20.0

* update parrent pom guava version
2018-08-30 14:22:04 +08:00
Fatih ERDEM 47cba6c56c Moved hardcoded dependency versions to properties tag in pom.xml (#1583) 2018-08-24 10:18:48 +08:00
Adrian Cole 4b17685c11 Sync mvnw to 6.0 , provided by @adriancole 2018-08-22 22:50:50 +08:00
Wu Sheng b0b7de9442 Fix CI. And add a new instance ping service. 2018-08-16 16:30:03 +08:00
Wu Sheng 2aefdc01d5 Sync a fix. 2018-08-16 15:59:37 +08:00
Wu Sheng 550563aa8c Update protocol to 2.0 draft. 2018-08-16 15:54:09 +08:00
Wu Sheng 1ec420b0fd Remove collector.servers and collector.direct_servers, and add collector.backend_service setting. cc @ascrutae 2018-08-15 22:08:30 +08:00
Gao Hongtao fc3b440ae9 Add handler to parse istio telemetry data. 2018-08-15 20:42:24 +08:00
Wu Sheng cd3f213b2f Sync submodule. 2018-08-09 20:34:04 +08:00
Wu Sheng 114c2f7a42 Revert and delete istio metric proto. 2018-08-09 11:14:57 +08:00
XiaoFu da2189e598 [Agent] Add plugin for ActiveMQ 5.x (#1513)
* add activemq-plugin

* fix  update ActiveMQConsumerInstrumentation Enhance another class

* refacor ActiveMQConsumerInstrumentation code

* support both  topic and queue

* clear the code

* add UnitTest add fix bug

* fix obtain url  bug

* Refactor the ActiveMQProducerInstrumentation code

* fix bug

* fix ConstructorInterceptor BUG

* add Licensed

* Update application.yml

Restore configuration

* Restore configuration

* perfect test

* fix

* fix License

* fix  Project Files

* fix import class in instrumentation

* fix test case

* fix java doc

* fix  Trigger CI

* fix ActiveMQConsumerAndProducerConstructorInterceptorTest

* delete unit test

* fix

* fix

* fix  folder directory problem

* Delete ActiveMQConsumerInstrumentation.java
2018-08-04 20:13:00 +08:00
Gao Hongtao cc390fb2ae Add type and resolver classes associated to schema files 2018-08-01 23:49:33 +08:00
Wu Sheng cb69e968f1 Refactor the graphQL query protocol. @hanahmily @peng-yongsheng 2018-07-30 12:08:41 +08:00
Wu Sheng 282b59312b v6 query protocol. 2018-07-27 13:39:01 +08:00
Wu Sheng 34a6c4dcf0 Init some graphQL protocol 2018-07-26 20:04:37 +08:00
Wu Sheng 8c3fb27e0e Init codes of service mesh probe receiver. 2018-07-25 16:09:17 +08:00
Wu Sheng 8dafb61e4b Update protocol. 2018-07-18 16:29:40 +08:00
Wu Sheng 48348efe74 @lemon @ascrutae I change the proto file path for preparing 6.0, but didn't change .net namespace. But I think if you sync the protocol submodule, you still need some changes. 2018-07-17 14:20:58 +08:00
peng-yongsheng d2753037bb Upgrade version to 6.0.0 alpha. 2018-07-07 10:46:41 +08:00
彭勇升 pengys 621ed2c0e3 [Collector] Add application id into service metric for UI (#1406)
* #1405
Add application id into service metric for the page jump from overview page to service page.

* Fixed test case error.
2018-06-29 07:02:27 +08:00
彭勇升 pengys aa9a89685a Accept multi entry spans in collector analysis (#1372)
* #1206

1. Support list data type attribute in streaming data.
2. Support multiple service names in segment duration index.

* Fixed the conflict.

* #1206

Add TODO description to notify linjiaqi.

* #1206

Remove @NotNull
2018-06-21 10:52:39 +08:00
彭勇升 pengys 5f81c0068e #1176 (#1335)
Add application id and code into ServiceInfo.
2018-06-09 19:40:04 +08:00
彭勇升 pengys c2a425f55a
Filter non-active service name when UI query. (#1262)
* #1124

Add heart beat time into service name index to filter non-active service name.

* Filter service name by heart beat time when query service name count.

* #1124
1. Add application id to be a query condition of searchService method.
2. Filter service name by given time which calculated by the minute metric TTL setting. ( CurrentTimeStamp - minuteMetricTTL )

* Fixed the auto test failure.

#1124
2018-06-09 16:33:05 +08:00
Lei Zhiyuan c4766ecbf2 Add sofa rpc plugin integration (#1210)
* sofa rpc integration

* remove unused class and method,add component defination

* only support after sofa rpc 5.4.0

* set sofarpc componentId be 32

* Add document of component library settings and incuating features abstract. (#1185)

* sofa rpc integration

* Update UI licenses (#1189)

* Update UI licenses for beta version

* Update FAQ doc (#1184)

* update faq doc

* update faq

* update faq

* Update readme for beta release. (#1191)

* New english readme.

* New chinese readme.

* Fix #1186 Webapp read timeout config (#1192)

* Updat ui (#1197)

* Change the intercept point of block call way (#1190)

* Change the buired point of block call way

* Support future way and change the operation name of span

* Update screenshot for new release. (#1209)

* remove unused class and method,add component defination

* only support after sofa rpc 5.4.0

* set sofarpc componentId be 32

* sofa rpc integration

* remove unused class and method,add component defination

* only support after sofa rpc 5.4.0

* set sofarpc componentId be 32

* sofa rpc integration

* remove unused class and method,add component defination

* change parent pom version

* remove unused dependency
2018-06-03 19:38:50 +08:00
Xin,Zhang f7cc129fa2 Change component definitions (#1266) 2018-05-27 11:57:00 +08:00
Ajanthan 58ede1d0b8 Fixing #1231. Adding order and status to trace query. (#1255)
* Fixing #1231. Adding order and status to trace query.

* Fixing 1231. Using enum for traceState and queryOrder

* Incorporating code review suggestions
2018-05-24 14:07:38 +08:00
吴晟 Wu Sheng a6e04c97ec
Update version to beta2 for next iteration. (#1233) 2018-05-16 21:21:30 +08:00
Gao Hongtao d28cc64f79 Refactor tps to cpm (#1105)
* Refactor tps to cpm

* Change the implementation for new graphql protocol.

* Add aggregate column named duration in GC metric table.

* getGCTrend query finished.

* Change between seconds to between minutes.
2018-04-24 11:40:49 +08:00
吴晟 Wu Sheng 1e57d48d94 GraphQL for Thermodynamic in overview page. (#1068)
* Provide graphQL for Thermodynamic in overview page.

* Finish the Thermodynamic.

* `nodes` should not be null.

* Add initialized java bean for graphql protocol.

* Add license head.

* Fixed bean definition fault.
2018-04-23 09:31:39 +08:00
吴晟 Wu Sheng bd1286aac4 Refactor ServerTypeDefine and ComponentsDefine to be more extendable (#1081)
* Refactor the old ComponentDefine and ComponentsDefine to be based on file for better extenable.

* Support don't uplink componentId, but componentName in segment.

* Fix CI.

* Move component id exchange logic from SpanDecorator to SpanIdExchanger.

* Fixed the compile error cause of class construct changes.
2018-04-17 04:32:10 -05:00
彭勇升 pengys eff39b0f1c Rename field name to osName in type AppServerInfo. (#1006)
#998
2018-03-30 22:44:18 +08:00
吴晟 Wu Sheng e13ff79326 Sync to fix release check (#982)
Fix IPMC checks for releasing.
2018-03-24 17:11:04 +08:00
吴晟 Wu Sheng d8d28a0b33
Support TLS of gRPC between agent and server. (#968)
* Finish the prototype of TLS of gRPC between agent and server.

* Fix for rat check.

* Update GRPCChannelManager.java

* Update AgentModuleGRPCProvider.java

* Upgrade netty version (#971)

* Make sure end user can't start gRPC server with and without SSL in the same port.
2018-03-22 06:59:17 +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
peng-yongsheng 24468b1eea Add the segmentId into BasicTrace which belongs to trace query graphql protocol. 2018-03-05 21:00:24 +08:00
peng-yongsheng 08d26eca09 Change the traceId type to be collection in trace graphql protocol. 2018-03-01 17:57:01 +08:00
peng-yongsheng c1fedb02b5 1. Changed the attribute name from TPS to callsPerSec.
2. Calculate the callsPerSec.
2018-02-28 20:24:24 +08:00
peng-yongsheng 62d5148295 1. Changed the attribute name from TPS to callsPerSec.
2. Calculate the callsPerSec.
2018-02-28 11:44:58 +08:00
peng-yongsheng 2caa29a0dc 1. Changed the attribute name from TPS to callsPerSec.
2. Calculate the callsPerSec.
2018-02-28 10:20:06 +08:00
peng-yongsheng 2e9f07c0a8 Merge remote-tracking branch 'upstream/master' into feature/getClusterTopology 2018-02-27 21:11:08 +08:00
peng-yongsheng 1cca13df32 Change the attribute name from responseTimePerSec to avgResponseTime. 2018-02-27 15:56:35 +08:00
吴晟 Wu Sheng acae617047
Merge branch 'master' into feature/support-hystrix-plugin 2018-02-27 06:21:27 +08: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
ascrutae fa99652d5b [Agent] Support hystrix plugin 2018-02-25 21:02:38 +08:00
wu-sheng 8a1f4434d7 Update submodule. 2018-02-23 16:51:14 +08:00
Wu Sheng 3b3a20e251 Add submodule links for protocol 2018-02-23 11:46:30 +08:00
peng-yongsheng 4836883d75 Change the data type of sla and apdex attributes from Float to Int. 2018-02-13 23:52:00 +08:00
李运涛 liyuntao e233b7becc
Merge branch 'master' into servicecomb 2018-02-10 20:49:43 -06:00
peng-yongsheng da0a8b8546 Provide the getServerThroughput query. 2018-02-10 10:46:15 +08:00
李运涛 liyuntao cbb2eca248
Merge branch 'master' into servicecomb 2018-02-09 03:20:24 -06:00
wu-sheng a736c01a81 Fix protocol mistakes. 2018-02-09 17:09:48 +08:00
hanahmily 87ee4f2f77 Merge remote-tracking branch 'origin/feature/graphql-ui' into feature/graphql-ui 2018-02-09 14:19:01 +08:00
hanahmily af6d91dfba Refactor alarm schema 2018-02-09 14:18:26 +08:00
peng-yongsheng 1bc0d84532 Provide the getTopNServerThroughput query. 2018-02-09 14:12:04 +08:00
李运涛 liyuntao 6793deb0e1
Merge branch 'master' into servicecomb 2018-02-08 20:13:24 -06:00
peng-yongsheng 425324ee46 Provide the overview/getTopNSlowService query. 2018-02-08 19:02:53 +08:00
peng-yongsheng 7b2cb2e410 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui 2018-02-08 18:17:07 +08:00
peng-yongsheng a81719786e Provide the getSlowService query. 2018-02-08 18:16:58 +08:00
Gao Hongtao 87ebf6598c
Merge branch 'master' into feature/graphql-ui 2018-02-08 00:51:58 -06:00
peng-yongsheng 90c820d1d8 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui 2018-02-07 18:11:12 +08:00
peng-yongsheng 62477a5318 Provide the getServiceTopology query. 2018-02-07 18:10:17 +08:00
wu-sheng ca11058f8e Add a new field for operation register. 2018-02-07 15:58:05 +08:00
吴晟 Wu Sheng 505f6a0ec3
Merge branch 'master' into feature/graphql-ui 2018-02-06 21:28:19 +08:00
李运涛 liyuntao 49a99a5353
Merge branch 'master' into servicecomb 2018-02-05 20:12:43 -06:00
peng-yongsheng b513024a85 Provide the searchService query. 2018-02-05 10:26:54 +08:00
peng-yongsheng 77f615a8ae Provide the queryBasicTraces query. 2018-02-04 22:16:52 +08:00
Gao Hongtao 0851b5612e
Update protocol 2018-02-02 17:18:45 +08:00
李运涛 liyuntao a3985d7b63
Merge branch 'master' into servicecomb 2018-01-30 10:04:27 +08:00
peng-yongsheng f177ebd909 Provide the search server query, but only completed es storage and non tps. 2018-01-27 09:13:48 +08:00
peng-yongsheng 1510f7059d Change the data type from int to long which attributes named responseTimePerSec and callsPerSec. 2018-01-26 08:55:55 +08:00
peng-yongsheng a25e353e2d Implement the method named getAllApplication in application layer graphql protocol. 2018-01-24 00:12:27 +08:00
ascrutae 22ead46dcc [Agent] Support kafka framework 2018-01-22 19:56:22 +08:00
lytscu 1b499f0dc0 Add [Agent] ServiceComb Plugin #437 2018-01-22 15:56:25 +08:00
peng-yongsheng 06f675ac9b Changed dependency graphql-java from 6.0 to 7.0. 2018-01-20 22:21:56 +08:00
吴晟 Wu Sheng 5175e9d54b
Merge branch 'master' into alter-graphql-log-time 2018-01-18 11:20:31 +08:00
wu-sheng cef1ca8410 Time should be Long 2018-01-18 11:14:10 +08:00
wu-sheng ed30481696 Add a missing field. 2018-01-17 08:20:50 +08:00
wu-sheng b482463f42 Add parentSpanId for Span 2018-01-16 15:53:09 +08:00
李运涛 liyuntao bcac37b534
Merge branch 'master' into develop 2018-01-16 11:02:20 +08:00
吴晟 Wu Sheng 4f2c781270
Merge branch 'master' into feature/graphql 2018-01-16 09:26:04 +08:00
peng-yongsheng b525e1e0e2 Lowercase the IPv4 and IPv6 attributes, because of there have a java style check that regulate the first letter must be lowercase. 2018-01-16 09:18:56 +08:00
lytscu 4a0a210348 Modify ComponentsDefine.java 2018-01-15 19:19:49 +08:00
lytscu f58ecdb929 Merge remote-tracking branch 'upstream/master' into develop
y
2018-01-15 15:05:05 +08:00
lytscu c8ca51a547 [Agent] Provide plugins for Apache httpcomponent AsyncClient 4.1 #588 2018-01-15 15:00:32 +08:00
wusheng 691fb78bc9 Add `isAlarm` for ApplicationNode. 2018-01-13 22:38:25 +08:00
wusheng 8f260f8eb1 Update trace type. 2018-01-12 23:28:21 +08:00
wu-sheng 41d7b5cb54 Add a query service 2018-01-12 14:14:12 +08:00
wu-sheng 225903a92a Fix missing parts. 2018-01-12 09:48:49 +08:00
wusheng eaef6f106c Fix a compile issue 2018-01-11 18:52:45 +08:00
wusheng 50e09852db add constant values 2018-01-11 16:19:48 +08:00
wusheng b2706cf24c Make the user node as an extend of Node, rather then an attribute of ApplicationNode. 2018-01-11 16:13:19 +08:00
wu-sheng e7a5fd6920 no message 2018-01-10 16:39:40 +08:00
wu-sheng 06b9f5f692 1. Add set/get `DataTTLConfigs` and set/get `AlarmThreshold` mutation service.
2. All empty arrays are represented by `[]`, not `null`.
3. Add Mutation type, represents for all modification operations.
4. Support **Pagination** in some query.
5. Seperate alarm into to title and content
2018-01-10 16:38:22 +08:00
wu-sheng d730e174f6 Make the nodes of Topology nullable. And elements in it are not null. 2018-01-09 12:11:56 +08:00
吴晟 Wu Sheng dfeeeab108
Merge branch 'master' into adjust-network-proto 2018-01-05 07:56:46 +08:00
wusheng ef284dc6d5 Make the applicationCodeRegister only for single code. 2018-01-04 23:07:49 +08:00
wusheng e7b72eb2f9 catch up the TODO list. 2018-01-04 21:50:43 +08:00
wu-sheng 79ed3bff48 Add incoming attr for application node. 2018-01-04 14:25:26 +08:00
wu-sheng 02755e2af2 Remove comment. 2018-01-02 17:36:38 +08:00
wu-sheng 498e8a52cc Isolate NetworkAddressRegisterService from ApplicationRegisterService 2018-01-02 16:51:42 +08:00
wusheng 20973f5a28 Announce the version policy 2017-12-30 22:30:19 +08:00
wusheng 6b68a2cb6d * `DurationItem` and `ThroughputItem` have been removed. Service defines must be explicit and clear.
*  In server layer, AppServerInfo type represents the basic server info and related metrics
*  In service layer, ServiceInfo type represents the basic service info and related metrics
*  `getServiceSlowTrace` service has been provided by `queryBasicTraces` service. All trace query should be included in that.
2017-12-30 17:59:20 +08:00
wu-sheng d3b357a447 Finish all services and readme. 2017-12-28 16:16:12 +08:00
gaohongtao 6d96cf6bf2 Finish all protocol 2017-12-27 12:41:28 +08:00
wu-sheng d3ab94bee3 Add server query. 2017-12-27 11:05:42 +08:00
wu-sheng 5d801fbd02 Add application layer protocol and some common types. 2017-12-27 09:59:40 +08:00
gaohongtao e771350812 Remove spring dependency 2017-12-27 08:49:14 +08:00
gaohongtao 84caf87f36 Add graphiql servlet 2017-12-26 22:46:04 +08:00
wu-sheng 0af4f1737a Add the missing getApplicationBrief query. 2017-12-26 16:13:32 +08:00
wu-sheng 4545e431f0 Add query arguments. 2017-12-26 15:28:34 +08:00
wu-sheng 131bbb965f Add two services. 2017-12-26 11:47:55 +08:00
wu-sheng d07a91353c Adjust the services and add comments. 2017-12-26 10:50:05 +08:00
gaohongtao 8ae1b4213b Add application topology query type 2017-12-25 22:38:28 +08:00
wusheng 91922544d4 Fix a module name. 2017-12-25 22:04:17 +08:00
wu-sheng 48f0f22de6 Init ui-protocol. 2017-12-25 15:33:12 +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