[GitHub] [skywalking-java] wu-sheng commented on a diff in pull request #136: optimize UT
wu-sheng commented on code in PR #136: URL: https://github.com/apache/skywalking-java/pull/136#discussion_r841440944 ## apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java: ## @@ -49,19 +49,22 @@ public void testGetAndIncrement() { @Test @Benchmark public void testGetAndIncrementV1Performance() { -ATOMIC_V1.getAndIncrement(); +final int result = ATOMIC_V1.getAndIncrement(); +Assert.assertTrue(result >= 0 && result <= 100); Review Comment: Why do we need `Assert`? This is benchmark testing. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [skywalking-rocketbot-ui] Fine0830 commented on pull request #297: Feat: New metrics and custom configurations in dashboard
Fine0830 commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-635124393 > @Fine0830 I think all names should be full names, including topology template. All of key names? If that, Yes, they are full names. https://user-images.githubusercontent.com/20871783/83104653-c28cfd80-a0eb-11ea-8619-1e25ccbac55d.png;> This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-635119257 @Fine0830 I think all names should be full names, including topology template. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Fine0830 commented on pull request #297: Feat: New metrics and custom configurations in dashboard
Fine0830 commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-635118520 > Could you change all the config keys in full names? From my reading, they were using one char only, and your new keys are correct. > > ![image](https://user-images.githubusercontent.com/5441976/83087576-2c91ac80-a0c4-11ea-958d-a850ff4ead84.png) There are templates of dashboard and topology https://github.com/Fine0830/skywalking-rocketbot-ui/tree/feat/dashboard/src/template This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-635034168 Could you change all the config keys in full names? From my reading, they were using one char only, and your new keys are correct. ![image](https://user-images.githubusercontent.com/5441976/83087576-2c91ac80-a0c4-11ea-958d-a850ff4ead84.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-634638312 This PR is much better now, I think we left the following things to improve 1. The linear graph type is not configurable, but SLA has the bar graph, but others are linear. I think we should open an option about this, for `get all values` and `get all values of labels`. I have noticed, you have `ChartBar` and `ChartLine` on the JSON format. 1. `All entities(max 30)` should be an option(true or false, default no selected) when `Entity type = service or instance` and metrics query is `get all values`. When clicked, all items in the common selector should be queried and visualized in the current graph. (This is important for @hanahmily 's Prometheus integration, and an important feature as we have removed the comparison view. NOTICE, `max 30` is for avoiding overload when there are 100+ entities. The graph will be a disaster. 1. Separate the service/instance/endpoint dashboard config in the topology pop up page, from the real dashboard. FYI @apache/skywalking-committers, I will add a new GraphQL query to make the backend provide the default configurations for both dashboard and topology pop up page. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-634638312 This PR is much better now, I think we left the following things to improve 1. The linear graph type is not configurable, but SLA has the bar graph, but others are linear. I think we should open an option about this, for `get all values` and `get all values of labels`. 1. `All entities(max 30)` should be an option(true or false, default no selected) when `Entity type = service or instance` and metrics query is `get all values`. When clicked, all items in the common selector should be queried and visualized in the current graph. (This is important for @hanahmily 's Prometheus integration, and an important feature as we have removed the comparison view. NOTICE, `max 30` is for avoiding overload when there are 100+ entities. The graph will be a disaster. 1. Separate the service/instance/endpoint dashboard config in the topology pop up page, from the real dashboard. FYI @apache/skywalking-committers, I will add a new GraphQL query to make the backend provide the default configurations for both dashboard and topology pop up page. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-634638312 This PR is much better now, I think we left the following things to improve 1. Apdex and SLA seem still hiding some default calculation. Such as, `apdex=1` means 1.0 at the front page, but now, even no calculation rule is set, the value is still correct. SLA has a similar case. Please cross-check the codes. 1. The linear graph type is not configurable, but SLA has the bar graph, but others are linear. I think we should open an option about this, for `get all values` and `get all values of labels`. 1. `All entities(max 30)` should be an option(true or false, default no selected) when `Entity type = service or instance` and metrics query is `get all values`. When clicked, all items in the common selector should be queried and visualized in the current graph. (This is important for @hanahmily 's Prometheus integration, and an important feature as we have removed the comparison view. NOTICE, `max 30` is for avoiding overload when there are 100+ entities. The graph will be a disaster. 1. Separate the service/instance/endpoint dashboard config in the topology pop up page, from the real dashboard. FYI @apache/skywalking-committers, I will add a new GraphQL query to make the backend provide the default configurations for both dashboard and topology pop up page. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-634638312 This PR is much better now, I think we left the following things to improve 1. Apdex and SLA seem still hiding some default calculation. Such as, `apdex=1` means 1.0 at the front page, but now, even no calculation rule is set, the value is still correct. SLA has a similar case. Please cross-check the codes. 1. The linear graph type is not configurable, but SLA has the bar graph, but others are linear. I think we should open an option about this, for `get all values` and `get all values of labels`. 1. `All entities(max 30)` should be an option when `Entity type = service or instance` and metrics query is `get all values`. When clicked, all items in the common selector should be queried and visualized in the current graph. (This is important for @hanahmily 's Prometheus integration, and an important feature as we have removed the comparison view. NOTICE, `max 30` is for avoiding overload when there are 100+ entities. The graph will be a disaster. 1. Separate the service/instance/endpoint dashboard config in the topology pop up page, from the real dashboard. FYI @apache/skywalking-committers, I will add a new GraphQL query to make the backend provide the default configurations for both dashboard and topology pop up page. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-634638312 This PR is much better now, I think we left the following things to improve 1. Apdex and SLA seem still hiding some default calculation. Such as, `apdex=1` means 1.0 at the front page, but now, even no calculation rule is set, the value is still correct. SLA has a similar case. Please cross-check the codes. 1. The linear graph type is not configurable, but SLA has the bar graph, but others are linear. I think we should open an option about this, for `get all values` and `get all values of labels`. 1. `All services` and `All instances` should be two options in the `Entity type` selector for `get all values` and `get all values of labels` too. When clicked, all items in the common selector should be queried and visualized in the current graph. (This is important for @hanahmily 's prometheus integration, and an important feature as we have removed the comparison view. 1. Separate the service/instance/endpoint dashboard config in the topology pop up page, from the real dashboard. FYI @apache/skywalking-committers, I will add a new GraphQL query to make the backend provide the default configurations for both dashboard and topology pop up page. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-634638312 This PR is much better now, I think we left the following things to improve 1. Apdex and SLA seem still hiding some default calculation. Such as, `apdex=1` means 1.0 at the front page, but now, even no calculation rule is set, the value is still correct. SLA has a similar case. Please cross-check the codes. 1. The linear graph type is not configurable, but SLA has the bar graph, but others are linear. I think we should open an option about this, for `get all values` and `get all values of labels`. 1. `All services` and `All instances` should be two options in the `Entity type` selector for `get all values` and `get all values of labels` too. When those two clicked, all items in the common selector should be queried and visualized in the current graph. (This is important for @hanahmily 's prometheus integration, and an important feature as we have removed the comparison view. 1. Separate the service/instance/endpoint dashboard config in the topology pop up page, from the real dashboard. FYI @apache/skywalking-committers, I will add a new GraphQL query to make the backend provide the default configurations for both dashboard and topology pop up page. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng closed issue #299: Proxy error: Could not proxy request /graphql from localhost:8080
wu-sheng closed issue #299: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/299 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on issue #299: Proxy error: Could not proxy request /graphql from localhost:8080
wu-sheng commented on issue #299: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/299#issuecomment-634643192 I run this in every day, all things are good. The UI requires the backend standing by. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-634638312 This PR is much better now, I think we left the following things to improve 1. Apdex and SLA seem still hiding some default calculation. Such as, `apdex=1` means 1.0 at the front page, but now, even no calculation rule is set, the value is still correct. SLA has a similar case. Please cross-check the codes. 1. The linear graph type is not configurable, but SLA has the bar graph, but others are linear. I think we should open an option about this, for `get all values` and `get all values of labels`. 1. Separate the service/instance/endpoint dashboard config in the topology pop up page, from the real dashboard. FYI @apache/skywalking-committers, I will add a new GraphQL query to make the backend provide the default configurations for both dashboard and topology pop up page. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] karqical2016 opened a new issue #299: Proxy error: Could not proxy request /graphql from localhost:8080
karqical2016 opened a new issue #299: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/299 Proxy error: Could not proxy request /graphql from localhost:8080 to http://127.0.0.1:12800. See https://nodejs.org/api/errors.html#errors_common_system_errors for more information (ECONNREFUSED). This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-634049566 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] kezhenxu94 merged pull request #298: Create .asf.yaml to mute the noises from PR/comments
kezhenxu94 merged pull request #298: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/298 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] kezhenxu94 commented on pull request #298: Create .asf.yaml to mute the noises from PR/comments
kezhenxu94 commented on pull request #298: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/298#issuecomment-633533146 Not sure why the problem doesn't exist in other SkyWalking repos This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] kezhenxu94 opened a new pull request #298: Create .asf.yaml to mute the noises from PR/comments
kezhenxu94 opened a new pull request #298: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/298 Recently the PR and comments events are sent to the dev@ mailing list, which generates much noise, this patch creates `.asf.yaml` to mute the events and sends them to notifications@ ML for those who are interested in the events This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] SecMao edited a comment on issue #284: browser compability problem in Edge
SecMao edited a comment on issue #284: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/284#issuecomment-633475238 another problem in IE 11: children node with class 'ell' is not restricted by 'max-width' style set on parent. [max-width](https://github.com/apache/skywalking-rocketbot-ui/blob/52a56d3ee273a3629d3ac48ba7eb99d8ba694ca9/src/views/components/dashboard/tool-bar-select.vue#L32) ![image](https://user-images.githubusercontent.com/26298277/82799655-f9290500-9eac-11ea-960b-a6452b4f7336.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] SecMao commented on issue #284: browser compability problem in Edge
SecMao commented on issue #284: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/284#issuecomment-633475238 another problem in IE 11: children node with class 'ell' is not restricted by 'max-width' style set on parent. [max-width](https://github.com/apache/skywalking-rocketbot-ui/blob/52a56d3ee273a3629d3ac48ba7eb99d8ba694ca9/src/views/components/dashboard/tool-bar-select.vue#L32) ![image](https://user-images.githubusercontent.com/26298277/82799434-a0f20300-9eac-11ea-9a04-fc1c978fe16c.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on issue #295: Missing relation scopes in alarm view
wu-sheng commented on issue #295: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/295#issuecomment-633460571 Provided in the master. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng closed issue #295: Missing relation scopes in alarm view
wu-sheng closed issue #295: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/295 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on issue #283: skywaling 7.0.0 profile analysis function ui error
wu-sheng commented on issue #283: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/283#issuecomment-633455499 Fixed in the master already. Backend TTL issue caused this. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng closed issue #283: skywaling 7.0.0 profile analysis function ui error
wu-sheng closed issue #283: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/283 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] itdamo edited a comment on issue #283: skywaling 7.0.0 profile analysis function ui error
itdamo edited a comment on issue #283: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/283#issuecomment-633439466 I'v meeted the same error. ![image](https://user-images.githubusercontent.com/5277544/82792421-fa086980-9ea1-11ea-8b9a-d098aff1c088.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] itdamo commented on issue #283: skywaling 7.0.0 profile analysis function ui error
itdamo commented on issue #283: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/283#issuecomment-633439466 I'v meeted the same error. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632964542 Add a new option `all services` ![image](https://user-images.githubusercontent.com/5441976/82718970-d0e8ad00-9cd8-11ea-8cf6-d61d68c812bf.png) This is a frontend logic, once selected, use all services from the selector(common or self) to query metrics and list in the graph. This option could work for `read avg value` and `read all values` in REGULAR_VALUE and LABELED_VALUE metrics. `REGULAR_VALUE` + `read all values` option has a higher priority. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632964926 The unit doesn't set up right. ![image](https://user-images.githubusercontent.com/5441976/82719023-5704f380-9cd9-11ea-8409-3880b91fe025.png) I think we should remove the hard code somewhere. And ask user to set up in the metrics title like this. ![image](https://user-images.githubusercontent.com/5441976/82719039-8b78af80-9cd9-11ea-981a-d0e60348a1f2.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632964542 Add a new option `all services` ![image](https://user-images.githubusercontent.com/5441976/82718970-d0e8ad00-9cd8-11ea-8cf6-d61d68c812bf.png) This is a frontend logic, once selected, use all services from the selector(common or self) to query metrics and list in the graph. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632964143 We need to add a static filter here, once user set this, use `searchServices` rather than `getAllServices` to get service list. ![image](https://user-images.githubusercontent.com/5441976/82718936-8ebf6b80-9cd8-11ea-996c-34bc0f0e0a27.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632741685 One key point, we shouldn't/can't hard code anything about any metrics because in the case of the metric, we can't expect which metrics they will generate, and what is the meaning. The only one who knows that is the end-user. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632741685 One key point, we should/can't hard code anything about any metrics because in the case of the metric, we can't expect which metrics they will generate, and what is the meaning. The only one who knows that is the end-user. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng edited a comment on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng edited a comment on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632731224 The multiple metrics linear visualization doesn't show the correct backend result. ![image](https://user-images.githubusercontent.com/5441976/82680068-58ed9900-9c7e-11ea-9fea-2576976680d6.png) ![image](https://user-images.githubusercontent.com/5441976/82680005-44a99c00-9c7e-11ea-8deb-47b7740cdd58.png) Also, there are not metrics simple calculations, such as `$value / 1000` to format the value in a more reasonable way. But once you don't have this, how do you make the successful rate look right, which should not be right. Do you hard code anything? Otherwise, we should show 1, because the backend query returns 1. ![image](https://user-images.githubusercontent.com/5441976/82681245-1927b100-9c80-11ea-9400-fede5a900b9e.png) ![image](https://user-images.githubusercontent.com/5441976/82681326-365c7f80-9c80-11ea-85f0-f999c97f03d4.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632737036 Every time, when I can't the component config, and close the config page. I have to refresh the browser page, otherwise, most likely, the change wouldn't take effect. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632734364 SortedMetrics doesn't show the name correctly. ![image](https://user-images.githubusercontent.com/5441976/82680651-2abc8900-9c7f-11ea-95c1-7363452936e9.png) In the `SelectedRecord`, you should display like this. Copy should follow the same logic. 1. name, if ref-id is empty. 1. name - ref-id, if ref-id is not empty. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632733545 Miss readSampledRecords type. `top_n_database_statement`'s metrics type is `SAMPLED_RECORD` ![image](https://user-images.githubusercontent.com/5441976/82680461-df09df80-9c7e-11ea-8ac0-3a67913a6e79.png) ![image](https://user-images.githubusercontent.com/5441976/82680559-05c81600-9c7f-11ea-9815-683ede9edb01.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632732736 Height config is only working like before, ![image](https://user-images.githubusercontent.com/5441976/82680255-98b48080-9c7e-11ea-9090-ea2134106cce.png) ![image](https://user-images.githubusercontent.com/5441976/82680341-b550b880-9c7e-11ea-9e44-1f0cb6c53904.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632731597 Changing query type from avg value to all values doesn't work. Don't know why. ![image](https://user-images.githubusercontent.com/5441976/82680128-6c98ff80-9c7e-11ea-9051-9f8015602525.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632731224 The multiple metrics linear visualization doesn't show the correct backend result. ![image](https://user-images.githubusercontent.com/5441976/82680068-58ed9900-9c7e-11ea-9fea-2576976680d6.png) ![image](https://user-images.githubusercontent.com/5441976/82680005-44a99c00-9c7e-11ea-8deb-47b7740cdd58.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632730455 ![image](https://user-images.githubusercontent.com/5441976/82679907-26dc3700-9c7e-11ea-92bf-f56bb732a9b0.png) Service list on the standard APM page is not right. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on a change in pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on a change in pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#discussion_r429291032 ## File path: src/views/components/dashboard/dashboard-item.vue ## @@ -93,7 +93,7 @@ limitations under the License. --> }; } if (!this.itemConfig.metricLabels && this.itemConfig.metricType === MetricsType.LABELED_VALUE) { -this.EDIT_COMP_CONFIG({ index: this.index, values: { metricLabels: 'p50, p75, p90, p95, p99' } }); +this.EDIT_COMP_CONFIG({ index: this.index, values: { metricLabels: PercentileLabels } }); Review comment: This change is not right. The display should configure through UI by the end-users. Because label query covers more use cases than percentile. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #297: Feat: New metrics and custom configurations in dashboard
wu-sheng commented on pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297#issuecomment-632687670 I am doing the offline test and DM with @Fine0830. Polish this PR, and make it suitable for more people to test. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Fine0830 opened a new pull request #297: Feat: New metrics and custom configurations in dashboard
Fine0830 opened a new pull request #297: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/297 Use new metrics system and custom configurations in dashboard **screenshots** ![屏幕快照 2020-05-22 上午11 25 25](https://user-images.githubusercontent.com/20871783/82628812-71c76180-9c20-11ea-819f-d97ac911e847.png) ![屏幕快照 2020-05-22 上午11 37 45](https://user-images.githubusercontent.com/20871783/82628890-b226df80-9c20-11ea-8386-c18c710ab881.png) ![屏幕快照 2020-05-22 上午11 25 40](https://user-images.githubusercontent.com/20871783/82628818-74c25200-9c20-11ea-9861-2f7b154f6239.png) ![屏幕快照 2020-05-22 上午11 26 36](https://user-images.githubusercontent.com/20871783/82628822-77bd4280-9c20-11ea-94e1-69068b4ca8ba.png) ![屏幕快照 2020-05-22 上午11 49 46](https://user-images.githubusercontent.com/20871783/82629453-5d846400-9c22-11ea-9868-08f34de96d72.png) ![屏幕快照 2020-05-22 上午11 47 25](https://user-images.githubusercontent.com/20871783/82629462-607f5480-9c22-11ea-817e-2519936352c5.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] mrproliu opened a new issue #295: Missing relation scopes in alarm view
mrproliu opened a new issue #295: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/295 Follow the https://github.com/apache/skywalking/pull/4769, the UI level currently misses the relation scopes items in the filter scope selection, and need to propagate the scope to the GraphQL query. ![image](https://user-images.githubusercontent.com/3417650/81536936-f7d0e600-939e-11ea-84ad-0145b7c05fdb.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on issue #294: skywaling 7.0.0 login feature
wu-sheng commented on issue #294: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/294#issuecomment-626287121 You should setup login by yourself. Such as through Nginx. We are not providing those. The thing you found is legacy codes only. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] gy0801151351 opened a new issue #294: skywaling 7.0.0 login feature
gy0801151351 opened a new issue #294: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/294 I found that the login logic of WebApp UI was commented out. Related source is "skywalking-ui/src/router.ts". So, is there any security feature to protect the WebApp UI ? This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] TinyAllen opened a new pull request #293: Fix: Only check the real node
TinyAllen opened a new pull request #293: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/293 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] TinyAllen opened a new pull request #292: Fix: Topology first visit bug.
TinyAllen opened a new pull request #292: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/292 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] efekaptan opened a new pull request #291: Add Mariadb component icon into topology
efekaptan opened a new pull request #291: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/291 ![Screenshot 2020-05-06 at 20 30 26](https://user-images.githubusercontent.com/1737260/81216105-a7dad380-8fda-11ea-8329-4b7181ebfa14.png) This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] kezhenxu94 commented on pull request #290: Add Python logo in topo
kezhenxu94 commented on pull request #290: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/290#issuecomment-624493687 > Got it. But Python and its component ids have not been reserved in the `component-libraries.yml`. Please add it there. It's already there for a while https://github.com/apache/skywalking/pull/4746 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on pull request #290: Add Python logo in topo
wu-sheng commented on pull request #290: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/290#issuecomment-624488681 Got it. But Python and its component ids have not been reserved in the `component-libraries.yml`. Please add it there. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] kezhenxu94 commented on pull request #290: Add Python logo in topo
kezhenxu94 commented on pull request #290: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/290#issuecomment-624475309 > Does python only need one icon rather than different libraries? This one is just for those libraries that are built in Python core (similar to JDK HTTP, Threading), that have no logos to display, for other libraries like Flask or Django, there will be their logos to display This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] kezhenxu94 opened a new pull request #290: Add Python logo in topo
kezhenxu94 opened a new pull request #290: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/290 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Jtrust removed a comment on pull request #288: Feat:Import and export the configuration file for the dashboard layout
Jtrust removed a comment on pull request #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-619554600 > Could you take a more detailed screenshot? ok This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Jtrust commented on pull request #288: Feat:Import and export the configuration file for the dashboard layout
Jtrust commented on pull request #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-61931 > Could you take a more detailed screenshot? ok This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Jtrust commented on pull request #288: Feat:Import and export the configuration file for the dashboard layout
Jtrust commented on pull request #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-619554600 > Could you take a more detailed screenshot? ok This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Jtrust commented on pull request #288: Feat:Import and export the configuration file for the dashboard layout
Jtrust commented on pull request #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-619552152 > I prefer dashboard level import/export to be more flexible ![pic](https://raw.githubusercontent.com/Jtrust/images/master/img/20200426213312.png) how about this as shown in the picture? When importing data, if the name is the same, replace it, or add a new one This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Jtrust commented on pull request #288: Feat:Import and export the configuration file for the dashboard layout
Jtrust commented on pull request #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-619550403 > Thanks for working on this. Could you update the icon style? Now the icons don't look neat enough. You use` js` native API to implement functions. Does `Vue` have corresponding methods to replace it? Thank you for your Suggestions for improvement. Icon style will be updated in next PR. I guess you're worried about browser reflow. It does have this effect. On the other hand, `appendChild/removeChild` is for firefox compatibility. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] BFergerson opened a new pull request #289: Add Vert.x logo to topology
BFergerson opened a new pull request #289: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/289 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Fine0830 commented on issue #288: Feat:Import and export the configuration file for the dashboard layout
Fine0830 commented on issue #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-618294328 Could you take a more detailed screenshot? This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Fine0830 edited a comment on issue #288: Feat:Import and export the configuration file for the dashboard layout
Fine0830 edited a comment on issue #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-618291506 Thanks for working on this. Could you update the icon style? Now the icons don't look neat enough. You use` js` native API to implement functions. Does `Vue` have corresponding methods to replace it? This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Fine0830 commented on issue #288: Feat:Import and export the configuration file for the dashboard layout
Fine0830 commented on issue #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-618291506 Thanks for working on this. Could you update the icon style? Now the icons don't look neat enough. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Fine0830 commented on a change in pull request #288: Feat:Import and export the configuration file for the dashboard layout
Fine0830 commented on a change in pull request #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#discussion_r413659335 ## File path: src/views/components/dashboard/tool-group.vue ## @@ -101,6 +115,31 @@ limitations under the License. --> this.handleHide(); this.template = false; } +private exportLayoutData() { + const data = JSON.stringify(this.rocketComps.tree); + const tagA = document.createElement('a'); + tagA.download = 'dashboard.json'; + tagA.style.display = 'none'; + let blob = new Blob([data]); + tagA.href = URL.createObjectURL(blob); + document.body.appendChild(tagA); + tagA.click(); + document.body.removeChild(tagA); +} +private importLayoutData() { + let obj: any = document.getElementById('file'); Review comment: `let` should be `const`. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Jtrust commented on issue #288: Feat:Import and export the configuration file for the dashboard layout
Jtrust commented on issue #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-617829775 > I prefer dashboard level import/export to be more flexible This is a good direction and I'm trying to get some ideas This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] wu-sheng commented on issue #288: Feat:Import and export the configuration file for the dashboard layout
wu-sheng commented on issue #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288#issuecomment-617798538 I prefer dashboard level import/export to be more flexible This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Jtrust opened a new pull request #288: Feat:Import and export the configuration file for the dashboard layout
Jtrust opened a new pull request #288: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/288 Feature [#287](https://github.com/apache/skywalking-rocketbot-ui/issues/287) `https://s1.ax1x.com/2020/04/22/JUlQrd.jpg; alt="JUlQrd.jpg" border="0" />` This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Jtrust opened a new issue #287: Import and export the configuration file for the dashboard layout
Jtrust opened a new issue #287: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/287 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Fine0830 opened a new pull request #286: Fix: profile span
Fine0830 opened a new pull request #286: URL: https://github.com/apache/skywalking-rocketbot-ui/pull/286 Fixes type to view profile span This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [skywalking-rocketbot-ui] Fine0830 opened a new issue #285: Refresh data when we update global calendar in topo page.
Fine0830 opened a new issue #285: URL: https://github.com/apache/skywalking-rocketbot-ui/issues/285 Refresh topo, instance, service detail data when we update global calendar in topo page. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] peng-yongsheng closed pull request #12: Use add data to set the values into remote data builder.
peng-yongsheng closed pull request #12: Use add data to set the values into remote data builder. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/12 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/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl index 3245422..c073503 100644 --- a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl +++ b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl @@ -124,19 +124,19 @@ public class ${metricName}Indicator extends ${indicatorClassName} implements Ala @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); <#list serializeFields.stringFields as field> -remoteBuilder.setDataStrings(${field?index}, ${field.getter}()); +remoteBuilder.addDataStrings(${field.getter}()); <#list serializeFields.longFields as field> -remoteBuilder.setDataLongs(${field?index}, ${field.getter}()); +remoteBuilder.addDataLongs(${field.getter}()); <#list serializeFields.doubleFields as field> -remoteBuilder.setDataDoubles(${field?index}, ${field.getter}()); +remoteBuilder.addDataDoubles(${field.getter}()); <#list serializeFields.intFields as field> -remoteBuilder.setDataIntegers(${field?index}, ${field.getter}()); +remoteBuilder.addDataIntegers(${field.getter}()); <#list serializeFields.intLongValuePairListFields as field> ${field.getter}().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); diff --git a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java index b4554c4..febba5a 100644 --- a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java +++ b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java @@ -82,15 +82,15 @@ @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); -remoteBuilder.setDataStrings(0, getEntityId()); -remoteBuilder.setDataStrings(1, getStringField()); +remoteBuilder.addDataStrings(getEntityId()); +remoteBuilder.addDataStrings(getStringField()); -remoteBuilder.setDataLongs(0, getSummation()); -remoteBuilder.setDataLongs(1, getValue()); -remoteBuilder.setDataLongs(2, getTimeBucket()); +remoteBuilder.addDataLongs(getSummation()); +remoteBuilder.addDataLongs(getValue()); +remoteBuilder.addDataLongs(getTimeBucket()); -remoteBuilder.setDataIntegers(0, getCount()); +remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 #12: Use add data to set the values into remote data builder.
peng-yongsheng opened a new pull request #12: Use add data to set the values into remote data builder. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/12 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 #11: Add copyFrom method for complex data type.
wu-sheng closed pull request #11: Add copyFrom method for complex data type. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/11 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/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl index 6f8240e..3245422 100644 --- a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl +++ b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl @@ -178,15 +178,26 @@ public class ${metricName}Indicator extends ${indicatorClassName} implements Ala @Override public Indicator toHour() { ${metricName}Indicator indicator = new ${metricName}Indicator(); -indicator.setTimeBucket(toTimeBucketInHour()); <#list fieldsFromSource as field> -<#if field.columnName != "time_bucket"> +<#if field.columnName == "time_bucket"> +indicator.setTimeBucket(toTimeBucketInHour()); +<#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); +<#else> +${field.typeName} newValue = new ${field.typeName}(); +newValue.copyFrom(this.${field.fieldGetter}()); +indicator.${field.fieldSetter}(newValue); <#list persistentFields as field> -<#if field.columnName != "time_bucket"> +<#if field.columnName == "time_bucket"> +indicator.setTimeBucket(toTimeBucketInHour()); +<#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); +<#else> +${field.typeName} newValue = new ${field.typeName}(); +newValue.copyFrom(this.${field.fieldGetter}()); +indicator.${field.fieldSetter}(newValue); return indicator; @@ -195,15 +206,26 @@ public class ${metricName}Indicator extends ${indicatorClassName} implements Ala @Override public Indicator toDay() { ${metricName}Indicator indicator = new ${metricName}Indicator(); -indicator.setTimeBucket(toTimeBucketInDay()); <#list fieldsFromSource as field> -<#if field.columnName != "time_bucket"> +<#if field.columnName == "time_bucket"> +indicator.setTimeBucket(toTimeBucketInDay()); +<#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); +<#else> +${field.typeName} newValue = new ${field.typeName}(); +newValue.copyFrom(this.${field.fieldGetter}()); +indicator.${field.fieldSetter}(newValue); <#list persistentFields as field> -<#if field.columnName != "time_bucket"> +<#if field.columnName == "time_bucket"> +indicator.setTimeBucket(toTimeBucketInDay()); +<#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); +<#else> +${field.typeName} newValue = new ${field.typeName}(); +newValue.copyFrom(this.${field.fieldGetter}()); +indicator.${field.fieldSetter}(newValue); return indicator; @@ -212,15 +234,26 @@ public class ${metricName}Indicator extends ${indicatorClassName} implements Ala @Override public Indicator toMonth() { ${metricName}Indicator indicator = new ${metricName}Indicator(); -indicator.setTimeBucket(toTimeBucketInMonth()); <#list fieldsFromSource as field> -<#if field.columnName != "time_bucket"> +<#if field.columnName == "time_bucket"> +indicator.setTimeBucket(toTimeBucketInMonth()); +<#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); +<#else> +${field.typeName} newValue = new ${field.typeName}(); +newValue.copyFrom(this.${field.fieldGetter}()); +indicator.${field.fieldSetter}(newValue); <#list persistentFields as field> -<#if field.columnName != "time_bucket"> +<#if field.columnName == "time_bucket"> +indicator.setTimeBucket(toTimeBucketInMonth()); +<#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName ==
[GitHub] peng-yongsheng opened a new pull request #11: Add copyFrom method for complex data type.
peng-yongsheng opened a new pull request #11: Add copyFrom method for complex data type. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/11 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 #10: Timebucket value overwrite bug.
wu-sheng closed pull request #10: Timebucket value overwrite bug. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/10 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/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl index 0e2db23..6569f4f 100644 --- a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl +++ b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl @@ -177,10 +177,14 @@ public class ${metricName}Indicator extends ${indicatorClassName} implements Ala ${metricName}Indicator indicator = new ${metricName}Indicator(); indicator.setTimeBucket(toTimeBucketInHour()); <#list fieldsFromSource as field> +<#if field.columnName != "time_bucket"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); + <#list persistentFields as field> +<#if field.columnName != "time_bucket"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); + return indicator; } @@ -190,10 +194,14 @@ public class ${metricName}Indicator extends ${indicatorClassName} implements Ala ${metricName}Indicator indicator = new ${metricName}Indicator(); indicator.setTimeBucket(toTimeBucketInDay()); <#list fieldsFromSource as field> +<#if field.columnName != "time_bucket"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); + <#list persistentFields as field> +<#if field.columnName != "time_bucket"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); + return indicator; } @@ -203,10 +211,14 @@ public class ${metricName}Indicator extends ${indicatorClassName} implements Ala ${metricName}Indicator indicator = new ${metricName}Indicator(); indicator.setTimeBucket(toTimeBucketInMonth()); <#list fieldsFromSource as field> +<#if field.columnName != "time_bucket"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); + <#list persistentFields as field> +<#if field.columnName != "time_bucket"> indicator.${field.fieldSetter}(this.${field.fieldGetter}()); + return indicator; } diff --git a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java index a7a4574..be2e5f2 100644 --- a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java +++ b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java @@ -122,7 +122,6 @@ public Indicator toHour() { indicator.setSummation(this.getSummation()); indicator.setCount(this.getCount()); indicator.setValue(this.getValue()); -indicator.setTimeBucket(this.getTimeBucket()); indicator.setStringField(this.getStringField()); return indicator; } @@ -135,7 +134,6 @@ public Indicator toDay() { indicator.setSummation(this.getSummation()); indicator.setCount(this.getCount()); indicator.setValue(this.getValue()); -indicator.setTimeBucket(this.getTimeBucket()); indicator.setStringField(this.getStringField()); return indicator; } @@ -148,7 +146,6 @@ public Indicator toMonth() { indicator.setSummation(this.getSummation()); indicator.setCount(this.getCount()); indicator.setValue(this.getValue()); -indicator.setTimeBucket(this.getTimeBucket()); indicator.setStringField(this.getStringField()); return indicator; } 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 #10: Timebucket value overwrite bug.
peng-yongsheng opened a new pull request #10: Timebucket value overwrite bug. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/10 Fixed a bug which overwrite the timebucket by the origin value after timebucket transformed. 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 #9: Make the indicator builder to know how to deserialize the complex dat…
wu-sheng closed pull request #9: Make the indicator builder to know how to deserialize the complex dat… URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/9 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/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java index 30a957b..ed7c60d 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java @@ -29,7 +29,7 @@ public IntKeyLongValueArray(int initialCapacity) { super(initialCapacity); } -public IntKeyLongValueArray() { +public IntKeyLongValueArray(String data) { super(); } } diff --git a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl index 0364a74..3aa9747 100644 --- a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl +++ b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl @@ -229,15 +229,19 @@ public class ${metricName}Indicator extends ${indicatorClassName} implements Ala <#list fieldsFromSource as field> <#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> indicator.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); -<#else> +<#elseif field.typeName == "java.lang.String" || field.typeName == "String"> indicator.${field.fieldSetter}((${field.typeName})dbMap.get("${field.columnName}")); +<#else> +indicator.${field.fieldSetter}(new ${field.typeName}((String)dbMap.get("${field.columnName}"))); <#list persistentFields as field> <#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> indicator.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); -<#else> +<#elseif field.typeName == "java.lang.String" || field.typeName == "String"> indicator.${field.fieldSetter}((${field.typeName})dbMap.get("${field.columnName}")); +<#else> +indicator.${field.fieldSetter}(new ${field.typeName}((String)dbMap.get("${field.columnName}"))); return indicator; 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 #9: Make the indicator builder to know how to deserialize the complex dat…
wu-sheng commented on issue #9: Make the indicator builder to know how to deserialize the complex dat… URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/9#issuecomment-423061408 @peng-yongsheng CI needs to be fixed. 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 #9: Make the indicator builder to know how to deserialize the complex dat…
peng-yongsheng opened a new pull request #9: Make the indicator builder to know how to deserialize the complex dat… URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/9 …a type. 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 #8: A new data type for complex data type.
wu-sheng closed pull request #8: A new data type for complex data type. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/8 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/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/AnalysisResult.java b/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/AnalysisResult.java index 2b68f5d..b9b7aa4 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/AnalysisResult.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/AnalysisResult.java @@ -137,7 +137,7 @@ public void generateSerializeFields() { case "long": serializeFields.addLongField(column.getFieldName()); break; -case "List": +case "IntKeyLongValueArray": serializeFields.addIntLongValuePairelistField(column.getFieldName()); break; default: diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java new file mode 100644 index 000..30a957b --- /dev/null +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java @@ -0,0 +1,35 @@ +/* + * 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.oap.server.core.analysis.indicator; + +import java.util.ArrayList; + +/** + * @author peng-yongsheng + */ +public class IntKeyLongValueArray extends ArrayList { + +public IntKeyLongValueArray(int initialCapacity) { +super(initialCapacity); +} + +public IntKeyLongValueArray() { +super(); +} +} diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java index b4ac4c8..033194c 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java @@ -48,14 +48,14 @@ @Getter @Setter @Column(columnName = VALUE) private int value; @Getter @Setter @Column(columnName = PRECISION) private int precision; -@Getter @Setter @Column(columnName = DETAIL_GROUP) private List detailGroup; +@Getter @Setter @Column(columnName = DETAIL_GROUP) private IntKeyLongValueArray detailGroup; private final int percentileRank; private Map detailIndex; public PxxIndicator(int percentileRank) { this.percentileRank = percentileRank; -detailGroup = new ArrayList<>(30); +detailGroup = new IntKeyLongValueArray(30); } @Entrance @@ -105,7 +105,7 @@ public final void calculate() { for (IntKeyLongValue element : detailGroup) { count += element.getValue(); if (count >= roof) { -value = element.getKey(); +value = element.getKey() * precision; return; } } diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java index d5a0a0f..6d440aa 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java @@ -18,9 +18,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import lombok.Getter; import
[GitHub] peng-yongsheng opened a new pull request #8: A new data type for complex data type.
peng-yongsheng opened a new pull request #8: A new data type for complex data type. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/8 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 #7: A new data type for complex data type.
peng-yongsheng closed pull request #7: A new data type for complex data type. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/7 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 a change in pull request #7: A new data type for complex data type.
wu-sheng commented on a change in pull request #7: A new data type for complex data type. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/7#discussion_r217898911 ## File path: oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl ## @@ -54,6 +56,7 @@ public class ServiceInstanceJVMGCDispatcher implements SourceDispatcher +>>> ec8e105709a1377c62448cafe9049e79959827f1 Review comment: Solve the conflicts, please. And your pr in main repo, should include all new generated codes, which shouldn't pass ci based on this. 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 #7: A new data type for complex data type.
peng-yongsheng opened a new pull request #7: A new data type for complex data type. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/7 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 #6: Delete call type from service relation.
wu-sheng closed pull request #6: Delete call type from service relation. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/6 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/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java b/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java index c171290..6b2fce3 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java @@ -18,8 +18,7 @@ package org.apache.skywalking.oal.tool.parser; -import java.util.LinkedList; -import java.util.List; +import java.util.*; public class SourceColumnsFactory { public static List getColumns(String source) { @@ -67,8 +66,6 @@ columnList.add(sourceService); SourceColumn destService = new SourceColumn("destServiceId", "dest_service_id", int.class, true); columnList.add(destService); -SourceColumn callType = new SourceColumn("callType", "call_type", int.class, true); -columnList.add(callType); return columnList; case "ServiceInstanceRelation": columnList = new LinkedList<>(); @@ -85,7 +82,7 @@ columnList = new LinkedList<>(); SourceColumn sourceEndpointColumn = new SourceColumn("endpointId", "endpoint_id", int.class, true); columnList.add(sourceEndpointColumn); -SourceColumn childEndpointColumne = new SourceColumn("childEndpointId", "child_endpoint_id", int.class, true); +SourceColumn childEndpointColumne = new SourceColumn("childEndpointId", "child_endpoint_id", int.class, true); columnList.add(childEndpointColumne); sourceService = new SourceColumn("serviceId", "service_id", int.class, false); columnList.add(sourceService); diff --git a/oal-parser/src/test/resources/oal_test.oal b/oal-parser/src/test/resources/oal_test.oal index bbd1893..8a8ec03 100644 --- a/oal-parser/src/test/resources/oal_test.oal +++ b/oal-parser/src/test/resources/oal_test.oal @@ -22,7 +22,9 @@ ServiceInstance_RespTime= from(ServiceInstance.latency).longAvg(); Service_Calls_Sum = from(Service.*).sum(); -Service_Relation_Calls_Sum = from(ServiceRelation.*).sum(); +Service_Relation_Client_Calls_Sum = from(ServiceRelation.*).filter(detectPoint == DetectPoint.CLIENT).sum(); + +Service_Relation_Server_Calls_Sum = from(ServiceRelation.*).filter(detectPoint == DetectPoint.SERVER).sum(); endpoint_Avg = from(Endpoint.latency).longAvg(); 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 #6: Delete call type from service relation.
peng-yongsheng opened a new pull request #6: Delete call type from service relation. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/6 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 #5: Add sum indicator operator and fixed a service relation columns facto…
wu-sheng closed pull request #5: Add sum indicator operator and fixed a service relation columns facto… URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/5 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/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java b/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java index 1994f5c..c171290 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java @@ -68,7 +68,7 @@ SourceColumn destService = new SourceColumn("destServiceId", "dest_service_id", int.class, true); columnList.add(destService); SourceColumn callType = new SourceColumn("callType", "call_type", int.class, true); -columnList.add(destService); +columnList.add(callType); return columnList; case "ServiceInstanceRelation": columnList = new LinkedList<>(); diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/Indicators.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/Indicators.java index b02f540..0d96cba 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/Indicators.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/Indicators.java @@ -18,12 +18,8 @@ package org.apache.skywalking.oap.server.core; -import java.util.HashMap; -import java.util.Map; -import org.apache.skywalking.oap.server.core.analysis.indicator.DoubleAvgIndicator; -import org.apache.skywalking.oap.server.core.analysis.indicator.LongAvgIndicator; -import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator; -import org.apache.skywalking.oap.server.core.analysis.indicator.PercentIndicator; +import java.util.*; +import org.apache.skywalking.oap.server.core.analysis.indicator.*; public class Indicators { private static Map> REGISTER = new HashMap<>(); @@ -32,6 +28,7 @@ REGISTER.put("longAvg", LongAvgIndicator.class); REGISTER.put("doubleAvg", DoubleAvgIndicator.class); REGISTER.put("percent", PercentIndicator.class); +REGISTER.put("sum", SumIndicator.class); } public static Class find(String functionName) { diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicator.java new file mode 100644 index 000..d5c67d8 --- /dev/null +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicator.java @@ -0,0 +1,47 @@ +/* + * 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.oap.server.core.analysis.indicator; + +import lombok.*; +import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*; +import org.apache.skywalking.oap.server.core.storage.annotation.Column; + +/** + * @author peng-yongsheng + */ +@IndicatorOperator +public abstract class SumIndicator extends Indicator { + +protected static final String VALUE = "value"; + +@Getter @Setter @Column(columnName = VALUE) private long value; + +@Entrance +public final void combine(@ConstOne long count) { +this.value += count; +} + +@Override public final void combine(Indicator indicator) { +SumIndicator sumIndicator = (SumIndicator)indicator; +combine(sumIndicator.value); +} + +@Override public void calculate() { +} +} diff --git a/oal-parser/src/test/resources/oal_test.oal b/oal-parser/src/test/resources/oal_test.oal index 9d90647..bbd1893 100644 --- a/oal-parser/src/test/resources/oal_test.oal +++ b/oal-parser/src/test/resources/oal_test.oal @@ -20,6 +20,10 @@ Service_Avg =
[GitHub] wu-sheng closed pull request #4: Fixed the dispatcher check style error.
wu-sheng closed pull request #4: Fixed the dispatcher check style error. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/4 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/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java index 036f1f5..7fc0d95 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java @@ -18,12 +18,8 @@ package org.apache.skywalking.oap.server.core.analysis.indicator; -import lombok.Getter; -import lombok.Setter; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.ConstOne; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom; +import lombok.*; +import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** @@ -50,4 +46,8 @@ public final void combine(@SourceFrom double summation, @ConstOne int count) { DoubleAvgIndicator longAvgIndicator = (DoubleAvgIndicator)indicator; combine(longAvgIndicator.summation, longAvgIndicator.count); } + +@Override public final void calculate() { +this.value = this.summation / this.count; +} } diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java index b5ba1b8..34b387d 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java @@ -18,9 +18,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator; -import java.util.Map; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** @@ -36,9 +34,5 @@ public abstract void combine(Indicator indicator); -public abstract String name(); - -public abstract Map toMap(); - -public abstract Indicator newOne(Map dbMap); +public abstract void calculate(); } diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java index f98e068..05c56e1 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java @@ -18,12 +18,8 @@ package org.apache.skywalking.oap.server.core.analysis.indicator; -import lombok.Getter; -import lombok.Setter; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.ConstOne; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom; +import lombok.*; +import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** @@ -50,4 +46,8 @@ public final void combine(@SourceFrom long summation, @ConstOne int count) { LongAvgIndicator longAvgIndicator = (LongAvgIndicator)indicator; combine(longAvgIndicator.summation, longAvgIndicator.count); } + +@Override public final void calculate() { +this.value = this.summation / this.count; +} } diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl index 48ef241..92d0ae8 100644 --- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl +++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl @@ -39,7 +39,7 @@ public class ServiceInstanceJVMGCDispatcher implements SourceDispatcher private void do${indicator.metricName}(ServiceInstanceJVMGC source) { -
[GitHub] peng-yongsheng opened a new pull request #4: Fixed the dispatcher check style error.
peng-yongsheng opened a new pull request #4: Fixed the dispatcher check style error. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/4 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 #3: Add calculate method into indicator.
wu-sheng closed pull request #3: Add calculate method into indicator. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/3 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/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java index 036f1f5..7fc0d95 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java @@ -18,12 +18,8 @@ package org.apache.skywalking.oap.server.core.analysis.indicator; -import lombok.Getter; -import lombok.Setter; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.ConstOne; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom; +import lombok.*; +import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** @@ -50,4 +46,8 @@ public final void combine(@SourceFrom double summation, @ConstOne int count) { DoubleAvgIndicator longAvgIndicator = (DoubleAvgIndicator)indicator; combine(longAvgIndicator.summation, longAvgIndicator.count); } + +@Override public final void calculate() { +this.value = this.summation / this.count; +} } diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java index b5ba1b8..34b387d 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java @@ -18,9 +18,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator; -import java.util.Map; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** @@ -36,9 +34,5 @@ public abstract void combine(Indicator indicator); -public abstract String name(); - -public abstract Map toMap(); - -public abstract Indicator newOne(Map dbMap); +public abstract void calculate(); } diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java index f98e068..05c56e1 100644 --- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java +++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java @@ -18,12 +18,8 @@ package org.apache.skywalking.oap.server.core.analysis.indicator; -import lombok.Getter; -import lombok.Setter; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.ConstOne; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator; -import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom; +import lombok.*; +import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** @@ -50,4 +46,8 @@ public final void combine(@SourceFrom long summation, @ConstOne int count) { LongAvgIndicator longAvgIndicator = (LongAvgIndicator)indicator; combine(longAvgIndicator.summation, longAvgIndicator.count); } + +@Override public final void calculate() { +this.value = this.summation / this.count; +} } 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 #3: Add calculate method into indicator.
peng-yongsheng opened a new pull request #3: Add calculate method into indicator. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/3 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 #2: Build the primary key.
wu-sheng closed pull request #2: Build the primary key. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/2 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/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl index 25d56c7..5721686 100644 --- a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl +++ b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl @@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.${packageName}; import java.util.*; import lombok.*; +import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; @@ -42,7 +43,13 @@ public class ${metricName}Indicator extends ${indicatorClassName} { @Override public String id() { -return String.valueOf(id); +String splitJointId = String.valueOf(getTimeBucket()); +<#list fieldsFromSource as sourceField> +<#if sourceField.isID()> +splitJointId += Const.ID_SPLIT + String.valueOf(${sourceField.fieldName}); + + +return splitJointId; } @Override public int hashCode() { diff --git a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java index 323ea61..159de30 100644 --- a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java +++ b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java @@ -20,6 +20,7 @@ import java.util.*; import lombok.*; +import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; @@ -40,7 +41,9 @@ @Setter @Getter @Column(columnName = "id") private int id; @Override public String id() { -return String.valueOf(id); +String splitJointId = String.valueOf(getTimeBucket()); +splitJointId += Const.ID_SPLIT + String.valueOf(id); +return splitJointId; } @Override public int hashCode() { 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 #2: Build the primary key.
peng-yongsheng opened a new pull request #2: Build the primary key. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/2 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 #1: Avoid class cast exception.
wu-sheng closed pull request #1: Avoid class cast exception. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/1 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/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl index ce18bbf..5c0be3e 100644 --- a/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl +++ b/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl @@ -31,7 +31,6 @@ import org.apache.skywalking.oap.server.core.source.Endpoint; */ public class EndpointDispatcher implements SourceDispatcher { - @Override public void dispatch(Endpoint source) { <#list endpointIndicators as indicator> do${indicator.metricName}(source); @@ -49,5 +48,6 @@ public class EndpointDispatcher implements SourceDispatcher { indicator.${indicator.entryMethod.methodName}(<#list indicator.entryMethod.argsExpressions as arg>${arg}<#if arg_has_next>, ); IndicatorProcess.INSTANCE.in(indicator); } + } diff --git a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl index db109b4..25d56c7 100644 --- a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl +++ b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl @@ -56,7 +56,6 @@ public class ${metricName}Indicator extends ${indicatorClassName} { return result; } - @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -78,7 +77,6 @@ public class ${metricName}Indicator extends ${indicatorClassName} { return true; } - @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); <#list serializeFields.stringFields as field> @@ -134,10 +132,18 @@ public class ${metricName}Indicator extends ${indicatorClassName} { @Override public ${metricName}Indicator map2Data(Map dbMap) { ${metricName}Indicator indicator = new ${metricName}Indicator(); <#list fieldsFromSource as field> +<#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + indicator.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); +<#else> indicator.${field.fieldSetter}((${field.typeName})dbMap.get("${field.columnName}")); + <#list persistentFields as field> +<#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + indicator.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); +<#else> indicator.${field.fieldSetter}((${field.typeName})dbMap.get("${field.columnName}")); + return indicator; } diff --git a/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl index 3dc7e21..a7b8239 100644 --- a/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl +++ b/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl @@ -30,6 +30,7 @@ import org.apache.skywalking.oap.server.core.source.Service; * @author Observability Analysis Language code generator */ public class ServiceDispatcher implements SourceDispatcher { + @Override public void dispatch(Service source) { <#list serviceIndicators as indicator> do${indicator.metricName}(source); diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl index d34a19e..bf6635c 100644 --- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl +++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl @@ -30,8 +30,7 @@ import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMCPU; * @author Observability Analysis Language code generator */ public class ServiceInstanceJVMCPUDispatcher implements SourceDispatcher { - - + @Override public void dispatch(ServiceInstanceJVMCPU source) { <#list serviceInstanceJVMCPUIndicators as indicator> do${indicator.metricName}(source); diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
[GitHub] wu-sheng commented on issue #1: Avoid class cast exception.
wu-sheng commented on issue #1: Avoid class cast exception. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/1#issuecomment-414115632 Let's support string. And notice, change template needs to fix test case as well. 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 #1: Avoid class cast exception.
peng-yongsheng opened a new pull request #1: Avoid class cast exception. URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/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] wu-sheng opened a new issue #1009: Provide dependencies management in collector root pom
wu-sheng opened a new issue #1009: Provide dependencies management in collector root pom URL: https://github.com/apache/incubator-skywalking/issues/1009 Because there are a lot of libraries used in collector, and some PRs may add more, in order to manage those well, I proposal to use maven dependencyManagement to list all used libraries and their versions in collector root pom. All modules in collector-* are not allowed to dependency an existed library with given version. Update version should be taken seriously. I hope this could be provided at least before #871 merging. 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 #871: Add elasticSearch-http storage module.
wu-sheng commented on issue #871: Add elasticSearch-http storage module. URL: https://github.com/apache/incubator-skywalking/pull/871#issuecomment-377782373 And conflict need to be fixed. 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 a change in pull request #871: Add elasticSearch-http storage module.
wu-sheng commented on a change in pull request #871: Add elasticSearch-http storage module. URL: https://github.com/apache/incubator-skywalking/pull/871#discussion_r178456099 ## File path: apm-collector/apm-collector-boot/src/main/resources/application.yml ## @@ -34,18 +34,27 @@ ui: host: localhost port: 12800 context_path: / -storage: - elasticsearch: -cluster_name: CollectorDBCluster -cluster_transport_sniffer: true -cluster_nodes: localhost:9300 -index_shards_number: 2 -index_replicas_number: 0 -ttl: 7 #storage: -# h2: -#url: jdbc:h2:tcp://localhost/~/test -#user_name: sa +# elasticsearch: +#cluster_name: elasticsearch +#cluster_transport_sniffer: true +#cluster_nodes: 10.126.94.37:9300 +#index_shards_number: 2 +#index_replicas_number: 0 +#ttl: 7 +#storage: +# elasticsearch-http: +#cluster_name: elasticsearch +#cluster_nodes: 10.126.94.37:9200 +#index_shards_number: 2 +#ssl : false +#index_replicas_number: 0 +#username : admin +#password : admin +storage: + h2: +url: jdbc:h2:tcp://localhost/~/test +user_name: sa Review comment: h2 is not provided in alpha, so we can't use this as default. 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 a change in pull request #871: Add elasticSearch-http storage module.
wu-sheng commented on a change in pull request #871: Add elasticSearch-http storage module. URL: https://github.com/apache/incubator-skywalking/pull/871#discussion_r178456138 ## File path: apm-collector/apm-collector-boot/src/main/resources/application.yml ## @@ -34,18 +34,27 @@ ui: host: localhost port: 12800 context_path: / -storage: - elasticsearch: -cluster_name: CollectorDBCluster -cluster_transport_sniffer: true -cluster_nodes: localhost:9300 -index_shards_number: 2 -index_replicas_number: 0 -ttl: 7 #storage: -# h2: -#url: jdbc:h2:tcp://localhost/~/test -#user_name: sa +# elasticsearch: +#cluster_name: elasticsearch +#cluster_transport_sniffer: true +#cluster_nodes: 10.126.94.37:9300 +#index_shards_number: 2 +#index_replicas_number: 0 +#ttl: 7 +#storage: +# elasticsearch-http: Review comment: Add comment here, to mention this is an incubating feature, and no product use for now. 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