[GitHub] coveralls commented on issue #771: Add [Agent] ServiceComb Plugin #437
coveralls commented on issue #771: Add [Agent] ServiceComb Plugin #437 URL: https://github.com/apache/incubator-skywalking/pull/771#issuecomment-359352269 [](https://coveralls.io/builds/15480461) Coverage increased (+0.2%) to 19.193% when pulling **6e56c7fdb403ce418ad310b010cb1e268213c93c on lytscu:servicecomb** into **cb2ea6b026606d2b223304a04737cb027e542fb1 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] peng-yongsheng opened a new pull request #810: Provide the loadAlarmList query.
peng-yongsheng opened a new pull request #810: Provide the loadAlarmList query.
URL: https://github.com/apache/incubator-skywalking/pull/810
H2 DAO's implementation is empty.
INPUT
```
{
loadAlarmList(keyword: "", alarmType: APPLICATION, duration: {start:
"2017-01", end: "2018-02", step: MONTH}, paging: {pageNum: 0, pageSize: 10}) {
total
items {
id
title
content
startTime
alarmType
causeType
}
}
}
```
OUTPUT
```
{
"data": {
"loadAlarmList": {
"total": 2,
"items": [
{
"id": "1_1_2",
"title": "",
"content": "",
"startTime": "2017-08-04 22:48",
"alarmType": "APPLICATION",
"causeType": "SLOW_RESPONSE"
},
{
"id": "1_1_-1",
"title": "",
"content": "",
"startTime": "2017-08-04 22:48",
"alarmType": "APPLICATION",
"causeType": "SLOW_RESPONSE"
}
]
}
}
}
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] peng-yongsheng commented on issue #106: alarm/loadAlarmList
peng-yongsheng commented on issue #106: alarm/loadAlarmList
URL:
https://github.com/apache/incubator-skywalking-ui/issues/106#issuecomment-364855864
H2 DAO's implementation is empty.
INPUT
```
{
loadAlarmList(keyword: "", alarmType: APPLICATION, duration: {start:
"2017-01", end: "2018-02", step: MONTH}, paging: {pageNum: 0, pageSize: 10}) {
total
items {
id
title
content
startTime
alarmType
causeType
}
}
}
```
OUTPUT
```
{
"data": {
"loadAlarmList": {
"total": 2,
"items": [
{
"id": "1_1_2",
"title": "",
"content": "",
"startTime": "2017-08-04 22:48",
"alarmType": "APPLICATION",
"causeType": "SLOW_RESPONSE"
},
{
"id": "1_1_-1",
"title": "",
"content": "",
"startTime": "2017-08-04 22:48",
"alarmType": "APPLICATION",
"causeType": "SLOW_RESPONSE"
}
]
}
}
}
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] coveralls commented on issue #810: Provide the loadAlarmList query.
coveralls commented on issue #810: Provide the loadAlarmList query. URL: https://github.com/apache/incubator-skywalking/pull/810#issuecomment-364858044 [](https://coveralls.io/builds/15480725) Coverage increased (+0.02%) to 19.058% when pulling **47e1db5011ad39cd8574d355423280115b3f0d56 on peng-yongsheng:feature/loadAlarmList** into **cb2ea6b026606d2b223304a04737cb027e542fb1 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed pull request #810: Provide the loadAlarmList query.
wu-sheng closed pull request #810: Provide the loadAlarmList query.
URL: https://github.com/apache/incubator-skywalking/pull/810
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java
b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java
index 9597231b3..3b3d64edb 100644
---
a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java
+++
b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java
@@ -18,8 +18,10 @@
package org.apache.skywalking.apm.collector.core.util;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
/**
* @author peng-yongsheng
@@ -59,6 +61,13 @@ public long getDayTimeBucket(long time) {
return Long.valueOf(timeStr);
}
+public String formatMinuteTimeBucket(long minuteTimeBucket) throws
ParseException {
+SimpleDateFormat minuteDateFormat = new
SimpleDateFormat("MMddHHmm");
+Date date = minuteDateFormat.parse(String.valueOf(minuteTimeBucket));
+SimpleDateFormat parsedMinuteDateFormat = new
SimpleDateFormat("-MM-dd HH:mm");
+return parsedMinuteDateFormat.format(date);
+}
+
public long minuteToHour(long minuteBucket) {
return minuteBucket / 100;
}
@@ -86,8 +95,4 @@ public long secondToDay(long secondBucket) {
public long secondToMonth(long secondBucket) {
return secondBucket / 100 / 100 / 100 / 100;
}
-
-public enum TimeBucketType {
-SECOND, MINUTE, HOUR, DAY, MONTH
-}
}
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
index daf060ca5..425a71614 100644
---
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
+++
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
@@ -105,6 +105,7 @@
import
org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceHourMetricPersistenceDAO;
import
org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceMinuteMetricPersistenceDAO;
import
org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceMonthMetricPersistenceDAO;
+import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationAlarmUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationComponentUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationMappingUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationMetricUIDAO;
@@ -112,6 +113,7 @@
import org.apache.skywalking.apm.collector.storage.dao.ui.ICpuMetricUIDAO;
import org.apache.skywalking.apm.collector.storage.dao.ui.IGCMetricUIDAO;
import org.apache.skywalking.apm.collector.storage.dao.ui.IGlobalTraceUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IInstanceAlarmUIDAO;
import org.apache.skywalking.apm.collector.storage.dao.ui.IInstanceMetricUIDAO;
import org.apache.skywalking.apm.collector.storage.dao.ui.IInstanceUIDAO;
import org.apache.skywalking.apm.collector.storage.dao.ui.IMemoryMetricUIDAO;
@@ -119,6 +121,7 @@
import org.apache.skywalking.apm.collector.storage.dao.ui.INetworkAddressUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentDurationUIDAO;
import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceAlarmUIDAO;
import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceMetricUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IServiceNameServiceUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IServiceReferenceMetricUIDAO;
@@ -257,6 +260,10 @@ private void addUiDAO(List classes) {
classes.add(ISegmentDurationUIDAO.class);
classes.add(ISegmentUIDAO.class);
classes.add(IServiceReferenceMetricUIDAO.class);
+
+classes.add(IApplicationAlarmUIDAO.class);
+classes.add(IInstanceAlarmUIDAO.class);
+classes.add(IServiceAlarmUIDAO.class);
}
private void addAlarmDAO(List classes) {
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/jav
[GitHub] lytscu commented on issue #771: Add [Agent] ServiceComb Plugin #437
lytscu commented on issue #771: Add [Agent] ServiceComb Plugin #437 URL: https://github.com/apache/incubator-skywalking/pull/771#issuecomment-364864054 https://github.com/SkywalkingTest/agent-integration-test-report/blob/master/2018/2/lytscu/testReport-master-2018-02-12-16-49.md This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #771: Add [Agent] ServiceComb Plugin #437
coveralls commented on issue #771: Add [Agent] ServiceComb Plugin #437 URL: https://github.com/apache/incubator-skywalking/pull/771#issuecomment-359352269 [](https://coveralls.io/builds/15481107) Coverage increased (+0.2%) to 19.217% when pulling **e4e694021b3459a5681b9f03b414b8127886374a on lytscu:servicecomb** into **7cbed1bb62ea4875877b7957782b7ca8b67b21c3 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #771: Add [Agent] ServiceComb Plugin #437
wu-sheng commented on issue #771: Add [Agent] ServiceComb Plugin #437 URL: https://github.com/apache/incubator-skywalking/pull/771#issuecomment-364869452 @lytscu @ascrutae Seem like, ServiceComb 0.1.0 works out magically. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #771: Add [Agent] ServiceComb Plugin #437
wu-sheng commented on issue #771: Add [Agent] ServiceComb Plugin #437 URL: https://github.com/apache/incubator-skywalking/pull/771#issuecomment-364871797 @lytscu Please add the `serviceComb` to supported list. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed pull request #771: Add [Agent] ServiceComb Plugin #437
wu-sheng closed pull request #771: Add [Agent] ServiceComb Plugin #437
URL: https://github.com/apache/incubator-skywalking/pull/771
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java
index 2810c2ab1..71e2ae346 100644
---
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java
+++
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java
@@ -32,7 +32,7 @@
private ServerType[] serverTypes;
private ServerTypeDefine() {
-this.serverTypes = new ServerType[28];
+this.serverTypes = new ServerType[29];
this.serverTypeNames = new String[11];
addServerType(new ServerType(ComponentsDefine.TOMCAT.getId(),
Const.NONE, Const.EMPTY_STRING));
addServerType(new ServerType(ComponentsDefine.HTTPCLIENT.getId(),
Const.NONE, Const.EMPTY_STRING));
@@ -61,6 +61,7 @@ private ServerTypeDefine() {
addServerType(new ServerType(ComponentsDefine.ROCKET_MQ.getId(), 9,
ComponentsDefine.ROCKET_MQ.getName()));
addServerType(new
ServerType(ComponentsDefine.HTTP_ASYNC_CLIENT.getId(), Const.NONE,
Const.EMPTY_STRING));
addServerType(new ServerType(ComponentsDefine.KAFKA.getId(), 10,
ComponentsDefine.KAFKA.getName()));
+addServerType(new ServerType(ComponentsDefine.SERVICECOMB.getId(),
Const.NONE, ComponentsDefine.SERVICECOMB.getName()));
}
public static ServerTypeDefine getInstance() {
diff --git
a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
index 220b1062c..fa6e9c24e 100644
---
a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
+++
b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
@@ -79,6 +79,8 @@
public static final OfficialComponent HTTP_ASYNC_CLIENT = new
OfficialComponent(26, "httpasyncclient");
public static final OfficialComponent KAFKA = new OfficialComponent(27,
"Kafka");
+
+public static final OfficialComponent SERVICECOMB = new
OfficialComponent(28, "ServiceComb");
private static ComponentsDefine INSTANCE = new ComponentsDefine();
@@ -89,7 +91,7 @@ public static ComponentsDefine getInstance() {
}
public ComponentsDefine() {
-components = new String[28];
+components = new String[29];
addComponent(TOMCAT);
addComponent(HTTPCLIENT);
addComponent(DUBBO);
@@ -117,6 +119,7 @@ public ComponentsDefine() {
addComponent(ROCKET_MQ);
addComponent(HTTP_ASYNC_CLIENT);
addComponent(KAFKA);
+addComponent(SERVICECOMB);
}
private void addComponent(OfficialComponent component) {
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/pom.xml
index a4acaca4b..be0a02e80 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/pom.xml
@@ -54,6 +54,7 @@
mongodb-2.x-plugin
httpasyncclient-4.x-plugin
kafka-v1-plugin
+servicecomb-plugin
pom
diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
new file mode 100644
index 0..1668c7020
--- /dev/null
+++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
@@ -0,0 +1,26 @@
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+apm-sdk-plugin
+org.apache.skywalking
+5.0.0-alpha
+
+4.0.0
+
+servicecomb-plugin
+
+
+servicecomb-java-chassis-0.x-plugin
+
+pom
+
+apm-sdk-plugin
+http://maven.apache.org
+
+
+UTF-8
+/..
+
+
\ No newline at end of file
diff --git
a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml
new file mode 100644
index 0..bdac6da88
--- /dev/null
+++
[GitHub] wu-sheng commented on issue #771: Add [Agent] ServiceComb Plugin #437
wu-sheng commented on issue #771: Add [Agent] ServiceComb Plugin #437 URL: https://github.com/apache/incubator-skywalking/pull/771#issuecomment-364871915 FYI @WillemJiang , the plugin is checked by our automatic mechanism and merged. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng opened a new pull request #811: Update Supported-list for a new supported framework
wu-sheng opened a new pull request #811: Update Supported-list for a new supported framework URL: https://github.com/apache/incubator-skywalking/pull/811 Update document based on #771 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix - [x] New feature provided - [ ] Improve performance - Related issues #771 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ascrutae commented on issue #811: Update Supported-list for a new supported framework
ascrutae commented on issue #811: Update Supported-list for a new supported framework URL: https://github.com/apache/incubator-skywalking/pull/811#issuecomment-364889405 @WillemJiang Here is the test report: https://github.com/SkywalkingTest/agent-integration-test-report/blob/master/2018/2/lytscu/testReport-master-2018-02-12-16-49.md This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #811: Update Supported-list for a new supported framework
wu-sheng commented on issue #811: Update Supported-list for a new supported framework URL: https://github.com/apache/incubator-skywalking/pull/811#issuecomment-364890586 @WillemJiang Maybe you want to recheck the plugin by your own team. But still, the master branch doesn't still work out with UI. Hard to understand for people didn't work on this project. Sorry. If you think our automatic test is good enough, you can approve this pr. Anyway, I will ping you in gitter, as soon as our UI is back again. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #811: Update Supported-list for a new supported framework
coveralls commented on issue #811: Update Supported-list for a new supported framework URL: https://github.com/apache/incubator-skywalking/pull/811#issuecomment-364891342 [](https://coveralls.io/builds/15482350) Coverage remained the same at 19.217% when pulling **cf04f034ace50f58c4d63778f949c648d8bafcc6 on update-supported-list** into **e53b50e539605a80a22e1ea636459856911bfccf on master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed issue #437: [Agent] ServiceComb Plugin
wu-sheng closed issue #437: [Agent] ServiceComb Plugin URL: https://github.com/apache/incubator-skywalking/issues/437 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #437: [Agent] ServiceComb Plugin
wu-sheng commented on issue #437: [Agent] ServiceComb Plugin URL: https://github.com/apache/incubator-skywalking/issues/437#issuecomment-364894437 Closing. #771 has been merged. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed pull request #811: Update Supported-list for a new supported framework
wu-sheng closed pull request #811: Update Supported-list for a new supported framework URL: https://github.com/apache/incubator-skywalking/pull/811 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] peng-yongsheng opened a new pull request #812: Provide the getAlarmTrend query.
peng-yongsheng opened a new pull request #812: Provide the getAlarmTrend query.
URL: https://github.com/apache/incubator-skywalking/pull/812
H2 DAO's implementation is empty.
INPUT
```
{
getAlarmTrend(duration: {start: "2017-01", end: "2018-02", step: MONTH}) {
numOfAlarmRate
}
}
```
OUTPUT
```
{
"data": {
"getAlarmTrend": {
"numOfAlarmRate": [
]
}
}
}
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] peng-yongsheng commented on issue #98: overview/getAlarmTrend
peng-yongsheng commented on issue #98: overview/getAlarmTrend
URL:
https://github.com/apache/incubator-skywalking-ui/issues/98#issuecomment-364916595
H2 DAO's implementation is empty.
INPUT
```
{
getAlarmTrend(duration: {start: "2017-01", end: "2018-02", step: MONTH}) {
numOfAlarmRate
}
}
```
OUTPUT
```
{
"data": {
"getAlarmTrend": {
"numOfAlarmRate": [
]
}
}
}
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] coveralls commented on issue #812: Provide the getAlarmTrend query.
coveralls commented on issue #812: Provide the getAlarmTrend query. URL: https://github.com/apache/incubator-skywalking/pull/812#issuecomment-364919026 [](https://coveralls.io/builds/15483881) Coverage decreased (-0.01%) to 19.204% when pulling **cc0f6f5ee92f7e3d62286375944af18cbe18c101 on peng-yongsheng:feature/getAlarmTrend** into **1bef96db1cf630c0bde9839654edbad393a41d1f on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #812: Provide the getAlarmTrend query.
coveralls commented on issue #812: Provide the getAlarmTrend query. URL: https://github.com/apache/incubator-skywalking/pull/812#issuecomment-364919026 [](https://coveralls.io/builds/15484130) Coverage decreased (-0.01%) to 19.204% when pulling **fb1c99df47555f9def521c1f59d1221cf507f091 on peng-yongsheng:feature/getAlarmTrend** into **1bef96db1cf630c0bde9839654edbad393a41d1f on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] peng-yongsheng closed pull request #812: Provide the getAlarmTrend query.
peng-yongsheng closed pull request #812: Provide the getAlarmTrend query.
URL: https://github.com/apache/incubator-skywalking/pull/812
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
index 425a71614..714255a06 100644
---
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
+++
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
@@ -105,6 +105,7 @@
import
org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceHourMetricPersistenceDAO;
import
org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceMinuteMetricPersistenceDAO;
import
org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceMonthMetricPersistenceDAO;
+import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationAlarmListUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationAlarmUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationComponentUIDAO;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationMappingUIDAO;
@@ -264,6 +265,7 @@ private void addUiDAO(List classes) {
classes.add(IApplicationAlarmUIDAO.class);
classes.add(IInstanceAlarmUIDAO.class);
classes.add(IServiceAlarmUIDAO.class);
+classes.add(IApplicationAlarmListUIDAO.class);
}
private void addAlarmDAO(List classes) {
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IApplicationAlarmListUIDAO.java
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IApplicationAlarmListUIDAO.java
new file mode 100644
index 0..3cd92773a
--- /dev/null
+++
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IApplicationAlarmListUIDAO.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.collector.storage.dao.ui;
+
+import java.util.List;
+import org.apache.skywalking.apm.collector.storage.base.dao.DAO;
+import org.apache.skywalking.apm.collector.storage.ui.common.Step;
+
+/**
+ * @author peng-yongsheng
+ */
+public interface IApplicationAlarmListUIDAO extends DAO {
+
+List getAlarmedApplicationNum(Step step, long start, long end);
+}
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/AlarmTrend.java
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/AlarmTrend.java
index 025d27df8..d040f30e0 100644
---
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/AlarmTrend.java
+++
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/AlarmTrend.java
@@ -18,11 +18,25 @@
package org.apache.skywalking.apm.collector.storage.ui.overview;
+import java.util.LinkedList;
import java.util.List;
/**
* @author peng-yongsheng
*/
public class AlarmTrend {
-public List numOfAlarmRate;
+
+private List numOfAlarmRate;
+
+public AlarmTrend() {
+this.numOfAlarmRate = new LinkedList<>();
+}
+
+public List getNumOfAlarmRate() {
+return numOfAlarmRate;
+}
+
+public void setNumOfAlarmRate(List numOfAlarmRate) {
+thi
[GitHub] fredsjones opened a new issue #813: Currently used version of logback contains a security vulnerability
fredsjones opened a new issue #813: Currently used version of logback contains a security vulnerability URL: https://github.com/apache/incubator-skywalking/issues/813 Please answer these questions before submitting your issue. - Why do you submit this issue? - [ ] Question or discussion - [ ] Bug - [ ] Requirement - [X] Feature or performance improvement ___ ### Requirement or improvement In our exploration of your project we found that it is currently using version 1.1.7 of logback which is vulnerable to Arbitrary Code Execution. A configuration can be turned on to allow remote logging through interfaces that accept untrusted serialized data. Authenticated attackers on the adjacent network can exploit this vulnerability to run arbitrary code through the deserialization of custom gadget chains. Recommendation: Upgrade the version of logback in the incubator-skywalking/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml to version 1.2 or higher. For additional details on this vulnerability you can visit the following websites: Snyk: https://snyk.io/vuln/SNYK-JAVA-CHQOSLOGBACK-30208 Common Vulnerabilities and Exposures (CVE): https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5929 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] hanahmily commented on issue #98: overview/getAlarmTrend
hanahmily commented on issue #98: overview/getAlarmTrend URL: https://github.com/apache/incubator-skywalking-ui/issues/98#issuecomment-365124612 The result of test is the same as above. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] hanahmily commented on issue #106: alarm/loadAlarmList
hanahmily commented on issue #106: alarm/loadAlarmList URL: https://github.com/apache/incubator-skywalking-ui/issues/106#issuecomment-365126834 @peng-yongsheng As described in the [common.graphqls](https://github.com/apache/incubator-skywalking/blob/master/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/common.graphqls) , the "pageNum" starts in **1**, not **0** This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] hanahmily commented on issue #101: overview/getConjecturalApps
hanahmily commented on issue #101: overview/getConjecturalApps
URL:
https://github.com/apache/incubator-skywalking-ui/issues/101#issuecomment-365127560
## Input
```graphql
{
"variables": {
"duration": {
"start": "2017-02",
"end": "2018-02",
"step": "MONTH"
}
},
"query": "
query Dashboard($duration: Duration!) {
getConjecturalApps(duration: $duration) {
apps {
name
num
}
}
}
"
}
```
## Output
```graphql
"getConjecturalApps": {
"apps": [
{
"name": "MongoDB",
"num": 1
}
]
}
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] peng-yongsheng opened a new pull request #814: Mock trace segment data which sniffer from Dubbo framework.
peng-yongsheng opened a new pull request #814: Mock trace segment data which
sniffer from Dubbo framework.
URL: https://github.com/apache/incubator-skywalking/pull/814
### The trace segment start time and end time include those duration:
TPS: 2
"2017-01-01T00:02:01.001", "2017-01-01T00:05:01.001"
"2017-02-01T00:02:01.001", "2017-02-01T00:05:01.001"
"2017-03-01T00:02:01.001", "2017-03-01T00:05:01.001"
TPS: 2
"2017-04-01T00:02:01.001", "2017-04-01T00:05:01.001"
"2017-04-02T00:03:01.001", "2017-04-02T00:05:01.001"
"2017-04-03T00:02:01.001", "2017-04-03T00:05:01.001"
TPS: 2
"2017-05-01T08:02:01.001", "2017-05-01T08:05:01.001"
"2017-05-01T09:02:01.001", "2017-05-01T09:05:01.001"
"2017-05-01T10:02:01.001", "2017-05-01T10:05:01.001"
TPS: 20
"2017-06-01T10:02:01.001", "2017-06-01T10:05:01.001"
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] wu-sheng commented on issue #814: Mock trace segment data which sniffer from Dubbo framework.
wu-sheng commented on issue #814: Mock trace segment data which sniffer from Dubbo framework. URL: https://github.com/apache/incubator-skywalking/pull/814#issuecomment-365138541 For tps testing. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #814: Mock trace segment data which sniffer from Dubbo framework.
coveralls commented on issue #814: Mock trace segment data which sniffer from Dubbo framework. URL: https://github.com/apache/incubator-skywalking/pull/814#issuecomment-365140220 [](https://coveralls.io/builds/15496775) Coverage remained the same at 19.204% when pulling **56d9b2782cd23a3cc07e4473219f848e431124e7 on peng-yongsheng:feature/mock** into **4032e95dcecdc03f63b40e687e194f743fe0c0b5 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #813: Currently used version of logback contains a security vulnerability
wu-sheng commented on issue #813: Currently used version of logback contains a security vulnerability URL: https://github.com/apache/incubator-skywalking/issues/813#issuecomment-365140470 @fredsjones Thanks a lot for your share. I will do the upgrade. But I have to be clear about the `logback` roll in our project, which is related to SkyWalking application toolkit. SkyWalking application toolkit is just about creating bridge between libraries and SkyWalking core. We didn't actually use those libraries codes. (https://github.com/apache/incubator-skywalking/blob/master/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml#L36) So the dependency is just for compiling stage only. Only risk of security is only related the end-user. Anyway, this explanation is only for solving your concern. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #813: Currently used version of logback contains a security vulnerability
wu-sheng commented on issue #813: Currently used version of logback contains a security vulnerability URL: https://github.com/apache/incubator-skywalking/issues/813#issuecomment-365140470 @fredsjones Thanks a lot for your share. I will do the upgrade. But I have to be clear about the `logback` role in our project, which is related to SkyWalking application toolkit. SkyWalking application toolkit is just about creating bridge between libraries and SkyWalking core. We didn't actually use those libraries codes. (https://github.com/apache/incubator-skywalking/blob/master/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml#L36) So the dependency is just for compiling stage only. Only risk of security is only related the end-user. Anyway, this explanation is only for solving your concern. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed pull request #814: Mock trace segment data which sniffer from Dubbo framework.
wu-sheng closed pull request #814: Mock trace segment data which sniffer from
Dubbo framework.
URL: https://github.com/apache/incubator-skywalking/pull/814
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java
new file mode 100644
index 0..5029d43a3
--- /dev/null
+++
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.mock;
+
+import com.google.protobuf.ByteString;
+import io.grpc.stub.StreamObserver;
+import org.apache.skywalking.apm.network.proto.SpanLayer;
+import org.apache.skywalking.apm.network.proto.SpanObject;
+import org.apache.skywalking.apm.network.proto.SpanType;
+import org.apache.skywalking.apm.network.proto.TraceSegmentObject;
+import org.apache.skywalking.apm.network.proto.UniqueId;
+import org.apache.skywalking.apm.network.proto.UpstreamSegment;
+import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
+
+/**
+ * @author peng-yongsheng
+ */
+class ConsumerMock {
+
+void mock(StreamObserver segmentStreamObserver,
UniqueId.Builder globalTraceId,
+UniqueId.Builder segmentId, long startTimestamp) {
+UpstreamSegment.Builder upstreamSegment = UpstreamSegment.newBuilder();
+upstreamSegment.addGlobalTraceIds(globalTraceId);
+upstreamSegment.setSegment(createSegment(startTimestamp, segmentId));
+
+segmentStreamObserver.onNext(upstreamSegment.build());
+}
+
+private ByteString createSegment(long startTimestamp, UniqueId.Builder
segmentId) {
+TraceSegmentObject.Builder segment = TraceSegmentObject.newBuilder();
+segment.setTraceSegmentId(segmentId);
+segment.setApplicationId(-1);
+segment.setApplicationInstanceId(2);
+segment.addSpans(createExitSpan(startTimestamp));
+segment.addSpans(createEntrySpan(startTimestamp));
+
+return segment.build().toByteString();
+}
+
+private SpanObject.Builder createExitSpan(long startTimestamp) {
+SpanObject.Builder span = SpanObject.newBuilder();
+span.setSpanId(1);
+span.setSpanType(SpanType.Exit);
+span.setSpanLayer(SpanLayer.RPCFramework);
+span.setParentSpanId(0);
+span.setStartTime(startTimestamp + 10);
+span.setEndTime(startTimestamp + 1990);
+span.setComponentId(ComponentsDefine.DUBBO.getId());
+
span.setOperationName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()");
+span.setPeer("172.25.0.4:20880");
+span.setIsError(false);
+return span;
+}
+
+private SpanObject.Builder createEntrySpan(long startTimestamp) {
+SpanObject.Builder span = SpanObject.newBuilder();
+span.setSpanId(0);
+span.setSpanType(SpanType.Entry);
+span.setSpanLayer(SpanLayer.Http);
+span.setParentSpanId(-1);
+span.setStartTime(startTimestamp);
+span.setEndTime(startTimestamp + 2000);
+span.setComponentId(ComponentsDefine.TOMCAT.getId());
+span.setOperationName("/dubbox-case/case/dubbox-rest");
+span.setIsError(false);
+return span;
+}
+}
diff --git
a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock
[GitHub] wu-sheng opened a new pull request #815: Update logback version in application logback toolkit
wu-sheng opened a new pull request #815: Update logback version in application logback toolkit URL: https://github.com/apache/incubator-skywalking/pull/815 Update logback version in application logback toolkit, based on #813 , where I explained that the logback library is not really used, just for compiling the bridge. But anyway, no harm to fix the risk. FYI @apache/skywalking-committers . This is not a real leak/risk. CC @fredsjones This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #815: Update logback version in application logback toolkit
coveralls commented on issue #815: Update logback version in application logback toolkit URL: https://github.com/apache/incubator-skywalking/pull/815#issuecomment-365165828 [](https://coveralls.io/builds/15498180) Coverage remained the same at 19.204% when pulling **4544d9967338f101df7e62f96af82e749b8a4bb4 on update/logbck-version** into **8276eac7eea595512f1d7128173a69e7193e9c7a on master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] peng-yongsheng opened a new pull request #816: Application, Instance, Service register tested with elastic search.
peng-yongsheng opened a new pull request #816: Application, Instance, Service register tested with elastic search. URL: https://github.com/apache/incubator-skywalking/pull/816 OK. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #779: Proposal our ROADMAP.
coveralls commented on issue #779: Proposal our ROADMAP. URL: https://github.com/apache/incubator-skywalking/pull/779#issuecomment-360965887 [](https://coveralls.io/builds/15498388) Coverage decreased (-2.6%) to 19.204% when pulling **eb581e5cf7f06ee6bd72fba97bd75247150bafd7 on doc/roadmap** into **63eec4bd217d0151c05ebe1750c1f2de4d7d481f on master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng commented on issue #612: [Agent] Can skywalking support Hystrix
wu-sheng commented on issue #612: [Agent] Can skywalking support Hystrix URL: https://github.com/apache/incubator-skywalking/issues/612#issuecomment-365172066 @ascrutae Pay attention for the multi threads in **Hystrix**. This component is really important in Spring eco system. But be advised, create span for **Hystrix** is meaningless, but tracing retry by creating new thread and propagate context, also log the exception it triggers. those are really matter. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #779: Proposal our ROADMAP.
coveralls commented on issue #779: Proposal our ROADMAP. URL: https://github.com/apache/incubator-skywalking/pull/779#issuecomment-360965887 [](https://coveralls.io/builds/15498403) Coverage decreased (-2.6%) to 19.204% when pulling **eb581e5cf7f06ee6bd72fba97bd75247150bafd7 on doc/roadmap** into **63eec4bd217d0151c05ebe1750c1f2de4d7d481f on master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #816: Application, Instance, Service register tested with elastic search.
coveralls commented on issue #816: Application, Instance, Service register tested with elastic search. URL: https://github.com/apache/incubator-skywalking/pull/816#issuecomment-365172258 [](https://coveralls.io/builds/15498406) Coverage decreased (-0.004%) to 19.2% when pulling **544505823882047e3de89a3ebdddf94c90dc1c8a on peng-yongsheng:feature/register_test** into **8276eac7eea595512f1d7128173a69e7193e9c7a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #816: Application, Instance, Service register tested with elastic search.
coveralls commented on issue #816: Application, Instance, Service register tested with elastic search. URL: https://github.com/apache/incubator-skywalking/pull/816#issuecomment-365172258 [](https://coveralls.io/builds/15498412) Coverage decreased (-0.004%) to 19.2% when pulling **544505823882047e3de89a3ebdddf94c90dc1c8a on peng-yongsheng:feature/register_test** into **8276eac7eea595512f1d7128173a69e7193e9c7a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wu-sheng closed pull request #816: Application, Instance, Service register tested with elastic search.
wu-sheng closed pull request #816: Application, Instance, Service register
tested with elastic search.
URL: https://github.com/apache/incubator-skywalking/pull/816
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
new file mode 100644
index 0..6bf5d1690
--- /dev/null
+++
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.mock;
+
+import io.grpc.ManagedChannel;
+import java.util.UUID;
+import org.apache.skywalking.apm.network.proto.Application;
+import org.apache.skywalking.apm.network.proto.ApplicationInstance;
+import org.apache.skywalking.apm.network.proto.ApplicationMapping;
+import org.apache.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc;
+import org.apache.skywalking.apm.network.proto.InstanceDiscoveryServiceGrpc;
+import org.apache.skywalking.apm.network.proto.OSInfo;
+import org.apache.skywalking.apm.network.proto.ServiceNameCollection;
+import org.apache.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc;
+import org.apache.skywalking.apm.network.proto.ServiceNameElement;
+import org.joda.time.DateTime;
+
+/**
+ * @author peng-yongsheng
+ */
+class RegisterMock {
+
+private
ApplicationRegisterServiceGrpc.ApplicationRegisterServiceBlockingStub
applicationRegisterServiceBlockingStub;
+private InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceBlockingStub
instanceDiscoveryServiceBlockingStub;
+private
ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceBlockingStub
serviceNameDiscoveryServiceBlockingStub;
+
+void mock(ManagedChannel channel) {
+applicationRegisterServiceBlockingStub =
ApplicationRegisterServiceGrpc.newBlockingStub(channel);
+instanceDiscoveryServiceBlockingStub =
InstanceDiscoveryServiceGrpc.newBlockingStub(channel);
+serviceNameDiscoveryServiceBlockingStub =
ServiceNameDiscoveryServiceGrpc.newBlockingStub(channel);
+registerConsumer();
+registerProvider();
+}
+
+private void registerConsumer() {
+Application.Builder application = Application.newBuilder();
+application.setApplicationCode("dubbox-consumer");
+ApplicationMapping applicationMapping =
applicationRegisterServiceBlockingStub.applicationCodeRegister(application.build());
+
+ApplicationInstance.Builder instance =
ApplicationInstance.newBuilder();
+
instance.setApplicationId(applicationMapping.getApplication().getValue());
+instance.setAgentUUID(UUID.randomUUID().toString());
+instance.setRegisterTime(new
DateTime("2017-01-01T00:01:01.001").getMillis());
+
+OSInfo.Builder osInfo = OSInfo.newBuilder();
+osInfo.setHostname("pengys");
+osInfo.setOsName("MacOS XX");
+osInfo.setProcessNo(1001);
+osInfo.addIpv4S("10.0.0.3");
+osInfo.addIpv4S("10.0.0.4");
+instance.setOsinfo(osInfo);
+
instanceDiscoveryServiceBlockingStub.registerInstance(instance.build());
+
+ServiceNameCollection.Builder serviceNameCollection =
ServiceNameCollection.newBuilder();
+ServiceNameElement.Builder serviceNameElement =
ServiceNameElement.newBuilder();
+
serviceNameElement.setApplicationId(applicationMapping.getApplication().getValue());
+
serviceNameElement.setServiceName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()");
+serviceNameCollection.addElements(serviceNameElement);
+
