[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718761#comment-16718761 ] ASF GitHub Bot commented on SCB-935: asifdxtreme edited a comment on issue #317: [SCB-935] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446537169 @WillemJiang The Rat report after running it on latest changes is here ``` /saga-web/src/main/resources/saga-frontend/README.md /saga-web/src/main/resources/saga-frontend/angular.json /saga-web/src/main/resources/saga-frontend/package.json /saga-web/src/main/resources/saga-frontend/tsconfig.json /saga-web/src/main/resources/saga-frontend/src/tsconfig.app.json /saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern.svg /saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern_cosmic.svg ``` 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718744#comment-16718744 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on issue #317: [SCB-935] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446537169 @WillemJiang The Rat report after running it on latest changes is here ``` /saga-web/src/main/resources/saga-frontend/README.md /saga-web/src/main/resources/saga-frontend/angular.json /saga-web/src/main/resources/saga-frontend/package.json /saga-web/src/main/resources/saga-frontend/tsconfig.json /saga-web/src/main/resources/saga-frontend/src/index.html /saga-web/src/main/resources/saga-frontend/src/tsconfig.app.json /saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern.svg /saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern_cosmic.svg ``` 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718642#comment-16718642 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on issue #317: [SCB-935] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446512598 > I think we can leave the json and svg files there, but I'm not sure about the scss files. > @asifdxtreme Do you have any idea about that? @WillemJiang these scss files have the License but RAT tool is not able to detect it 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718638#comment-16718638 ] ASF GitHub Bot commented on SCB-935: WillemJiang commented on issue #317: [SCB-935] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446511730 I think we can leave the json and svg files there, but I'm not sure about the scss files. @asifdxtreme Do you have any idea about that? 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1077) upgrade hystrix to 1.5.12
[ https://issues.apache.org/jira/browse/SCB-1077?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718632#comment-16718632 ] ASF GitHub Bot commented on SCB-1077: - coveralls commented on issue #1035: [SCB-1077]upgrade hystrix to 1.5.12 URL: https://github.com/apache/servicecomb-java-chassis/pull/1035#issuecomment-446510840 [![Coverage Status](https://coveralls.io/builds/20589093/badge)](https://coveralls.io/builds/20589093) Coverage increased (+0.01%) to 86.715% when pulling **210581901c9ffb317ecd12866396239008b8cb99 on liubao68:upgrade-hystrix** into **bd6a2c49b7dae7b9ef4929883d6db0cd16a540b3 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > upgrade hystrix to 1.5.12 > - > > Key: SCB-1077 > URL: https://issues.apache.org/jira/browse/SCB-1077 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: liubao >Assignee: liubao >Priority: Major > > upgrade hystrix to 1.5.12 to fix some known issues and vulnerabilities -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1077) upgrade hystrix to 1.5.12
[ https://issues.apache.org/jira/browse/SCB-1077?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718608#comment-16718608 ] ASF GitHub Bot commented on SCB-1077: - liubao68 opened a new pull request #1035: [SCB-1077]upgrade hystrix to 1.5.12 URL: https://github.com/apache/servicecomb-java-chassis/pull/1035 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > upgrade hystrix to 1.5.12 > - > > Key: SCB-1077 > URL: https://issues.apache.org/jira/browse/SCB-1077 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: liubao >Assignee: liubao >Priority: Major > > upgrade hystrix to 1.5.12 to fix some known issues and vulnerabilities -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1076) upgrade guava to 25.1
[ https://issues.apache.org/jira/browse/SCB-1076?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718584#comment-16718584 ] ASF GitHub Bot commented on SCB-1076: - coveralls commented on issue #1033: [SCB-1076]upgrade guava to 25.1 URL: https://github.com/apache/servicecomb-java-chassis/pull/1033#issuecomment-446498987 [![Coverage Status](https://coveralls.io/builds/20588483/badge)](https://coveralls.io/builds/20588483) Coverage remained the same at 86.7% when pulling **1a41d98b7e123d20b9aea43e42a4b92cd20920e5 on liubao68:upgrade-guava** into **bd6a2c49b7dae7b9ef4929883d6db0cd16a540b3 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > upgrade guava to 25.1 > - > > Key: SCB-1076 > URL: https://issues.apache.org/jira/browse/SCB-1076 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: liubao >Assignee: liubao >Priority: Major > > upgrade guava to 25.1 to fix some known issues and vulnerabilities. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1076) upgrade guava to 25.1
[ https://issues.apache.org/jira/browse/SCB-1076?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718567#comment-16718567 ] ASF GitHub Bot commented on SCB-1076: - liubao68 opened a new pull request #1033: [SCB-1076]upgrade guava to 25.1 URL: https://github.com/apache/servicecomb-java-chassis/pull/1033 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > upgrade guava to 25.1 > - > > Key: SCB-1076 > URL: https://issues.apache.org/jira/browse/SCB-1076 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: liubao >Assignee: liubao >Priority: Major > > upgrade guava to 25.1 to fix some known issues and vulnerabilities. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1075) upgrade spring-framework to 4.3.20.RELEASE
[ https://issues.apache.org/jira/browse/SCB-1075?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718558#comment-16718558 ] ASF GitHub Bot commented on SCB-1075: - coveralls commented on issue #1032: [SCB-1075]upgrade spring-framework to 4.3.20.RELEASE URL: https://github.com/apache/servicecomb-java-chassis/pull/1032#issuecomment-446489219 [![Coverage Status](https://coveralls.io/builds/20587906/badge)](https://coveralls.io/builds/20587906) Coverage increased (+0.004%) to 86.704% when pulling **e01a675eddb7481f8c03c41fd658ac10459a74f0 on liubao68:upgrade-spring** into **bd6a2c49b7dae7b9ef4929883d6db0cd16a540b3 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > upgrade spring-framework to 4.3.20.RELEASE > -- > > Key: SCB-1075 > URL: https://issues.apache.org/jira/browse/SCB-1075 > Project: Apache ServiceComb > Issue Type: Improvement >Reporter: liubao >Assignee: liubao >Priority: Major > > This version is lastest stable spring version, and fixed many known issues > and vulnerabilities. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1075) upgrade spring-framework to 4.3.20.RELEASE
[ https://issues.apache.org/jira/browse/SCB-1075?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718530#comment-16718530 ] ASF GitHub Bot commented on SCB-1075: - liubao68 opened a new pull request #1032: [SCB-1075]upgrade spring-framework to 4.3.20.RELEASE URL: https://github.com/apache/servicecomb-java-chassis/pull/1032 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > upgrade spring-framework to 4.3.20.RELEASE > -- > > Key: SCB-1075 > URL: https://issues.apache.org/jira/browse/SCB-1075 > Project: Apache ServiceComb > Issue Type: Improvement >Reporter: liubao >Assignee: liubao >Priority: Major > > This version is lastest stable spring version, and fixed many known issues > and vulnerabilities. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16717122#comment-16717122 ] ASF GitHub Bot commented on SCB-1053: - little-cui closed pull request #508: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508 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/integration/instances_test.go b/integration/instances_test.go index 86976a5e..2f1dbaab 100644 --- a/integration/instances_test.go +++ b/integration/instances_test.go @@ -364,11 +364,27 @@ var _ = Describe("MicroService Api Test", func() { "version": serviceVersion, }, } + notExistsInstance := map[string]interface{}{ + "instance": map[string]interface{}{ + "serviceId": serviceId, + "instanceId": "notexisted", + }, + } + providerInstance := map[string]interface{}{ + "instance": map[string]interface{}{ + "serviceId": serviceId, + "instanceId": serviceInstanceID, + }, + } findRequest := map[string]interface{}{ "services": []map[string]interface{}{ provider, notExistsService, }, + "instances": []map[string]interface{}{ + providerInstance, + notExistsInstance, + }, } body, _ := json.Marshal(findRequest) bodyBuf := bytes.NewReader(body) @@ -378,8 +394,10 @@ var _ = Describe("MicroService Api Test", func() { resp, _ := scclient.Do(req) respbody, _ := ioutil.ReadAll(resp.Body) Expect(resp.StatusCode).To(Equal(http.StatusOK)) - servicesStruct := map[string][]map[string]interface{}{} - json.Unmarshal(respbody, ) + respStruct := map[string]map[string][]map[string]interface{}{} + json.Unmarshal(respbody, ) + servicesStruct := respStruct["services"] + instancesStruct := respStruct["instances"] failed := false for _, services := range servicesStruct["failed"] { a := services["indexes"].([]interface{})[0] == 1.0 @@ -393,6 +411,19 @@ var _ = Describe("MicroService Api Test", func() { Expect(servicesStruct["updated"][0]["index"]).To(Equal(0.0)) Expect(len(servicesStruct["updated"][0]["instances"].([]interface{}))). ToNot(Equal(0)) + failed = false + for _, instances := range instancesStruct["failed"] { + a := instances["indexes"].([]interface{})[0] == 1.0 + b := instances["error"].(map[string]interface{})["errorCode"] == "400017" + if a && b { + failed = true + break + } + } + Expect(failed).To(Equal(true)) + Expect(instancesStruct["updated"][0]["index"]).To(Equal(0.0)) + Expect(len(instancesStruct["updated"][0]["instances"].([]interface{}))). + ToNot(Equal(0)) }) }) diff --git a/server/core/proto/batch_find.go b/server/core/proto/batch_find.go index 16eb99cc..fc020213 100644 --- a/server/core/proto/batch_find.go +++ b/server/core/proto/batch_find.go @@
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716955#comment-16716955 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on issue #317: [SCB-935] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446179174 @WillemJiang After running RAT tool on this code below are the list of files which shows abnormal license eventhough licenses has been added in *.scss files ``` saga-web/src/main/resources/saga-frontend/README.md saga-web/src/main/resources/saga-frontend/angular.json saga-web/src/main/resources/saga-frontend/package.json saga-web/src/main/resources/saga-frontend/tsconfig.json saga-web/src/main/resources/saga-frontend/src/index.html saga-web/src/main/resources/saga-frontend/src/tsconfig.app.json saga-web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/bootstrap-rtl.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/font-size.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/pace.theme.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/styles.scss saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/themes.scss saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.scss saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern.svg saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern_cosmic.svg ``` Please confirm if we can go ahead with it? 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716914#comment-16716914 ] ASF GitHub Bot commented on SCB-935: anvithks commented on a change in pull request #317: [SCB-935] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240580003 ## File path: saga-web/src/main/resources/saga-frontend/src/app/@core/core.module.ts ## @@ -0,0 +1,75 @@ +import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; Review comment: Updated the files with appropriate license information. 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716887#comment-16716887 ] ASF GitHub Bot commented on SCB-1053: - coveralls edited a comment on issue #508: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508#issuecomment-445459468 [![Coverage Status](https://coveralls.io/builds/20568359/badge)](https://coveralls.io/builds/20568359) Coverage increased (+0.2%) to 61.827% when pulling **1b4bf1ba310c9b69211b9feeb0324aa0c3b6fd1f on little-cui:find** into **fad2b5811f0476069fdfd68e65d14e7b2c81941a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716885#comment-16716885 ] ASF GitHub Bot commented on SCB-1053: - codecov-io edited a comment on issue #508: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508#issuecomment-445459421 # [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=h1) Report > Merging [#508](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=desc) into [master](https://codecov.io/gh/apache/servicecomb-service-center/commit/fad2b5811f0476069fdfd68e65d14e7b2c81941a?src=pr=desc) will **increase** coverage by `0.1%`. > The diff coverage is `67.68%`. [![Impacted file tree graph](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/graphs/tree.svg?width=650=GAaF7zrg8R=150=pr)](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=tree) ```diff @@Coverage Diff@@ ## master #508 +/- ## = + Coverage 59.31% 59.42% +0.1% = Files 166 166 Lines 1394414050+106 = + Hits 8271 8349 +78 - Misses 5088 5110 +22 - Partials 585 591 +6 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/service/util/instance\_util.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC9pbnN0YW5jZV91dGlsLmdv) | `51.91% <100%> (ø)` | :arrow_up: | | [server/service/instance\_validator.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvaW5zdGFuY2VfdmFsaWRhdG9yLmdv) | `100% <100%> (ø)` | :arrow_up: | | [server/service/instance.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvaW5zdGFuY2UuZ28=) | `68.2% <66.24%> (-0.05%)` | :arrow_down: | | [server/plugin/pkg/registry/etcd/tracing.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvcmVnaXN0cnkvZXRjZC90cmFjaW5nLmdv) | `72.72% <0%> (-9.1%)` | :arrow_down: | | [server/service/util/domain\_util.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC9kb21haW5fdXRpbC5nbw==) | `59.7% <0%> (-1.5%)` | :arrow_down: | | [scctl/pkg/plugin/diagnose/compare\_holder.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2NjdGwvcGtnL3BsdWdpbi9kaWFnbm9zZS9jb21wYXJlX2hvbGRlci5nbw==) | `94.87% <0%> (-1.29%)` | :arrow_down: | | [server/govern/service.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL2dvdmVybi9zZXJ2aWNlLmdv) | `72.6% <0%> (-0.34%)` | :arrow_down: | | [server/plugin/pkg/registry/etcd/etcd.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvcmVnaXN0cnkvZXRjZC9ldGNkLmdv) | `86.36% <0%> (+0.18%)` | :arrow_up: | | [server/service/notification/listwatcher.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL2xpc3R3YXRjaGVyLmdv) | `78.87% <0%> (+9.85%)` | :arrow_up: | | [server/service/util/util.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC91dGlsLmdv) | `90% <0%> (+10%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=footer). Last update [fad2b58...1b4bf1b](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). 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 > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL:
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716858#comment-16716858 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on a change in pull request #317: [SCB-935] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240569511 ## File path: saga-web/src/main/resources/saga-frontend/LICENSE ## @@ -0,0 +1,21 @@ +The MIT License (MIT) Review comment: @anvithks We can remove this license now, this will now be added as a part of release/license 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716789#comment-16716789 ] ASF GitHub Bot commented on SCB-935: anvithks commented on issue #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446149723 > ### // TODO (Mandatory before the PR merge) > For New dependencies following things should be done > > * [*] Add the license copies in this [directory](https://github.com/apache/incubator-servicecomb-saga/tree/master/saga-distribution/src/release/licenses) > * [*] Add the Usage information over [here](https://github.com/apache/incubator-servicecomb-saga/blob/master/saga-distribution/src/release/NOTICE) > * [*] Add the Usage information with the version number over [here](https://github.com/apache/incubator-servicecomb-saga/blob/master/saga-distribution/src/release/LICENSE) @asifdxtreme these are 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1074) minor fixes for mistakes and logs
[ https://issues.apache.org/jira/browse/SCB-1074?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716417#comment-16716417 ] ASF GitHub Bot commented on SCB-1074: - coveralls commented on issue #1030: [SCB-1074]minor fixes for mistakes and logs URL: https://github.com/apache/servicecomb-java-chassis/pull/1030#issuecomment-446102882 [![Coverage Status](https://coveralls.io/builds/20564938/badge)](https://coveralls.io/builds/20564938) Coverage decreased (-0.02%) to 86.68% when pulling **677a2445e193407d22f8f08b7c6b789073d8a660 on liubao68:fix_version** into **bd6a2c49b7dae7b9ef4929883d6db0cd16a540b3 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > minor fixes for mistakes and logs > - > > Key: SCB-1074 > URL: https://issues.apache.org/jira/browse/SCB-1074 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: liubao >Assignee: liubao >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716410#comment-16716410 ] ASF GitHub Bot commented on SCB-935: WillemJiang commented on issue #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446100487 > > @anvithks As there are bunch of code in this PR, do you mind fill [an iCLA ](https://www.apache.org/licenses/icla.pdf) first. I'd happy merge it into the repository once receiving the iCLA notification. > > I remember I have already sent ICLA of anvith sometime back I found the iCLA acknowledge mail. The PR is good to go. 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1074) minor fixes for mistakes and logs
[ https://issues.apache.org/jira/browse/SCB-1074?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716395#comment-16716395 ] ASF GitHub Bot commented on SCB-1074: - liubao68 opened a new pull request #1030: [SCB-1074]minor fixes for mistakes and logs URL: https://github.com/apache/servicecomb-java-chassis/pull/1030 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > minor fixes for mistakes and logs > - > > Key: SCB-1074 > URL: https://issues.apache.org/jira/browse/SCB-1074 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: liubao >Assignee: liubao >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716399#comment-16716399 ] ASF GitHub Bot commented on SCB-1053: - coveralls edited a comment on issue #508: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508#issuecomment-445459468 [![Coverage Status](https://coveralls.io/builds/20564698/badge)](https://coveralls.io/builds/20564698) Coverage increased (+0.3%) to 61.903% when pulling **9bfce2f60a0dc28e491811682048fa090047993e on little-cui:find** into **fad2b5811f0476069fdfd68e65d14e7b2c81941a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716398#comment-16716398 ] ASF GitHub Bot commented on SCB-1053: - codecov-io edited a comment on issue #508: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508#issuecomment-445459421 # [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=h1) Report > Merging [#508](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=desc) into [master](https://codecov.io/gh/apache/servicecomb-service-center/commit/fad2b5811f0476069fdfd68e65d14e7b2c81941a?src=pr=desc) will **increase** coverage by `0.1%`. > The diff coverage is `68.7%`. [![Impacted file tree graph](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/graphs/tree.svg?width=650=GAaF7zrg8R=150=pr)](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=tree) ```diff @@Coverage Diff@@ ## master #508 +/- ## = + Coverage 59.31% 59.42% +0.1% = Files 166 166 Lines 1394414036 +92 = + Hits 8271 8341 +70 - Misses 5088 5108 +20 - Partials 585 587 +2 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/service/util/instance\_util.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC9pbnN0YW5jZV91dGlsLmdv) | `51.91% <100%> (ø)` | :arrow_up: | | [server/service/instance\_validator.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvaW5zdGFuY2VfdmFsaWRhdG9yLmdv) | `100% <100%> (ø)` | :arrow_up: | | [server/service/instance.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvaW5zdGFuY2UuZ28=) | `68.13% <67.14%> (-0.12%)` | :arrow_down: | | [server/plugin/pkg/registry/etcd/tracing.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvcmVnaXN0cnkvZXRjZC90cmFjaW5nLmdv) | `72.72% <0%> (-9.1%)` | :arrow_down: | | [scctl/pkg/plugin/diagnose/compare\_holder.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2NjdGwvcGtnL3BsdWdpbi9kaWFnbm9zZS9jb21wYXJlX2hvbGRlci5nbw==) | `94.87% <0%> (-1.29%)` | :arrow_down: | | [server/broker/util.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL2Jyb2tlci91dGlsLmdv) | `53.47% <0%> (+0.26%)` | :arrow_up: | | [...erver/plugin/pkg/tracing/buildin/file\_collector.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvdHJhY2luZy9idWlsZGluL2ZpbGVfY29sbGVjdG9yLmdv) | `64.07% <0%> (+0.97%)` | :arrow_up: | | [server/service/notification/listwatcher.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL2xpc3R3YXRjaGVyLmdv) | `78.87% <0%> (+9.85%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=footer). Last update [fad2b58...9bfce2f](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). 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 > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716351#comment-16716351 ] ASF GitHub Bot commented on SCB-1053: - coveralls edited a comment on issue #508: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508#issuecomment-445459468 [![Coverage Status](https://coveralls.io/builds/20564336/badge)](https://coveralls.io/builds/20564336) Coverage increased (+0.2%) to 61.881% when pulling **0a9a98a37bf236d215c10c40f87af96b56501c42 on little-cui:find** into **fad2b5811f0476069fdfd68e65d14e7b2c81941a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716335#comment-16716335 ] ASF GitHub Bot commented on SCB-935: asifdxtreme edited a comment on issue #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446087045 > @anvithks As there are bunch of code in this PR, do you mind fill [an iCLA ](https://www.apache.org/licenses/icla.pdf) first. I'd happy merge it into the repository once receiving the iCLA notification. I remember I have already sent ICLA of anvith sometime back 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716334#comment-16716334 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on issue #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446087045 > @anvithks As there are bunch of code in this PR, do you mind fill [an iCLA ](https://www.apache.org/licenses/icla.pdf) first. I'd happy merge it into the repository once receiving the iCLA notification. I remember I have already sent ICLA of anvith 1 month back 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716301#comment-16716301 ] ASF GitHub Bot commented on SCB-935: WillemJiang commented on issue #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-446083448 @anvithks As there are bunch of code in this PR, do you mind fill [an iCLA ](https://www.apache.org/licenses/icla.pdf) first. I'd happy merge it into the repository once receiving the iCLA notification. 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1073) StaticMicroserviceVersions should be ignored while checking instance cache
[ https://issues.apache.org/jira/browse/SCB-1073?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716082#comment-16716082 ] ASF GitHub Bot commented on SCB-1073: - coveralls commented on issue #1029: [SCB-1073] InstanceCacheChecker should ignore StaticMicroserviceVersions URL: https://github.com/apache/servicecomb-java-chassis/pull/1029#issuecomment-446060416 [![Coverage Status](https://coveralls.io/builds/20562763/badge)](https://coveralls.io/builds/20562763) Coverage increased (+0.02%) to 86.719% when pulling **b56d29c1e7c885e6644e9d57a27c7cc6627272c7 on yhs0092:instance_cache_check_ignore_StaticMicroserviceVersions** into **bd6a2c49b7dae7b9ef4929883d6db0cd16a540b3 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > StaticMicroserviceVersions should be ignored while checking instance cache > -- > > Key: SCB-1073 > URL: https://issues.apache.org/jira/browse/SCB-1073 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: YaoHaishi >Assignee: YaoHaishi >Priority: Minor > Fix For: java-chassis-1.2.0 > > > Currently when instance cache checking mechanism is triggered, the locally > registered 3rd party services are also checked. As a result, an error message > is generated, indicating that the 3rd party services don't exist in service > center. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1073) StaticMicroserviceVersions should be ignored while checking instance cache
[ https://issues.apache.org/jira/browse/SCB-1073?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16716046#comment-16716046 ] ASF GitHub Bot commented on SCB-1073: - yhs0092 opened a new pull request #1029: [SCB-1073] InstanceCacheChecker should ignore StaticMicroserviceVersions URL: https://github.com/apache/servicecomb-java-chassis/pull/1029 Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [x] Each commit in the pull request should have a meaningful subject line and body. - [x] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [x] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- See details in [SCB-1073](https://issues.apache.org/jira/browse/SCB-1073) 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 > StaticMicroserviceVersions should be ignored while checking instance cache > -- > > Key: SCB-1073 > URL: https://issues.apache.org/jira/browse/SCB-1073 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: YaoHaishi >Assignee: YaoHaishi >Priority: Minor > Fix For: java-chassis-1.2.0 > > > Currently when instance cache checking mechanism is triggered, the locally > registered 3rd party services are also checked. As a result, an error message > is generated, indicating that the 3rd party services don't exist in service > center. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1046) file upload support file array for the same name
[ https://issues.apache.org/jira/browse/SCB-1046?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16715881#comment-16715881 ] ASF GitHub Bot commented on SCB-1046: - coveralls edited a comment on issue #1028: [SCB-1046] file upload support file array for the same name URL: https://github.com/apache/servicecomb-java-chassis/pull/1028#issuecomment-445478940 [![Coverage Status](https://coveralls.io/builds/20561025/badge)](https://coveralls.io/builds/20561025) Coverage decreased (-0.02%) to 86.679% when pulling **47fd0ba369ca7a9f5c2c962b014e77c665cbf6f2 on heyile:fileUploadArray** into **bd6a2c49b7dae7b9ef4929883d6db0cd16a540b3 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > file upload support file array for the same name > > > Key: SCB-1046 > URL: https://issues.apache.org/jira/browse/SCB-1046 > Project: Apache ServiceComb > Issue Type: Task > Components: Java-Chassis >Reporter: wujimin >Assignee: 何一乐 >Priority: Major > > should test for both vertx and servlet > for vertx: > 1.modify > org.apache.servicecomb.foundation.vertx.http.VertxServerRequestToHttpServletRequest > to add override method: public Collection getParts() > 2.modify > org.apache.servicecomb.common.rest.codec.param.FormProcessorCreator.PartProcessor > to support file array -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1072) change dependency management version to project.version
[ https://issues.apache.org/jira/browse/SCB-1072?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714646#comment-16714646 ] ASF GitHub Bot commented on SCB-1072: - liubao68 closed pull request #1027: [SCB-1072]change dependency management version to project.version URL: https://github.com/apache/servicecomb-java-chassis/pull/1027 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/demo/demo-edge/business-1.0.0/pom.xml b/demo/demo-edge/business-1.0.0/pom.xml index 21387c0df..1d937ec25 100644 --- a/demo/demo-edge/business-1.0.0/pom.xml +++ b/demo/demo-edge/business-1.0.0/pom.xml @@ -47,7 +47,7 @@ org.apache.servicecomb.demo model - 1.2.0-SNAPSHOT + ${project.version} diff --git a/demo/demo-jaxrs/jaxrs-server/pom.xml b/demo/demo-jaxrs/jaxrs-server/pom.xml index 63923a9e8..b55f93048 100644 --- a/demo/demo-jaxrs/jaxrs-server/pom.xml +++ b/demo/demo-jaxrs/jaxrs-server/pom.xml @@ -63,7 +63,7 @@ org.apache.servicecomb.demo docker-build-config - 1.2.0-SNAPSHOT + ${project.version} diff --git a/demo/demo-multiple/multiple-client/pom.xml b/demo/demo-multiple/multiple-client/pom.xml index 6ee33207b..dc31b1501 100644 --- a/demo/demo-multiple/multiple-client/pom.xml +++ b/demo/demo-multiple/multiple-client/pom.xml @@ -50,7 +50,7 @@ org.apache.servicecomb.demo docker-run-config - 1.2.0-SNAPSHOT + ${project.version} diff --git a/demo/demo-multiple/multiple-server/pom.xml b/demo/demo-multiple/multiple-server/pom.xml index 2ff1ba8c9..e4ef0b89c 100644 --- a/demo/demo-multiple/multiple-server/pom.xml +++ b/demo/demo-multiple/multiple-server/pom.xml @@ -50,7 +50,7 @@ org.apache.servicecomb.demo docker-build-config - 1.2.0-SNAPSHOT + ${project.version} diff --git a/demo/demo-multiple/pom.xml b/demo/demo-multiple/pom.xml index 382e4531b..4758080c1 100644 --- a/demo/demo-multiple/pom.xml +++ b/demo/demo-multiple/pom.xml @@ -41,22 +41,22 @@ org.apache.servicecomb.demo a-server -1.2.0-SNAPSHOT +${project.version} org.apache.servicecomb.demo a-client -1.2.0-SNAPSHOT +${project.version} org.apache.servicecomb.demo b-server -1.2.0-SNAPSHOT +${project.version} org.apache.servicecomb.demo b-client -1.2.0-SNAPSHOT +${project.version} diff --git a/demo/demo-pojo/pojo-client/pom.xml b/demo/demo-pojo/pojo-client/pom.xml index 2c295b2d8..3bdc880c1 100644 --- a/demo/demo-pojo/pojo-client/pom.xml +++ b/demo/demo-pojo/pojo-client/pom.xml @@ -60,7 +60,7 @@ org.apache.servicecomb.demo docker-run-config - 1.2.0-SNAPSHOT + ${project.version} diff --git a/demo/demo-pojo/pojo-server/pom.xml b/demo/demo-pojo/pojo-server/pom.xml index d2a9d7eed..210b7223e 100644 --- a/demo/demo-pojo/pojo-server/pom.xml +++ b/demo/demo-pojo/pojo-server/pom.xml @@ -55,7 +55,7 @@ org.apache.servicecomb.demo docker-build-config - 1.2.0-SNAPSHOT + ${project.version} diff --git a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/pom.xml b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/pom.xml index 7cfc5b040..c53a954de 100644 --- a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/pom.xml +++ b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/pom.xml @@ -51,7 +51,7 @@ org.apache.servicecomb.demo docker-run-config - 1.2.0-SNAPSHOT + ${project.version} diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml index a1f91c488..e6d93cb8e 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml @@ -67,7 +67,7 @@ org.apache.servicecomb.demo docker-build-config - 1.2.0-SNAPSHOT + ${project.version} diff --git
[jira] [Commented] (SCB-946) serialize/deseriaze List>/List>/Map>/Map>
[ https://issues.apache.org/jira/browse/SCB-946?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714645#comment-16714645 ] ASF GitHub Bot commented on SCB-946: liubao68 closed pull request #1025: [SCB-946] serialize/deseriaze List>/List>/Map>/Map> URL: https://github.com/apache/servicecomb-java-chassis/pull/1025 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/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/ProtoMapper.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/ProtoMapper.java index 860a9f6f0..0af2afb88 100644 --- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/ProtoMapper.java +++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/ProtoMapper.java @@ -20,7 +20,9 @@ import java.util.Map; import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; +import org.apache.servicecomb.foundation.protobuf.internal.RootPropertyWrapDeserializer; import org.apache.servicecomb.foundation.protobuf.internal.bean.BeanDescriptorManager; +import org.apache.servicecomb.foundation.protobuf.internal.bean.PropertyWrapper; import org.apache.servicecomb.foundation.protobuf.internal.schema.deserializer.DeserializerSchemaManager; import org.apache.servicecomb.foundation.protobuf.internal.schema.serializer.SerializerSchemaManager; @@ -105,4 +107,17 @@ public RootDeserializer createRootDeserializer(JavaType javaType, String shortMe public RootDeserializer createRootDeserializer(JavaType javaType, Message message) { return deserializerSchemaManager.createRootDeserializer(javaType, message); } + + public RootDeserializer createPropertyRootDeserializer(String shortWrapMessageName, Type propertyType) { +Message message = proto.getMessage(shortWrapMessageName); +if (!deserializerSchemaManager.isWrapProperty(message)) { + return createRootDeserializer(propertyType, shortWrapMessageName); +} + +JavaType propertyWrapJavaType = TypeFactory.defaultInstance().constructParametricType( +PropertyWrapper.class, +TypeFactory.defaultInstance().constructType(propertyType)); +RootDeserializer rootDeserializer = createRootDeserializer(propertyWrapJavaType, message); +return new RootPropertyWrapDeserializer(rootDeserializer); + } } diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/ProtoConst.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/ProtoConst.java index 53ec0c2f6..72f376490 100644 --- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/ProtoConst.java +++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/ProtoConst.java @@ -30,6 +30,8 @@ private ProtoConst() { } + public static String ANNOTATION_WRAP_PROPERTY = "@WrapProperty"; + public static String OP_HINT = " scb:"; public static String PACK_SCHEMA = "type.googleapis.com/"; diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/RootPropertyWrapDeserializer.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/RootPropertyWrapDeserializer.java new file mode 100644 index 0..ab646993e --- /dev/null +++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/RootPropertyWrapDeserializer.java @@ -0,0 +1,37 @@ +/* + * 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.servicecomb.foundation.protobuf.internal; + +import java.io.IOException; + +import org.apache.servicecomb.foundation.protobuf.RootDeserializer; +import
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714635#comment-16714635 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240185287 ## File path: saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/styles.scss ## @@ -0,0 +1,31 @@ +// themes - our custom or/and out of the box themes Review comment: License header is missing in this file 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714502#comment-16714502 ] ASF GitHub Bot commented on SCB-935: anvithks commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240142983 ## File path: saga-web/src/main/resources/saga-frontend/README.md ## @@ -0,0 +1,87 @@ +[![Build Status](https://travis-ci.org/akveo/ngx-admin.svg?branch=master)](https://travis-ci.org/akveo/ngx-admin) Review comment: @asifdxtreme 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714446#comment-16714446 ] ASF GitHub Bot commented on SCB-935: anvithks commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240124330 ## File path: saga-demo/saga-servicecomb-demo/docker-compose.yaml ## @@ -32,10 +32,12 @@ services: retries: 5 alpha: -image: "alpha-server:${TAG}" +image: "asifdiatm/alpha-server" Review comment: @asifdxtreme 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714445#comment-16714445 ] ASF GitHub Bot commented on SCB-935: anvithks commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240124270 ## File path: saga-web/src/main/resources/saga-frontend/src/app/app.module.ts ## @@ -0,0 +1,38 @@ +/** + * @license + * Copyright Akveo. All Rights Reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + */ Review comment: @asifdxtreme @WillemJiang I have added ASF headers to all files written by me. Any files that were used from the framework are under the MIT license. The text has been added as per Asif's comment above to the files that we have not modified. 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714441#comment-16714441 ] ASF GitHub Bot commented on SCB-935: anvithks commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240123832 ## File path: saga-web/src/main/resources/saga-frontend/src/app/@core/utils/util.service.ts ## @@ -0,0 +1,116 @@ +import { Injectable } from '@angular/core'; +import { ToasterService, ToasterConfig, Toast, BodyOutputType } from 'angular2-toaster'; +import 'style-loader!angular2-toaster/toaster.css'; + +@Injectable({ + providedIn: 'root' +}) +export class UtilService { + + constructor(private toasterService: ToasterService) { } + + config: ToasterConfig; + + positions = 'toast-bottom-right'; + animationType = 'fade'; + timeout = 5000; + toastsLimit = 5; + + isNewestOnTop = true; + isHideOnClick = true; + isDuplicatesPrevented = false; + isCloseButton = true; + +/* types: string[] = ['default', 'info', 'success', 'warning', 'error']; Review comment: @asifdxtreme 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714442#comment-16714442 ] ASF GitHub Bot commented on SCB-935: anvithks commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240123870 ## File path: saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.scss ## @@ -0,0 +1,179 @@ +@import '../../styles/themes'; +@import '~bootstrap/scss/mixins/breakpoints'; +@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; + +@include nb-install-component() { + nb-layout-column.small { +flex: 0.15 !important; + } + + nb-sidebar.settings-sidebar { +$sidebar-width: 7.5rem; + +transition: width 0.3s ease; +width: $sidebar-width; +overflow: hidden; + +&.collapsed { + width: 0; + + /deep/ .main-container { +width: 0; + +.scrollable { + width: $sidebar-width; + padding: 1.25rem; +} + } +} + +/deep/ .main-container { + width: $sidebar-width; + background: nb-theme(color-bg); + transition: width 0.3s ease; + overflow: hidden; + + .scrollable { +width: $sidebar-width; + } + + @include nb-for-theme(cosmic) { +background: nb-theme(layout-bg); + } +} + } + + nb-sidebar.menu-sidebar { + +margin-top: nb-theme(sidebar-header-gap); + +@include nb-for-theme(corporate) { + margin-top: 0; +} + +/deep/ .main-container { + height: +calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important; + @include nb-ltr(border-top-right-radius, nb-theme(radius)); + @include nb-rtl(border-top-left-radius, nb-theme(radius)); + + @include nb-for-theme(corporate) { +border: 1px solid nb-theme(separator); +height: + calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important; + } +} + +/deep/ .scrollable { + @include nb-for-theme(corporate) { +padding-top: 0; + +.menu-item:first-child { + border-top: none; +} + } +} + +/deep/ nb-sidebar-header { + padding-bottom: 0.5rem; + text-align: center; +} + +background: transparent; + +.main-btn { + padding: 0.75rem 2.5rem; + margin-top: -2rem; + font-weight: bold; + transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48); + + @include nb-for-theme(corporate) { +border-radius: nb-theme(radius); + } + + i { +font-size: 2rem; +text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + } + span { +@include nb-ltr(padding-left, 0.25rem); +@include nb-rtl(padding-right, 0.25rem); + } + + i, span { +vertical-align: middle; + } +} + +/deep/ nb-menu { + & > .menu-items { +& > .menu-item:first-child { + .menu-title { +/* &::after { Review comment: @asifdxtreme 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714438#comment-16714438 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240123124 ## File path: saga-demo/saga-servicecomb-demo/docker-compose.yaml ## @@ -32,10 +32,12 @@ services: retries: 5 alpha: -image: "alpha-server:${TAG}" +image: "asifdiatm/alpha-server" Review comment: Remove this change 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714353#comment-16714353 ] ASF GitHub Bot commented on SCB-935: WillemJiang commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240096295 ## File path: saga-web/src/main/resources/saga-frontend/src/app/app.module.ts ## @@ -0,0 +1,38 @@ +/** + * @license + * Copyright Akveo. All Rights Reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + */ Review comment: Yes, we need to keep the license there. That is why I added the comments month ago. "I need to know if this file is generated or write by hand. If it is write by hand we need to apply the apache License header here. If not, we should find a right way to specify the license." 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714349#comment-16714349 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240093816 ## File path: saga-web/src/main/resources/saga-frontend/README.md ## @@ -0,0 +1,87 @@ +[![Build Status](https://travis-ci.org/akveo/ngx-admin.svg?branch=master)](https://travis-ci.org/akveo/ngx-admin) Review comment: Update this file with saga frontend information 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714347#comment-16714347 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240094049 ## File path: saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.scss ## @@ -0,0 +1,179 @@ +@import '../../styles/themes'; +@import '~bootstrap/scss/mixins/breakpoints'; +@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; + +@include nb-install-component() { + nb-layout-column.small { +flex: 0.15 !important; + } + + nb-sidebar.settings-sidebar { +$sidebar-width: 7.5rem; + +transition: width 0.3s ease; +width: $sidebar-width; +overflow: hidden; + +&.collapsed { + width: 0; + + /deep/ .main-container { +width: 0; + +.scrollable { + width: $sidebar-width; + padding: 1.25rem; +} + } +} + +/deep/ .main-container { + width: $sidebar-width; + background: nb-theme(color-bg); + transition: width 0.3s ease; + overflow: hidden; + + .scrollable { +width: $sidebar-width; + } + + @include nb-for-theme(cosmic) { +background: nb-theme(layout-bg); + } +} + } + + nb-sidebar.menu-sidebar { + +margin-top: nb-theme(sidebar-header-gap); + +@include nb-for-theme(corporate) { + margin-top: 0; +} + +/deep/ .main-container { + height: +calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important; + @include nb-ltr(border-top-right-radius, nb-theme(radius)); + @include nb-rtl(border-top-left-radius, nb-theme(radius)); + + @include nb-for-theme(corporate) { +border: 1px solid nb-theme(separator); +height: + calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important; + } +} + +/deep/ .scrollable { + @include nb-for-theme(corporate) { +padding-top: 0; + +.menu-item:first-child { + border-top: none; +} + } +} + +/deep/ nb-sidebar-header { + padding-bottom: 0.5rem; + text-align: center; +} + +background: transparent; + +.main-btn { + padding: 0.75rem 2.5rem; + margin-top: -2rem; + font-weight: bold; + transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48); + + @include nb-for-theme(corporate) { +border-radius: nb-theme(radius); + } + + i { +font-size: 2rem; +text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + } + span { +@include nb-ltr(padding-left, 0.25rem); +@include nb-rtl(padding-right, 0.25rem); + } + + i, span { +vertical-align: middle; + } +} + +/deep/ nb-menu { + & > .menu-items { +& > .menu-item:first-child { + .menu-title { +/* &::after { Review comment: remove commented code 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714348#comment-16714348 ] ASF GitHub Bot commented on SCB-935: asifdxtreme commented on a change in pull request #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#discussion_r240093903 ## File path: saga-web/src/main/resources/saga-frontend/src/app/@core/utils/util.service.ts ## @@ -0,0 +1,116 @@ +import { Injectable } from '@angular/core'; +import { ToasterService, ToasterConfig, Toast, BodyOutputType } from 'angular2-toaster'; +import 'style-loader!angular2-toaster/toaster.css'; + +@Injectable({ + providedIn: 'root' +}) +export class UtilService { + + constructor(private toasterService: ToasterService) { } + + config: ToasterConfig; + + positions = 'toast-bottom-right'; + animationType = 'fade'; + timeout = 5000; + toastsLimit = 5; + + isNewestOnTop = true; + isHideOnClick = true; + isDuplicatesPrevented = false; + isCloseButton = true; + +/* types: string[] = ['default', 'info', 'success', 'warning', 'error']; Review comment: remove commented code 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-935) ServiceComb Saga Frontend
[ https://issues.apache.org/jira/browse/SCB-935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16714204#comment-16714204 ] ASF GitHub Bot commented on SCB-935: WillemJiang commented on issue #317: [SCB-935] [WIP] Saga transaction management console UI initial commit URL: https://github.com/apache/servicecomb-pack/pull/317#issuecomment-445617512 @anvithks @asifdxtreme We are plan to do the release of ServiceComb at the end of this month, Please update the License header ASAP. 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 > ServiceComb Saga Frontend > - > > Key: SCB-935 > URL: https://issues.apache.org/jira/browse/SCB-935 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Saga >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > > Develop new ServiceComb Saga Frontend based on the design over here > https://cwiki.apache.org/confluence/display/SERVICECOMB/ServiceComb+Saga+Frontend -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1046) file upload support file array for the same name
[ https://issues.apache.org/jira/browse/SCB-1046?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713748#comment-16713748 ] ASF GitHub Bot commented on SCB-1046: - coveralls commented on issue #1028: [SCB-1046] file upload support file array for the same name URL: https://github.com/apache/servicecomb-java-chassis/pull/1028#issuecomment-445478940 [![Coverage Status](https://coveralls.io/builds/20527649/badge)](https://coveralls.io/builds/20527649) Coverage decreased (-0.05%) to 86.676% when pulling **dcd17d42340f6a41a33ccdd9f038f6359f66bfbd on heyile:fileUploadArray** into **3f2d3da028cf11eb52516c7710671236c4fc102f on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > file upload support file array for the same name > > > Key: SCB-1046 > URL: https://issues.apache.org/jira/browse/SCB-1046 > Project: Apache ServiceComb > Issue Type: Task > Components: Java-Chassis >Reporter: wujimin >Assignee: 何一乐 >Priority: Major > > should test for both vertx and servlet > for vertx: > 1.modify > org.apache.servicecomb.foundation.vertx.http.VertxServerRequestToHttpServletRequest > to add override method: public Collection getParts() > 2.modify > org.apache.servicecomb.common.rest.codec.param.FormProcessorCreator.PartProcessor > to support file array -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1046) file upload support file array for the same name
[ https://issues.apache.org/jira/browse/SCB-1046?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713747#comment-16713747 ] ASF GitHub Bot commented on SCB-1046: - heyile opened a new pull request #1028: [SCB-1046] file upload support file array for the same name URL: https://github.com/apache/servicecomb-java-chassis/pull/1028 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > file upload support file array for the same name > > > Key: SCB-1046 > URL: https://issues.apache.org/jira/browse/SCB-1046 > Project: Apache ServiceComb > Issue Type: Task > Components: Java-Chassis >Reporter: wujimin >Assignee: 何一乐 >Priority: Major > > should test for both vertx and servlet > for vertx: > 1.modify > org.apache.servicecomb.foundation.vertx.http.VertxServerRequestToHttpServletRequest > to add override method: public Collection getParts() > 2.modify > org.apache.servicecomb.common.rest.codec.param.FormProcessorCreator.PartProcessor > to support file array -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713676#comment-16713676 ] ASF GitHub Bot commented on SCB-1053: - coveralls commented on issue #508: WIP: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508#issuecomment-445459468 [![Coverage Status](https://coveralls.io/builds/20525914/badge)](https://coveralls.io/builds/20525914) Coverage increased (+0.2%) to 61.86% when pulling **12dc01f21ec89b83ad6c4cd335782cdda8dcd66e on little-cui:find** into **fad2b5811f0476069fdfd68e65d14e7b2c81941a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713675#comment-16713675 ] ASF GitHub Bot commented on SCB-1053: - codecov-io commented on issue #508: WIP: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508#issuecomment-445459421 # [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=h1) Report > Merging [#508](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=desc) into [master](https://codecov.io/gh/apache/servicecomb-service-center/commit/fad2b5811f0476069fdfd68e65d14e7b2c81941a?src=pr=desc) will **increase** coverage by `0.04%`. > The diff coverage is `n/a`. [![Impacted file tree graph](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/graphs/tree.svg?width=650=GAaF7zrg8R=150=pr)](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=tree) ```diff @@Coverage Diff @@ ## master #508 +/- ## == + Coverage 59.31% 59.35% +0.04% == Files 166 166 Lines 1394413944 == + Hits 8271 8277 +6 + Misses 5088 5081 -7 - Partials 585 586 +1 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/service/util/domain\_util.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC9kb21haW5fdXRpbC5nbw==) | `59.7% <0%> (-1.5%)` | :arrow_down: | | [scctl/pkg/plugin/diagnose/compare\_holder.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2NjdGwvcGtnL3BsdWdpbi9kaWFnbm9zZS9jb21wYXJlX2hvbGRlci5nbw==) | `94.87% <0%> (-1.29%)` | :arrow_down: | | [server/govern/service.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL2dvdmVybi9zZXJ2aWNlLmdv) | `72.6% <0%> (-0.34%)` | :arrow_down: | | [server/broker/util.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL2Jyb2tlci91dGlsLmdv) | `53.47% <0%> (+0.26%)` | :arrow_up: | | [server/service/notification/websocket.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL3dlYnNvY2tldC5nbw==) | `84.51% <0%> (+0.64%)` | :arrow_up: | | [server/service/notification/listwatcher.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/508/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL2xpc3R3YXRjaGVyLmdv) | `78.87% <0%> (+9.85%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=footer). Last update [fad2b58...12dc01f](https://codecov.io/gh/apache/servicecomb-service-center/pull/508?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). 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 > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713666#comment-16713666 ] ASF GitHub Bot commented on SCB-1053: - little-cui opened a new pull request #508: WIP: SCB-1053 Add instances request struct URL: https://github.com/apache/servicecomb-service-center/pull/508 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1049) Alarm center
[ https://issues.apache.org/jira/browse/SCB-1049?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713586#comment-16713586 ] ASF GitHub Bot commented on SCB-1049: - coveralls edited a comment on issue #503: WIP: SCB-1049 Alarm center URL: https://github.com/apache/servicecomb-service-center/pull/503#issuecomment-443585336 [![Coverage Status](https://coveralls.io/builds/20487495/badge)](https://coveralls.io/builds/20487495) Coverage decreased (-0.01%) to 61.628% when pulling **6896dc46117b128911cd2206d131cc3182a6fe20 on little-cui:alarm** into **fad2b5811f0476069fdfd68e65d14e7b2c81941a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Alarm center > > > Key: SCB-1049 > URL: https://issues.apache.org/jira/browse/SCB-1049 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1056) Put provider QPS flow control in front
[ https://issues.apache.org/jira/browse/SCB-1056?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713554#comment-16713554 ] ASF GitHub Bot commented on SCB-1056: - coveralls commented on issue #1026: [SCB-1056] put provider QPS flow control in front, for highway transport URL: https://github.com/apache/servicecomb-java-chassis/pull/1026#issuecomment-445432590 [![Coverage Status](https://coveralls.io/builds/20485156/badge)](https://coveralls.io/builds/20485156) Coverage decreased (-0.006%) to 86.737% when pulling **9507896155cef8bb2ab3dc233ad36250c6c3f73d on yhs0092:enhance_QPS_limit_highway** into **374f5e21c3a6b960242fc68b5bfe391498aac6da on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Put provider QPS flow control in front > -- > > Key: SCB-1056 > URL: https://issues.apache.org/jira/browse/SCB-1056 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: YaoHaishi >Assignee: YaoHaishi >Priority: Major > Fix For: java-chassis-1.2.0 > > > Currently provider QPS flow control is in ProviderQpsFlowControlHandler which > works in provider handler chain. As a result, the flow control logic takes > effect too late and much CPU resource is wasted on processing those requests > that should be rejected earlier. > Put the provider QPS flow control logic in front can save the resource. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713525#comment-16713525 ] ASF GitHub Bot commented on SCB-1053: - coveralls commented on issue #506: SCB-1053 Allow instances to be nil URL: https://github.com/apache/servicecomb-service-center/pull/506#issuecomment-445430516 [![Coverage Status](https://coveralls.io/builds/20462264/badge)](https://coveralls.io/builds/20462264) Coverage decreased (-0.2%) to 61.586% when pulling **cc8ad5410da49810a44c6f53f47474323fbb8f2f on little-cui:find** into **a0f5e64ef6112f69b68037c8877c6149f37cc18b on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1070) New instance 'TESTING' status
[ https://issues.apache.org/jira/browse/SCB-1070?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713508#comment-16713508 ] ASF GitHub Bot commented on SCB-1070: - coveralls commented on issue #507: SCB-1070 New instance 'TESTING' status URL: https://github.com/apache/servicecomb-service-center/pull/507#issuecomment-445427115 [![Coverage Status](https://coveralls.io/builds/20462286/badge)](https://coveralls.io/builds/20462286) Coverage increased (+0.1%) to 61.868% when pulling **1960c6cb397419b1679830992ef865a472741b85 on little-cui:status** into **a0f5e64ef6112f69b68037c8877c6149f37cc18b on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > New instance 'TESTING' status > - > > Key: SCB-1070 > URL: https://issues.apache.org/jira/browse/SCB-1070 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-946) serialize/deseriaze List>/List>/Map>/Map>
[ https://issues.apache.org/jira/browse/SCB-946?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713481#comment-16713481 ] ASF GitHub Bot commented on SCB-946: coveralls edited a comment on issue #1025: [SCB-946] serialize/deseriaze List>/List>/Map>/Map> URL: https://github.com/apache/servicecomb-java-chassis/pull/1025#issuecomment-445420486 [![Coverage Status](https://coveralls.io/builds/20472107/badge)](https://coveralls.io/builds/20472107) Coverage decreased (-0.04%) to 86.706% when pulling **9206dea1ea4973f39a22b27803100cfbcf234911 on wujimin:enhance-protobuf-codec-of-list-map** into **374f5e21c3a6b960242fc68b5bfe391498aac6da on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > serialize/deseriaze List>/List>/Map>/Map Map> > --- > > Key: SCB-946 > URL: https://issues.apache.org/jira/browse/SCB-946 > Project: Apache ServiceComb > Issue Type: Sub-task > Components: Java-Chassis >Reporter: wujimin >Assignee: wujimin >Priority: Major > Fix For: java-chassis-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-946) serialize/deseriaze List>/List>/Map>/Map>
[ https://issues.apache.org/jira/browse/SCB-946?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16713475#comment-16713475 ] ASF GitHub Bot commented on SCB-946: coveralls commented on issue #1025: [SCB-946] serialize/deseriaze List>/List>/Map>/Map> URL: https://github.com/apache/servicecomb-java-chassis/pull/1025#issuecomment-445420486 [![Coverage Status](https://coveralls.io/builds/20467983/badge)](https://coveralls.io/builds/20467983) Coverage decreased (-0.03%) to 86.709% when pulling **5b095e46b4ef4da82263149d1b2a50e8feea85fc on wujimin:enhance-protobuf-codec-of-list-map** into **374f5e21c3a6b960242fc68b5bfe391498aac6da on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > serialize/deseriaze List>/List>/Map>/Map Map> > --- > > Key: SCB-946 > URL: https://issues.apache.org/jira/browse/SCB-946 > Project: Apache ServiceComb > Issue Type: Sub-task > Components: Java-Chassis >Reporter: wujimin >Assignee: wujimin >Priority: Major > Fix For: java-chassis-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1072) change dependency management version to project.version
[ https://issues.apache.org/jira/browse/SCB-1072?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16712383#comment-16712383 ] ASF GitHub Bot commented on SCB-1072: - liubao68 opened a new pull request #1027: [SCB-1072]change dependency management version to project.version URL: https://github.com/apache/servicecomb-java-chassis/pull/1027 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > change dependency management version to project.version > --- > > Key: SCB-1072 > URL: https://issues.apache.org/jira/browse/SCB-1072 > Project: Apache ServiceComb > Issue Type: Improvement >Reporter: liubao >Assignee: liubao >Priority: Major > > When using mvn version:set plugin to build projects, dependency manage > version will not be replaced, so using project.version is better. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1060) edge support Exception converter
[ https://issues.apache.org/jira/browse/SCB-1060?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16712359#comment-16712359 ] ASF GitHub Bot commented on SCB-1060: - coveralls edited a comment on issue #1018: [SCB-1060]edge support Exception converter URL: https://github.com/apache/servicecomb-java-chassis/pull/1018#issuecomment-443616322 [![Coverage Status](https://coveralls.io/builds/20463357/badge)](https://coveralls.io/builds/20463357) Coverage decreased (-0.01%) to 86.732% when pulling **294b29d1a8fdcd9c0648988e21009c326bc500ac on heyile:edgeException** into **6c1df294382f12bbea3c87f4143fb40fe6f9f532 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > edge support Exception converter > - > > Key: SCB-1060 > URL: https://issues.apache.org/jira/browse/SCB-1060 > Project: Apache ServiceComb > Issue Type: Bug >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16711981#comment-16711981 ] ASF GitHub Bot commented on SCB-1044: - coveralls edited a comment on issue #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#issuecomment-441660699 [![Coverage Status](https://coveralls.io/builds/20460253/badge)](https://coveralls.io/builds/20460253) Coverage increased (+0.03%) to 86.736% when pulling **deee463d2f4918118fda2ce0b214659b8eccb730 on heyile:cpuAndNet** into **22ff6d6769f144664f448e43d7d474f7837c6cf8 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1068) As a developer want to know instance detail info when instance isolation
[ https://issues.apache.org/jira/browse/SCB-1068?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16711984#comment-16711984 ] ASF GitHub Bot commented on SCB-1068: - coveralls commented on issue #1024: [SCB-1068] add the instance infomation into instance isolation event URL: https://github.com/apache/servicecomb-java-chassis/pull/1024#issuecomment-445015157 [![Coverage Status](https://coveralls.io/builds/20460519/badge)](https://coveralls.io/builds/20460519) Coverage decreased (-0.007%) to 86.722% when pulling **9df6ad074fc0431c889c9feb9a4e6ae09c4924ef on jeho0815:Branch_master_SCB-1068** into **6025b0dc55c980a80b096c3b2a39b1e5fcbd6052 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > As a developer want to know instance detail info when instance isolation > - > > Key: SCB-1068 > URL: https://issues.apache.org/jira/browse/SCB-1068 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: jeho0815 >Assignee: jeho0815 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1065) when request not contain traceId,should use provider's invocation's traceId
[ https://issues.apache.org/jira/browse/SCB-1065?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16711544#comment-16711544 ] ASF GitHub Bot commented on SCB-1065: - coveralls edited a comment on issue #1022: [SCB-1065] when request not contain traceId,should use provider's invocation's traceId URL: https://github.com/apache/servicecomb-java-chassis/pull/1022#issuecomment-444874542 [![Coverage Status](https://coveralls.io/builds/20458947/badge)](https://coveralls.io/builds/20458947) Coverage increased (+0.006%) to 86.724% when pulling **8a52d3ab18ba3f9c03eeaec2ea3b1c356908a843 on weichao666:traceId** into **a21611163909bd075f3f7c737474e44c95f4c062 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > when request not contain traceId,should use provider's invocation's traceId > --- > > Key: SCB-1065 > URL: https://issues.apache.org/jira/browse/SCB-1065 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: WeiChao >Assignee: WeiChao >Priority: Major > Fix For: java-chassis-1.2.0 > > > when request not contain traceId,should use provider's invocation's traceId -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1065) when request not contain traceId,should use provider's invocation's traceId
[ https://issues.apache.org/jira/browse/SCB-1065?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16711460#comment-16711460 ] ASF GitHub Bot commented on SCB-1065: - coveralls commented on issue #1022: [SCB-1065] when request not contain traceId,should use provider's invocation's traceId URL: https://github.com/apache/servicecomb-java-chassis/pull/1022#issuecomment-444874542 [![Coverage Status](https://coveralls.io/builds/20458821/badge)](https://coveralls.io/builds/20458821) Coverage increased (+0.01%) to 86.728% when pulling **8a52d3ab18ba3f9c03eeaec2ea3b1c356908a843 on weichao666:traceId** into **a21611163909bd075f3f7c737474e44c95f4c062 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > when request not contain traceId,should use provider's invocation's traceId > --- > > Key: SCB-1065 > URL: https://issues.apache.org/jira/browse/SCB-1065 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: WeiChao >Assignee: WeiChao >Priority: Major > Fix For: java-chassis-1.2.0 > > > when request not contain traceId,should use provider's invocation's traceId -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1066) when start error, destroy method may throw an exception lead to origin exception losed
[ https://issues.apache.org/jira/browse/SCB-1066?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16711445#comment-16711445 ] ASF GitHub Bot commented on SCB-1066: - coveralls commented on issue #1023: [SCB-1066] when start error, destroy method may throw an exception le… URL: https://github.com/apache/servicecomb-java-chassis/pull/1023#issuecomment-444871912 [![Coverage Status](https://coveralls.io/builds/20458745/badge)](https://coveralls.io/builds/20458745) Coverage decreased (-0.02%) to 86.703% when pulling **4505b5708ccd173d5b3e72e23638b03f8d90d80a on jeho0815:Branch_master_SCB-1066** into **a21611163909bd075f3f7c737474e44c95f4c062 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > when start error, destroy method may throw an exception lead to origin > exception losed > -- > > Key: SCB-1066 > URL: https://issues.apache.org/jira/browse/SCB-1066 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: jeho0815 >Assignee: jeho0815 >Priority: Major > Attachments: image-2018-12-04-21-25-08-309.png > > > > 1、when operationid repead, ProducerProviderManager shutdown error with a NPE > 2、using LocalServiceRegistryClientImpl > !image-2018-12-04-21-25-08-309.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1049) Alarm center
[ https://issues.apache.org/jira/browse/SCB-1049?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16711375#comment-16711375 ] ASF GitHub Bot commented on SCB-1049: - codecov-io edited a comment on issue #503: WIP: SCB-1049 Alarm center URL: https://github.com/apache/servicecomb-service-center/pull/503#issuecomment-443584904 # [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=h1) Report > Merging [#503](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=desc) into [master](https://codecov.io/gh/apache/servicecomb-service-center/commit/fad2b5811f0476069fdfd68e65d14e7b2c81941a?src=pr=desc) will **decrease** coverage by `0.08%`. > The diff coverage is `70.08%`. [![Impacted file tree graph](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/graphs/tree.svg?width=650=GAaF7zrg8R=150=pr)](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=tree) ```diff @@Coverage Diff @@ ## master #503 +/- ## == - Coverage 59.31% 59.23% -0.09% == Files 166 168 +2 Lines 1394414017 +73 == + Hits 8271 8303 +32 - Misses 5088 5132 +44 + Partials 585 582 -3 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/notify/publisher.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL25vdGlmeS9wdWJsaXNoZXIuZ28=) | `95.65% <ø> (ø)` | | | [server/service/event/instance\_event\_handler.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvZXZlbnQvaW5zdGFuY2VfZXZlbnRfaGFuZGxlci5nbw==) | `7.54% <0%> (ø)` | :arrow_up: | | [...erver/plugin/pkg/discovery/servicecenter/syncer.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvZGlzY292ZXJ5L3NlcnZpY2VjZW50ZXIvc3luY2VyLmdv) | `41.17% <0%> (-1.58%)` | :arrow_down: | | [server/core/config.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL2NvcmUvY29uZmlnLmdv) | `0% <0%> (ø)` | :arrow_up: | | [server/service/event/rule\_event\_handler.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvZXZlbnQvcnVsZV9ldmVudF9oYW5kbGVyLmdv) | `8.33% <0%> (ø)` | :arrow_up: | | [server/service/event/tag\_event\_handler.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvZXZlbnQvdGFnX2V2ZW50X2hhbmRsZXIuZ28=) | `7.14% <0%> (ø)` | :arrow_up: | | [server/service/instance.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvaW5zdGFuY2UuZ28=) | `67.75% <0%> (-0.5%)` | :arrow_down: | | [server/admin/controller\_v4.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL2FkbWluL2NvbnRyb2xsZXJfdjQuZ28=) | `16.21% <10%> (-6.01%)` | :arrow_down: | | [pkg/util/json.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-cGtnL3V0aWwvanNvbi5nbw==) | `100% <100%> (ø)` | | | [server/error/error.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL2Vycm9yL2Vycm9yLmdv) | `100% <100%> (ø)` | :arrow_up: | | ... and [26 more](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=footer). Last update [fad2b58...6896dc4](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). 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 > Alarm center > > > Key: SCB-1049 > URL: https://issues.apache.org/jira/browse/SCB-1049 >
[jira] [Commented] (SCB-1056) Put provider QPS flow control in front
[ https://issues.apache.org/jira/browse/SCB-1056?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16711228#comment-16711228 ] ASF GitHub Bot commented on SCB-1056: - liubao68 closed pull request #1026: [SCB-1056] put provider QPS flow control in front, for highway transport URL: https://github.com/apache/servicecomb-java-chassis/pull/1026 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/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java index 20e8e0828..32bfb67b9 100644 --- a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java +++ b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java @@ -20,12 +20,14 @@ import java.util.Map; import javax.ws.rs.core.Response.Status; +import javax.xml.ws.Holder; import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf; import org.apache.servicecomb.codec.protobuf.definition.ProtobufManager; import org.apache.servicecomb.codec.protobuf.utils.WrapSchema; import org.apache.servicecomb.core.Const; import org.apache.servicecomb.core.Endpoint; +import org.apache.servicecomb.core.Handler; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.SCBEngine; import org.apache.servicecomb.core.definition.MicroserviceMeta; @@ -181,9 +183,38 @@ public void execute() { null); invocation.onStart(null, start); invocation.getInvocationStageTrace().startSchedule(); - operationMeta.getExecutor().execute(() -> runInExecutor()); + + // copied from HighwayCodec#decodeRequest() + // for temporary qps enhance purpose, we'll remove it when handler mechanism is refactored + invocation.mergeContext(header.getContext()); + + Holder qpsFlowControlReject = checkQpsFlowControl(operationMeta); + if (qpsFlowControlReject.value) { +return; + } + + operationMeta.getExecutor().execute(this::runInExecutor); } catch (IllegalStateException e) { sendResponse(header.getContext(), Response.providerFailResp(e)); } } + + private Holder checkQpsFlowControl(OperationMeta operationMeta) { +Holder qpsFlowControlReject = new Holder<>(false); +@SuppressWarnings("deprecation") +Handler providerQpsFlowControlHandler = operationMeta.getProviderQpsFlowControlHandler(); +if (null != providerQpsFlowControlHandler) { + try { +providerQpsFlowControlHandler.handle(invocation, response -> { + qpsFlowControlReject.value = true; + sendResponse(header.getContext(), response); +}); + } catch (Exception e) { +LOGGER.error("failed to execute ProviderQpsFlowControlHandler", e); +qpsFlowControlReject.value = true; +sendResponse(header.getContext(), Response.providerFailResp(e)); + } +} +return qpsFlowControlReject; + } } diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java index a9932e2a1..ad3feddc8 100644 --- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java +++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java @@ -37,7 +37,6 @@ import org.apache.servicecomb.serviceregistry.ServiceRegistry; import org.apache.servicecomb.serviceregistry.registry.ServiceRegistryFactory; import org.apache.servicecomb.swagger.invocation.Response; -import org.apache.servicecomb.swagger.invocation.context.InvocationContext; import org.apache.servicecomb.transport.highway.message.RequestHeader; import org.apache.servicecomb.transport.highway.message.ResponseHeader; import org.junit.After; @@ -81,7 +80,7 @@ public static void setupClass() { } @Before - public void setUp() throws Exception { + public void setUp() { ServiceRegistry serviceRegistry = ServiceRegistryFactory.createLocal(); serviceRegistry.init(); RegistryUtils.setServiceRegistry(serviceRegistry); @@ -106,7 +105,7 @@ public void setUp() throws Exception { } @After - public void tearDown() throws Exception { + public void tearDown() { header = null; diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayServerInvoke.java
[jira] [Commented] (SCB-1056) Put provider QPS flow control in front
[ https://issues.apache.org/jira/browse/SCB-1056?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16711199#comment-16711199 ] ASF GitHub Bot commented on SCB-1056: - yhs0092 opened a new pull request #1026: [SCB-1056] put provider QPS flow control in front, for highway transport URL: https://github.com/apache/servicecomb-java-chassis/pull/1026 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- See details in [SCB-1056](https://issues.apache.org/jira/browse/SCB-1056), support this enhancement in highway transport. 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 > Put provider QPS flow control in front > -- > > Key: SCB-1056 > URL: https://issues.apache.org/jira/browse/SCB-1056 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: YaoHaishi >Assignee: YaoHaishi >Priority: Major > Fix For: java-chassis-1.2.0 > > > Currently provider QPS flow control is in ProviderQpsFlowControlHandler which > works in provider handler chain. As a result, the flow control logic takes > effect too late and much CPU resource is wasted on processing those requests > that should be rejected earlier. > Put the provider QPS flow control logic in front can save the resource. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1070) New instance 'TESTING' status
[ https://issues.apache.org/jira/browse/SCB-1070?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16710150#comment-16710150 ] ASF GitHub Bot commented on SCB-1070: - little-cui closed pull request #507: SCB-1070 New instance 'TESTING' status URL: https://github.com/apache/servicecomb-service-center/pull/507 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/server/core/proto/common.go b/server/core/proto/common.go index c7c5eccf..f21dcf5f 100644 --- a/server/core/proto/common.go +++ b/server/core/proto/common.go @@ -32,6 +32,7 @@ const ( MSI_UP string = "UP" MSI_DOWN string = "DOWN" MSI_STARTING string = "STARTING" + MSI_TESTING string = "TESTING" MSI_OUTOFSERVICE string = "OUTOFSERVICE" CHECK_BY_HEARTBEAT string = "push" diff --git a/server/service/instance_test.go b/server/service/instance_test.go index 3b67e018..25b654fa 100644 --- a/server/service/instance_test.go +++ b/server/service/instance_test.go @@ -620,11 +620,43 @@ var _ = Describe("'Instance' service", func() { It("should be passed", func() { By("update instance status") respUpdateStatus, err := instanceResource.UpdateStatus(getContext(), { + ServiceId: serviceId, + InstanceId: instanceId, + Status: pb.MSI_DOWN, + }) + Expect(err).To(BeNil()) + Expect(respUpdateStatus.Response.Code).To(Equal(pb.Response_SUCCESS)) + + respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), { + ServiceId: serviceId, + InstanceId: instanceId, + Status: pb.MSI_OUTOFSERVICE, + }) + Expect(err).To(BeNil()) + Expect(respUpdateStatus.Response.Code).To(Equal(pb.Response_SUCCESS)) + + respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), { ServiceId: serviceId, InstanceId: instanceId, Status: pb.MSI_STARTING, }) + Expect(err).To(BeNil()) + Expect(respUpdateStatus.Response.Code).To(Equal(pb.Response_SUCCESS)) + + respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), { + ServiceId: serviceId, + InstanceId: instanceId, + Status: pb.MSI_TESTING, + }) + + Expect(err).To(BeNil()) + Expect(respUpdateStatus.Response.Code).To(Equal(pb.Response_SUCCESS)) + respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), { + ServiceId: serviceId, + InstanceId: instanceId, + Status: pb.MSI_UP, + }) Expect(err).To(BeNil()) Expect(respUpdateStatus.Response.Code).To(Equal(pb.Response_SUCCESS)) diff --git a/server/service/instance_validator.go b/server/service/instance_validator.go index cf7a1dfb..bebb2c31 100644 --- a/server/service/instance_validator.go +++ b/server/service/instance_validator.go @@ -36,9 +36,9 @@ var ( var ( instStatusRegex, _ = regexp.Compile("^(" + util.StringJoin([]string{ - pb.MSI_UP, pb.MSI_DOWN, pb.MSI_STARTING, pb.MSI_OUTOFSERVICE}, "|") + ")?$") + pb.MSI_UP, pb.MSI_DOWN, pb.MSI_STARTING, pb.MSI_TESTING, pb.MSI_OUTOFSERVICE}, "|") + ")?$") updateInstStatusRegex, _ = regexp.Compile("^(" + util.StringJoin([]string{ - pb.MSI_UP, pb.MSI_DOWN, pb.MSI_STARTING, pb.MSI_OUTOFSERVICE}, "|") + ")$") + pb.MSI_UP, pb.MSI_DOWN, pb.MSI_STARTING, pb.MSI_TESTING, pb.MSI_OUTOFSERVICE}, "|") + ")$") hbModeRegex, _ = regexp.Compile(`^(push|pull)$`) urlRegex, _ = regexp.Compile(`^\S*$`) epRegex, _ = regexp.Compile(`\S+`)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16710153#comment-16710153 ] ASF GitHub Bot commented on SCB-1053: - little-cui closed pull request #506: SCB-1053 Allow instances to be nil URL: https://github.com/apache/servicecomb-service-center/pull/506 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/server/core/proto/batch_find.go b/server/core/proto/batch_find.go index 68e3883c..16eb99cc 100644 --- a/server/core/proto/batch_find.go +++ b/server/core/proto/batch_find.go @@ -27,7 +27,7 @@ type FindService struct { type FindResult struct { Index int64 `protobuf:"varint,1,opt,name=index" json:"index"` Rev string `protobuf:"bytes,2,opt,name=rev" json:"rev"` - Instances []*MicroServiceInstance `protobuf:"bytes,3,rep,name=instances" json:"instances"` + Instances []*MicroServiceInstance `protobuf:"bytes,3,rep,name=instances" json:"instances,omitempty"` } type FindFailedResult struct { 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 > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-946) serialize/deseriaze List>/List>/Map>/Map>
[ https://issues.apache.org/jira/browse/SCB-946?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16710136#comment-16710136 ] ASF GitHub Bot commented on SCB-946: wujimin opened a new pull request #1025: [SCB-946] serialize/deseriaze List>/List>/Map>/Map> URL: https://github.com/apache/servicecomb-java-chassis/pull/1025 protobuf idl can not describe List>/List>/Map>/Map> wrap them to standard proto message when serialize and unwrap when deserialize 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 > serialize/deseriaze List>/List>/Map>/Map Map> > --- > > Key: SCB-946 > URL: https://issues.apache.org/jira/browse/SCB-946 > Project: Apache ServiceComb > Issue Type: Sub-task > Components: Java-Chassis >Reporter: wujimin >Assignee: wujimin >Priority: Major > Fix For: java-chassis-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1060) edge support Exception converter
[ https://issues.apache.org/jira/browse/SCB-1060?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709951#comment-16709951 ] ASF GitHub Bot commented on SCB-1060: - liubao68 closed pull request #1018: [SCB-1060]edge support Exception converter URL: https://github.com/apache/servicecomb-java-chassis/pull/1018 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/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java index 53edb8b9b..75f899195 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java @@ -31,6 +31,7 @@ import org.apache.servicecomb.it.testcase.TestDefaultValue; import org.apache.servicecomb.it.testcase.TestDownload; import org.apache.servicecomb.it.testcase.TestDownloadSlowStreamEdge; +import org.apache.servicecomb.it.testcase.TestExceptionConvertEdge; import org.apache.servicecomb.it.testcase.TestGenericEdge; import org.apache.servicecomb.it.testcase.TestIgnoreMethod; import org.apache.servicecomb.it.testcase.TestIgnoreStaticMethod; @@ -106,6 +107,7 @@ private static void runShareTestCases() throws Throwable { ITJUnitUtils.runWithRest(TestAcceptType.class); ITJUnitUtils.runWithRest(TestDownload.class); +ITJUnitUtils.runWithHighwayAndRest(TestExceptionConvertEdge.class); ITJUnitUtils.runWithHighwayAndRest(TestTrace.class); ITJUnitUtils.run(TestTraceEdge.class); diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestExceptionConvertEdge.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestExceptionConvertEdge.java new file mode 100644 index 0..d022c2711 --- /dev/null +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestExceptionConvertEdge.java @@ -0,0 +1,43 @@ +/* + * 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.servicecomb.it.testcase; + +import org.apache.servicecomb.it.extend.engine.GateRestTemplate; +import org.junit.Assert; +import org.junit.Test; +import org.springframework.http.HttpStatus; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.RestClientException; + +public class TestExceptionConvertEdge { + private static GateRestTemplate client = GateRestTemplate.createEdgeRestTemplate("edgeExceptionConvertSchema"); + + @Test + public void testTimeoutAdd() { +int result = client.getForObject("/add?x=10=12", Integer.class); +Assert.assertEquals(22, result); + +try { + client.getForObject("/add?x=88=21", Object.class); +} catch (RestClientException e) { + HttpClientErrorException exception = (HttpClientErrorException) e; + Assert.assertEquals(HttpStatus.EXPECTATION_FAILED, exception.getStatusCode()); + Assert.assertTrue(exception.getResponseBodyAsString().contains("change the response")); +} + } +} diff --git a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/converter/CustomException.java b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/converter/CustomException.java new file mode 100644 index 0..e9f7fffec --- /dev/null +++ b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/converter/CustomException.java @@ -0,0 +1,53 @@ +/* + * 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
[jira] [Commented] (SCB-1068) As a developer want to know instance detail info when instance isolation
[ https://issues.apache.org/jira/browse/SCB-1068?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709952#comment-16709952 ] ASF GitHub Bot commented on SCB-1068: - liubao68 closed pull request #1024: [SCB-1068] add the instance infomation into instance isolation event URL: https://github.com/apache/servicecomb-java-chassis/pull/1024 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/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/event/IsolationServerEvent.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/event/IsolationServerEvent.java index 4889aed20..1714e0b71 100644 --- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/event/IsolationServerEvent.java +++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/event/IsolationServerEvent.java @@ -17,11 +17,16 @@ package org.apache.servicecomb.loadbalance.event; import org.apache.servicecomb.foundation.common.event.AlarmEvent; +import org.apache.servicecomb.loadbalance.ServiceCombServerStats; +import org.apache.servicecomb.loadbalance.filter.IsolationDiscoveryFilter; +import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; public class IsolationServerEvent extends AlarmEvent { private String microserviceName; + private MicroserviceInstance instance; + //当前实例总请求数 private long currentTotalRequest; @@ -31,6 +36,8 @@ //当前实例出错百分比 private double currentErrorPercentage; + private int minIsolationTime; + private long enableRequestThreshold; private int continuousFailureThreshold; @@ -39,18 +46,20 @@ private long singleTestTime; - public IsolationServerEvent(String microserviceName, long totalRequest, long currentCountinuousFailureCount, - double currentErrorPercentage, int continuousFailureThreshold, - int errorThresholdPercentage, long enableRequestThreshold, long singleTestTime, Type type) { + public IsolationServerEvent(String microserviceName, MicroserviceInstance instance, + ServiceCombServerStats serverStats, + IsolationDiscoveryFilter.Settings settings, Type type) { super(type); this.microserviceName = microserviceName; -this.currentTotalRequest = totalRequest; -this.currentCountinuousFailureCount = currentCountinuousFailureCount; -this.currentErrorPercentage = currentErrorPercentage; -this.enableRequestThreshold = enableRequestThreshold; -this.continuousFailureThreshold = continuousFailureThreshold; -this.errorThresholdPercentage = errorThresholdPercentage; -this.singleTestTime = singleTestTime; +this.currentTotalRequest = serverStats.getTotalRequests(); +this.currentCountinuousFailureCount = serverStats.getCountinuousFailureCount(); +this.currentErrorPercentage = serverStats.getFailedRate(); +this.minIsolationTime = settings.minIsolationTime; +this.enableRequestThreshold = settings.enableRequestThreshold; +this.continuousFailureThreshold = settings.continuousFailureThreshold; +this.errorThresholdPercentage = settings.errorThresholdPercentage; +this.singleTestTime = settings.singleTestTime; +this.instance = instance; } public String getMicroserviceName() { @@ -84,4 +93,12 @@ public int getErrorThresholdPercentage() { public long getSingleTestTime() { return singleTestTime; } + + public MicroserviceInstance getInstance() { +return instance; + } + + public int getMinIsolationTime() { +return minIsolationTime; + } } diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilter.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilter.java index f3e5c425a..2856434c0 100644 --- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilter.java +++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilter.java @@ -45,17 +45,18 @@ private static final Logger LOGGER = LoggerFactory.getLogger(IsolationDiscoveryFilter.class); - class Settings { -int errorThresholdPercentage; + public class Settings { +public int errorThresholdPercentage; -long singleTestTime; +public long singleTestTime; -long enableRequestThreshold; +public long enableRequestThreshold; -int continuousFailureThreshold; +public int continuousFailureThreshold; -int minIsolationTime; // to avoid isolation recover too fast due to no concurrent control in concurrent scenario +public int
[jira] [Commented] (SCB-1070) New instance 'TESTING' status
[ https://issues.apache.org/jira/browse/SCB-1070?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709838#comment-16709838 ] ASF GitHub Bot commented on SCB-1070: - codecov-io commented on issue #507: SCB-1070 New instance 'TESTING' status URL: https://github.com/apache/servicecomb-service-center/pull/507#issuecomment-20750 # [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/507?src=pr=h1) Report > Merging [#507](https://codecov.io/gh/apache/servicecomb-service-center/pull/507?src=pr=desc) into [master](https://codecov.io/gh/apache/servicecomb-service-center/commit/a0f5e64ef6112f69b68037c8877c6149f37cc18b?src=pr=desc) will **increase** coverage by `<.01%`. > The diff coverage is `n/a`. [![Impacted file tree graph](https://codecov.io/gh/apache/servicecomb-service-center/pull/507/graphs/tree.svg?width=650=GAaF7zrg8R=150=pr)](https://codecov.io/gh/apache/servicecomb-service-center/pull/507?src=pr=tree) ```diff @@Coverage Diff @@ ## master #507 +/- ## == + Coverage 59.35% 59.36% +<.01% == Files 166 166 Lines 1394413944 == + Hits 8277 8278 +1 Misses 5081 5081 + Partials 586 585 -1 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-service-center/pull/507?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/core/proto/common.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/507/diff?src=pr=tree#diff-c2VydmVyL2NvcmUvcHJvdG8vY29tbW9uLmdv) | `0% <ø> (ø)` | :arrow_up: | | [server/service/instance\_validator.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/507/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvaW5zdGFuY2VfdmFsaWRhdG9yLmdv) | `100% <ø> (ø)` | :arrow_up: | | [server/plugin/pkg/registry/etcd/etcd.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/507/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvcmVnaXN0cnkvZXRjZC9ldGNkLmdv) | `86.17% <0%> (-0.19%)` | :arrow_down: | | [server/broker/service.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/507/diff?src=pr=tree#diff-c2VydmVyL2Jyb2tlci9zZXJ2aWNlLmdv) | `57.78% <0%> (-0.16%)` | :arrow_down: | | [server/broker/util.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/507/diff?src=pr=tree#diff-c2VydmVyL2Jyb2tlci91dGlsLmdv) | `53.47% <0%> (+0.26%)` | :arrow_up: | | [server/service/notification/stream.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/507/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL3N0cmVhbS5nbw==) | `69.56% <0%> (+4.34%)` | :arrow_up: | | [server/plugin/pkg/registry/etcd/tracing.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/507/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvcmVnaXN0cnkvZXRjZC90cmFjaW5nLmdv) | `81.81% <0%> (+9.09%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/507?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/507?src=pr=footer). Last update [a0f5e64...1960c6c](https://codecov.io/gh/apache/servicecomb-service-center/pull/507?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). 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 > New instance 'TESTING' status > - > > Key: SCB-1070 > URL: https://issues.apache.org/jira/browse/SCB-1070 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709836#comment-16709836 ] ASF GitHub Bot commented on SCB-1053: - codecov-io commented on issue #506: SCB-1053 Allow instances to be nil URL: https://github.com/apache/servicecomb-service-center/pull/506#issuecomment-20306 # [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/506?src=pr=h1) Report > Merging [#506](https://codecov.io/gh/apache/servicecomb-service-center/pull/506?src=pr=desc) into [master](https://codecov.io/gh/apache/servicecomb-service-center/commit/a0f5e64ef6112f69b68037c8877c6149f37cc18b?src=pr=desc) will **decrease** coverage by `0.02%`. > The diff coverage is `n/a`. [![Impacted file tree graph](https://codecov.io/gh/apache/servicecomb-service-center/pull/506/graphs/tree.svg?width=650=GAaF7zrg8R=150=pr)](https://codecov.io/gh/apache/servicecomb-service-center/pull/506?src=pr=tree) ```diff @@Coverage Diff @@ ## master #506 +/- ## == - Coverage 59.35% 59.33% -0.03% == Files 166 166 Lines 1394413944 == - Hits 8277 8274 -3 Misses 5081 5081 - Partials 586 589 +3 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-service-center/pull/506?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/govern/service.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/506/diff?src=pr=tree#diff-c2VydmVyL2dvdmVybi9zZXJ2aWNlLmdv) | `72.6% <0%> (-0.34%)` | :arrow_down: | | [server/plugin/pkg/registry/etcd/etcd.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/506/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvcmVnaXN0cnkvZXRjZC9ldGNkLmdv) | `86.17% <0%> (-0.19%)` | :arrow_down: | | [server/broker/service.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/506/diff?src=pr=tree#diff-c2VydmVyL2Jyb2tlci9zZXJ2aWNlLmdv) | `57.78% <0%> (-0.16%)` | :arrow_down: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/506?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/506?src=pr=footer). Last update [a0f5e64...cc8ad54](https://codecov.io/gh/apache/servicecomb-service-center/pull/506?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). 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 > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1070) New instance 'TESTING' status
[ https://issues.apache.org/jira/browse/SCB-1070?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709798#comment-16709798 ] ASF GitHub Bot commented on SCB-1070: - little-cui opened a new pull request #507: SCB-1070 New instance 'TESTING' status URL: https://github.com/apache/servicecomb-service-center/pull/507 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > New instance 'TESTING' status > - > > Key: SCB-1070 > URL: https://issues.apache.org/jira/browse/SCB-1070 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1053) Batch microservices instances discovery API
[ https://issues.apache.org/jira/browse/SCB-1053?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709797#comment-16709797 ] ASF GitHub Bot commented on SCB-1053: - little-cui opened a new pull request #506: SCB-1053 allow instances to be nil URL: https://github.com/apache/servicecomb-service-center/pull/506 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > Batch microservices instances discovery API > --- > > Key: SCB-1053 > URL: https://issues.apache.org/jira/browse/SCB-1053 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1065) when request not contain traceId,should use provider's invocation's traceId
[ https://issues.apache.org/jira/browse/SCB-1065?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709718#comment-16709718 ] ASF GitHub Bot commented on SCB-1065: - liubao68 closed pull request #1022: [SCB-1065] when request not contain traceId,should use provider's invocation's traceId URL: https://github.com/apache/servicecomb-java-chassis/pull/1022 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/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java index 932aef4c3..08dc3802a 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java @@ -103,7 +103,7 @@ protected void setContext() throws Exception { @SuppressWarnings("unchecked") Map cseContext = JsonUtils.readValue(strCseContext.getBytes(StandardCharsets.UTF_8), Map.class); -invocation.setContext(cseContext); +invocation.mergeContext(cseContext); } public String getContext(String key) { diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java index faf37a539..d57ebe06c 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java @@ -250,6 +250,34 @@ public void setContextNormal() throws Exception { Assert.assertThat(invocation.getContext(), Matchers.hasEntry("name", "value")); } + @Test + public void setContextTraceId() throws Exception { +Map context = new HashMap<>(); +new Expectations() { + { +requestEx.getHeader(Const.CSE_CONTEXT); +result = JsonUtils.writeValueAsString(context); + } +}; +invocation.addContext("X-B3-traceId", "value1"); +//if request has no traceId, use invocation's traceId +restInvocation.setContext(); +Assert.assertThat(invocation.getContext().size(), Matchers.is(1)); +Assert.assertThat(invocation.getContext(), Matchers.hasEntry("X-B3-traceId", "value1")); + +context.put("X-B3-traceId", "value2"); +new Expectations() { + { +requestEx.getHeader(Const.CSE_CONTEXT); +result = JsonUtils.writeValueAsString(context); + } +}; +//if request has traceId, use request's traceId +restInvocation.setContext(); +Assert.assertThat(invocation.getContext().size(), Matchers.is(1)); +Assert.assertThat(invocation.getContext(), Matchers.hasEntry("X-B3-traceId", "value2")); + } + @Test public void getContext() { invocation.addContext("key", "test"); diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java index 2edeca77e..0807beb1c 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.StatusType; @@ -68,6 +69,24 @@ public void addContext(Map otherContext) { context.putAll(otherContext); } + public void mergeContext(InvocationContext otherContext) { +mergeContext(otherContext.getContext()); + } + + public void mergeContext(Map otherContext) { +if (otherContext == null) { + return; +} +if (otherContext.size() > context.size()) { + for (Entry entry : context.entrySet()) { +otherContext.putIfAbsent(entry.getKey(), entry.getValue()); + } + this.context = otherContext; + return; +} +context.putAll(otherContext); + } + public Map getLocalContext() { return localContext; } diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java new file mode 100644 index
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709721#comment-16709721 ] ASF GitHub Bot commented on SCB-1044: - liubao68 closed pull request #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012 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/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java index c03061ab8..30f8e29db 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java @@ -238,10 +238,10 @@ public static boolean canTcpListen(InetAddress address, int port) { public static String humanReadableBytes(long bytes) { int unit = 1024; if (bytes < unit) { - return bytes + " B"; + return bytes + ""; } int exp = (int) (Math.log(bytes) / Math.log(unit)); char pre = "KMGTPE".charAt(exp - 1); -return String.format("%.3f %cB", bytes / Math.pow(unit, exp), pre); +return String.format("%.3f%c", bytes / Math.pow(unit, exp), pre); } } diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java index 15c6a9ed5..15e157fc8 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java @@ -110,40 +110,39 @@ public void testCanTcpListenYes() throws IOException { @Test public void humanReadableBytes() throws IOException { -Assert.assertEquals("0 B", NetUtils.humanReadableBytes(0L)); -Assert.assertEquals("1 B", NetUtils.humanReadableBytes(1L)); -Assert.assertEquals("1023 B", NetUtils.humanReadableBytes(1023L)); - -Assert.assertEquals("1.000 KB", NetUtils.humanReadableBytes(1024L)); -Assert.assertEquals("1.001 KB", NetUtils.humanReadableBytes(1025L)); -Assert.assertEquals("1023.999 KB", NetUtils.humanReadableBytes(1024L * 1024 - 1)); - -Assert.assertEquals("1.000 MB", NetUtils.humanReadableBytes(1024L * 1024)); -Assert.assertEquals("1.000 MB", NetUtils.humanReadableBytes(1024L * 1024 + 1)); -Assert.assertEquals("1.001 MB", NetUtils.humanReadableBytes(1024L * 1024 + 1024)); -Assert.assertEquals("1023.999 MB", NetUtils.humanReadableBytes(1024L * 1024 * 1024 - 1024)); -Assert.assertEquals("1024.000 MB", NetUtils.humanReadableBytes(1024L * 1024 * 1024 - 1)); - -Assert.assertEquals("1.000 GB", NetUtils.humanReadableBytes(1024L * 1024 * 1024)); -Assert.assertEquals("1.000 GB", NetUtils.humanReadableBytes(1024L * 1024 * 1024 + 1)); -Assert.assertEquals("1.000 GB", NetUtils.humanReadableBytes(1024L * 1024 * 1024 + 1024)); -Assert.assertEquals("1023.999 GB", NetUtils.humanReadableBytes(1024L * 1024 * 1024 * 1024 - 1024 * 1024)); -Assert.assertEquals("1024.000 GB", NetUtils.humanReadableBytes(1024L * 1024 * 1024 * 1024 - 1024)); -Assert.assertEquals("1.000 TB", NetUtils.humanReadableBytes(1024L * 1024 * 1024 * 1024)); -Assert.assertEquals("1.001 TB", NetUtils.humanReadableBytes(1024L * 1024 * 1024 * 1024 + 1024 * 1024 * 1024)); -Assert.assertEquals("1023.999 TB", +Assert.assertEquals("0", NetUtils.humanReadableBytes(0L)); +Assert.assertEquals("1", NetUtils.humanReadableBytes(1L)); +Assert.assertEquals("1023", NetUtils.humanReadableBytes(1023L)); + +Assert.assertEquals("1.000K", NetUtils.humanReadableBytes(1024L)); +Assert.assertEquals("1.001K", NetUtils.humanReadableBytes(1025L)); +Assert.assertEquals("1023.999K", NetUtils.humanReadableBytes(1024L * 1024 - 1)); + +Assert.assertEquals("1.000M", NetUtils.humanReadableBytes(1024L * 1024)); +Assert.assertEquals("1.000M", NetUtils.humanReadableBytes(1024L * 1024 + 1)); +Assert.assertEquals("1.001M", NetUtils.humanReadableBytes(1024L * 1024 + 1024)); +Assert.assertEquals("1023.999M", NetUtils.humanReadableBytes(1024L * 1024 * 1024 - 1024)); +Assert.assertEquals("1024.000M", NetUtils.humanReadableBytes(1024L * 1024 * 1024 - 1)); +Assert.assertEquals("1.000G", NetUtils.humanReadableBytes(1024L * 1024 * 1024)); +Assert.assertEquals("1.000G", NetUtils.humanReadableBytes(1024L * 1024 *
[jira] [Commented] (SCB-1066) when start error, destroy method may throw an exception lead to origin exception losed
[ https://issues.apache.org/jira/browse/SCB-1066?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709709#comment-16709709 ] ASF GitHub Bot commented on SCB-1066: - liubao68 closed pull request #1023: [SCB-1066] when start error, destroy method may throw an exception le… URL: https://github.com/apache/servicecomb-java-chassis/pull/1023 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/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java index f364d1c6f..7cdb51e7b 100644 --- a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java +++ b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java @@ -211,7 +211,11 @@ public synchronized void init() { } catch (TimeoutException e) { LOGGER.warn("{}", e.getMessage()); } catch (Throwable e) { -destroy(); +try { + destroy(); +} catch (Exception exception) { + LOGGER.info("destroy has some error.", exception); +} status = SCBStatus.FAILED; throw new IllegalStateException("ServiceComb init failed.", e); } diff --git a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java index 12a555b1a..737792a16 100644 --- a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java +++ b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java @@ -63,7 +63,9 @@ public void onBootEvent(BootEvent event) { if (!EventType.AFTER_CLOSE.equals(event.getEventType())) { return; } - +if (microserviceMeta == null) { + return; +} for (OperationMeta operationMeta : microserviceMeta.getOperations()) { if (ExecutorService.class.isInstance(operationMeta.getExecutor())) { ((ExecutorService) operationMeta.getExecutor()).shutdown(); diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java index b0d29ee8e..201ceb5f5 100644 --- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java +++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java @@ -219,6 +219,9 @@ public String registerMicroserviceInstance(MicroserviceInstance instance) { @Override public boolean unregisterMicroserviceInstance(String microserviceId, String microserviceInstanceId) { +if (microserviceId == null) { + return true; +} Map instanceMap = microserviceInstanceMap.get(microserviceId); if (instanceMap != null) { instanceMap.remove(microserviceInstanceId); 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 > when start error, destroy method may throw an exception lead to origin > exception losed > -- > > Key: SCB-1066 > URL: https://issues.apache.org/jira/browse/SCB-1066 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: jeho0815 >Assignee: jeho0815 >Priority: Major > Attachments: image-2018-12-04-21-25-08-309.png > > > > 1、when operationid repead, ProducerProviderManager shutdown error with a NPE > 2、using LocalServiceRegistryClientImpl > !image-2018-12-04-21-25-08-309.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1068) As a developer want to know instance detail info when instance isolation
[ https://issues.apache.org/jira/browse/SCB-1068?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709673#comment-16709673 ] ASF GitHub Bot commented on SCB-1068: - jeho0815 opened a new pull request #1024: [SCB-1068] add the instance infomation into instance isolation event URL: https://github.com/apache/servicecomb-java-chassis/pull/1024 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > As a developer want to know instance detail info when instance isolation > - > > Key: SCB-1068 > URL: https://issues.apache.org/jira/browse/SCB-1068 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: jeho0815 >Assignee: jeho0815 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1054) when download file, we should ignore consumer acceptType
[ https://issues.apache.org/jira/browse/SCB-1054?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709665#comment-16709665 ] ASF GitHub Bot commented on SCB-1054: - wujimin closed pull request #1016: [SCB-1054]when download file, we should ignore consumer acceptType URL: https://github.com/apache/servicecomb-java-chassis/pull/1016 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/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java index ee7c40137..99d7a8970 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java @@ -25,6 +25,7 @@ import java.util.Locale; import java.util.Map; +import javax.servlet.http.Part; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; @@ -35,9 +36,12 @@ import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder; import org.apache.servicecomb.core.definition.OperationMeta; import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx; +import org.apache.servicecomb.swagger.invocation.response.ResponseMeta; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.JavaType; + import io.swagger.models.Operation; import io.swagger.models.Swagger; import io.swagger.models.parameters.Parameter; @@ -52,6 +56,9 @@ protected boolean formData; + // make sure if response is file + protected boolean downloadFile; + protected List paramList = new ArrayList<>(); // key为参数名 @@ -80,13 +87,14 @@ public void init(OperationMeta operationMeta) { this.produces = swagger.getProduces(); } +this.downloadFile = checkDownloadFileFlag(); this.createProduceProcessors(); Method method = operationMeta.getMethod(); Type[] genericParamTypes = method.getGenericParameterTypes(); if (genericParamTypes.length != operation.getParameters().size()) { throw new Error("Param count is not equal between swagger and method, path=" + absolutePath -+ ";operation=" + operationMeta.getMicroserviceQualifiedName()); + + ";operation=" + operationMeta.getMicroserviceQualifiedName()); } // 初始化所有rest param @@ -105,6 +113,15 @@ public void init(OperationMeta operationMeta) { setAbsolutePath(concatPath(swagger.getBasePath(), operationMeta.getOperationPath())); } + private boolean checkDownloadFileFlag() { +ResponseMeta responseMeta = operationMeta.findResponseMeta(200); +if (responseMeta != null) { + JavaType javaType = responseMeta.getJavaType(); + return javaType.getRawClass().equals(Part.class); +} +return false; + } + public boolean isFormData() { return formData; } @@ -214,12 +231,17 @@ public ProduceProcessor ensureFindProduceProcessor(HttpServletRequestEx requestE } public ProduceProcessor ensureFindProduceProcessor(String acceptType) { +if (downloadFile) { + //do not check accept type, when the produces of provider is text/plain there will return text/plain processor + //when the produces of provider is application/json there will return the application/json processor + //so do not care what accept type the consumer will set. + return this.produceProcessorMap.get(MediaType.WILDCARD); +} if (StringUtils.isEmpty(acceptType)) { return defaultProcessor; } - -List mimeTyps = MimeTypesUtils.getSortedAcceptableMimeTypes(acceptType.toLowerCase(Locale.US)); -for (String mime : mimeTyps) { +List mimeTypes = MimeTypesUtils.getSortedAcceptableMimeTypes(acceptType.toLowerCase(Locale.US)); +for (String mime : mimeTypes) { ProduceProcessor processor = this.produceProcessorMap.get(mime); if (null != processor) { return processor; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java index 34621d6e2..623e1171a 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java @@ -171,6 +171,20 @@ public void testEnsureFindProduceProcessorAcceptFound() {
[jira] [Commented] (SCB-1051) when interface set produces=text/plain;charset=utf-8. and consumers set accept = text/plain,will cause error
[ https://issues.apache.org/jira/browse/SCB-1051?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709659#comment-16709659 ] ASF GitHub Bot commented on SCB-1051: - wujimin closed pull request #1015: [SCB-1051]when interface set produces=text/plain;charset=utf-8. and c… URL: https://github.com/apache/servicecomb-java-chassis/pull/1015 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/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java index ee7c40137..36979ea92 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java @@ -173,6 +173,9 @@ protected void createProduceProcessors() { } } else { for (String produce : produces) { +if (produce.contains(";")) { + produce = produce.substring(0, produce.indexOf(";")); +} ProduceProcessor processor = ProduceProcessorManager.INSTANCE.findValue(produce); if (processor == null) { LOGGER.error("produce {} is not supported", produce); diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java index 34621d6e2..6103df9ed 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java @@ -147,6 +147,18 @@ public void testCreateProduceProcessorsTextAndWildcard() { MediaType.APPLICATION_JSON + "," + MediaType.APPLICATION_XML + "," + MediaType.WILDCARD)); } + @Test + public void testCreateProduceProcessorsWithSemicolon() { +RestOperationMeta operationMeta = new RestOperationMeta(); +operationMeta.produces = Arrays +.asList(MediaType.TEXT_PLAIN + ";charset=UTF-8", MediaType.APPLICATION_JSON + ";charset=UTF-8"); +operationMeta.createProduceProcessors(); +Assert.assertSame(ProduceProcessorManager.PLAIN_PROCESSOR, +operationMeta.ensureFindProduceProcessor(MediaType.TEXT_PLAIN)); +Assert.assertSame(ProduceProcessorManager.JSON_PROCESSOR, +operationMeta.ensureFindProduceProcessor(MediaType.APPLICATION_JSON)); + } + @Test public void testEnsureFindProduceProcessorRequest(@Mocked HttpServletRequestEx requestEx) { RestOperationMeta operationMeta = new RestOperationMeta(); diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java index 0ef503900..53edb8b9b 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java @@ -22,6 +22,7 @@ import org.apache.servicecomb.it.deploy.MicroserviceDeploy; import org.apache.servicecomb.it.junit.ITJUnitUtils; import org.apache.servicecomb.it.schema.TestApiOperation; +import org.apache.servicecomb.it.testcase.TestAcceptType; import org.apache.servicecomb.it.testcase.TestAnnotatedAttribute; import org.apache.servicecomb.it.testcase.TestApiParam; import org.apache.servicecomb.it.testcase.TestChangeTransport; @@ -102,6 +103,7 @@ private static void runShareTestCases() throws Throwable { // only rest support default value feature ITJUnitUtils.runWithRest(TestDefaultValue.class); +ITJUnitUtils.runWithRest(TestAcceptType.class); ITJUnitUtils.runWithRest(TestDownload.class); diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestAcceptType.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestAcceptType.java new file mode 100644 index 0..9b2f2b18e --- /dev/null +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestAcceptType.java @@ -0,0 +1,102 @@ +/* + * 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
[jira] [Commented] (SCB-1065) when request not contain traceId,should use provider's invocation's traceId
[ https://issues.apache.org/jira/browse/SCB-1065?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709566#comment-16709566 ] ASF GitHub Bot commented on SCB-1065: - weichao666 commented on a change in pull request #1022: [SCB-1065] when request not contain traceId,should use provider's invocation's traceId URL: https://github.com/apache/servicecomb-java-chassis/pull/1022#discussion_r238920499 ## File path: swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java ## @@ -68,6 +68,22 @@ public void addContext(Map otherContext) { context.putAll(otherContext); } + public void mergeContext(InvocationContext otherContext) { +mergeContext(otherContext.getContext()); + } + + public void mergeContext(Map otherContext) { +if (otherContext == null) { + return; +} +if (otherContext.size() > context.size()) { + otherContext.putAll(context); Review comment: done, use otherContext.putIfAbsent, when otherContext's key is already exists, use otherContext's value, when otherContext does not contain key, use context's value 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 > when request not contain traceId,should use provider's invocation's traceId > --- > > Key: SCB-1065 > URL: https://issues.apache.org/jira/browse/SCB-1065 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: WeiChao >Assignee: WeiChao >Priority: Major > Fix For: java-chassis-1.2.0 > > > when request not contain traceId,should use provider's invocation's traceId -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1065) when request not contain traceId,should use provider's invocation's traceId
[ https://issues.apache.org/jira/browse/SCB-1065?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709565#comment-16709565 ] ASF GitHub Bot commented on SCB-1065: - weichao666 commented on a change in pull request #1022: [SCB-1065] when request not contain traceId,should use provider's invocation's traceId URL: https://github.com/apache/servicecomb-java-chassis/pull/1022#discussion_r238919805 ## File path: common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java ## @@ -103,7 +103,7 @@ protected void setContext() throws Exception { @SuppressWarnings("unchecked") Map cseContext = JsonUtils.readValue(strCseContext.getBytes(StandardCharsets.UTF_8), Map.class); -invocation.setContext(cseContext); +invocation.addContext(cseContext); Review comment: done 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 > when request not contain traceId,should use provider's invocation's traceId > --- > > Key: SCB-1065 > URL: https://issues.apache.org/jira/browse/SCB-1065 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: WeiChao >Assignee: WeiChao >Priority: Major > Fix For: java-chassis-1.2.0 > > > when request not contain traceId,should use provider's invocation's traceId -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1066) when start error, destroy method may throw an exception lead to origin exception losed
[ https://issues.apache.org/jira/browse/SCB-1066?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709560#comment-16709560 ] ASF GitHub Bot commented on SCB-1066: - jeho0815 opened a new pull request #1023: [SCB-1066] when start error, destroy method may throw an exception le… URL: https://github.com/apache/servicecomb-java-chassis/pull/1023 …ad to origin exception losed Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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 > when start error, destroy method may throw an exception lead to origin > exception losed > -- > > Key: SCB-1066 > URL: https://issues.apache.org/jira/browse/SCB-1066 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: jeho0815 >Assignee: jeho0815 >Priority: Major > Attachments: image-2018-12-04-21-25-08-309.png > > > > 1、when operationid repead, ProducerProviderManager shutdown error with a NPE > 2、using LocalServiceRegistryClientImpl > !image-2018-12-04-21-25-08-309.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1065) when request not contain traceId,should use provider's invocation's traceId
[ https://issues.apache.org/jira/browse/SCB-1065?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709524#comment-16709524 ] ASF GitHub Bot commented on SCB-1065: - jeho0815 commented on a change in pull request #1022: [SCB-1065] when request not contain traceId,should use provider's invocation's traceId URL: https://github.com/apache/servicecomb-java-chassis/pull/1022#discussion_r238906399 ## File path: swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java ## @@ -68,6 +68,22 @@ public void addContext(Map otherContext) { context.putAll(otherContext); } + public void mergeContext(InvocationContext otherContext) { +mergeContext(otherContext.getContext()); + } + + public void mergeContext(Map otherContext) { +if (otherContext == null) { + return; +} +if (otherContext.size() > context.size()) { + otherContext.putAll(context); Review comment: > 1.loop context and otherContext.putIfAbsent > 2.still did not process highway transport? new traceid created in invocation.onStart, then merge context. if only merge absent keys, the traceid is the new one. can we put the merge context before invocation.onStart? 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 > when request not contain traceId,should use provider's invocation's traceId > --- > > Key: SCB-1065 > URL: https://issues.apache.org/jira/browse/SCB-1065 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: WeiChao >Assignee: WeiChao >Priority: Major > Fix For: java-chassis-1.2.0 > > > when request not contain traceId,should use provider's invocation's traceId -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1051) when interface set produces=text/plain;charset=utf-8. and consumers set accept = text/plain,will cause error
[ https://issues.apache.org/jira/browse/SCB-1051?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709403#comment-16709403 ] ASF GitHub Bot commented on SCB-1051: - coveralls edited a comment on issue #1015: [SCB-1051]when interface set produces=text/plain;charset=utf-8. and c… URL: https://github.com/apache/servicecomb-java-chassis/pull/1015#issuecomment-442428828 [![Coverage Status](https://coveralls.io/builds/20445930/badge)](https://coveralls.io/builds/20445930) Coverage decreased (-0.003%) to 86.715% when pulling **eeaef6f635b87c4ff17bd77b72a608f9997a3ed7 on heyile:producerCharset** into **a21611163909bd075f3f7c737474e44c95f4c062 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > when interface set produces=text/plain;charset=utf-8. and consumers set > accept = text/plain,will cause error > > > Key: SCB-1051 > URL: https://issues.apache.org/jira/browse/SCB-1051 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > Attachments: screenshot-1.png > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1054) when download file, we should ignore consumer acceptType
[ https://issues.apache.org/jira/browse/SCB-1054?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709382#comment-16709382 ] ASF GitHub Bot commented on SCB-1054: - coveralls edited a comment on issue #1016: [SCB-1054]when download file, we should ignore consumer acceptType URL: https://github.com/apache/servicecomb-java-chassis/pull/1016#issuecomment-442685627 [![Coverage Status](https://coveralls.io/builds/20444824/badge)](https://coveralls.io/builds/20444824) Coverage increased (+0.03%) to 86.744% when pulling **bae955707154770cf34d71da051feb3234d0b799 on heyile:downloadAccept** into **a21611163909bd075f3f7c737474e44c95f4c062 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > when download file, we should ignore consumer acceptType > > > Key: SCB-1054 > URL: https://issues.apache.org/jira/browse/SCB-1054 > Project: Apache ServiceComb > Issue Type: Bug >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Critical > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16709114#comment-16709114 ] ASF GitHub Bot commented on SCB-1044: - coveralls edited a comment on issue #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#issuecomment-441660699 [![Coverage Status](https://coveralls.io/builds/20441172/badge)](https://coveralls.io/builds/20441172) Coverage increased (+0.02%) to 86.733% when pulling **906d4936bbe3d3834d8435d6fd8b7a1474d707a9 on heyile:cpuAndNet** into **f4b9d7b460497aff6eeab432d5b570abdb934edb on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1047) microservice.yaml service_description.version support format xxx.xx.xxx.xxx
[ https://issues.apache.org/jira/browse/SCB-1047?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708980#comment-16708980 ] ASF GitHub Bot commented on SCB-1047: - coveralls edited a comment on issue #1013: [SCB-1047]microservice.yaml service_description.version support form… URL: https://github.com/apache/servicecomb-java-chassis/pull/1013#issuecomment-441953809 [![Coverage Status](https://coveralls.io/builds/20438583/badge)](https://coveralls.io/builds/20438583) Coverage decreased (-0.0008%) to 86.711% when pulling **e0a23a8d9efd55548d39598b144a38ac91651c85 on heyile:versionFour** into **2bb90ab5d7e1d333141e07db23f02569307d6ef1 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > microservice.yaml service_description.version support format xxx.xx.xxx.xxx > > > Key: SCB-1047 > URL: https://issues.apache.org/jira/browse/SCB-1047 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1049) Alarm center
[ https://issues.apache.org/jira/browse/SCB-1049?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708984#comment-16708984 ] ASF GitHub Bot commented on SCB-1049: - coveralls edited a comment on issue #503: WIP: SCB-1049 Alarm center URL: https://github.com/apache/servicecomb-service-center/pull/503#issuecomment-443585336 [![Coverage Status](https://coveralls.io/builds/20445080/badge)](https://coveralls.io/builds/20445080) Coverage decreased (-0.1%) to 61.712% when pulling **7184fc2e96cff1e9de0e3e08b9e0e025cfcc5508 on little-cui:alarm** into **b2bc7a931a2bde31f1ee0f8e5e5348de9a7f67bf on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Alarm center > > > Key: SCB-1049 > URL: https://issues.apache.org/jira/browse/SCB-1049 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.2.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1049) Alarm center
[ https://issues.apache.org/jira/browse/SCB-1049?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708817#comment-16708817 ] ASF GitHub Bot commented on SCB-1049: - codecov-io edited a comment on issue #503: WIP: SCB-1049 Alarm center URL: https://github.com/apache/servicecomb-service-center/pull/503#issuecomment-443584904 # [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=h1) Report > Merging [#503](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=desc) into [master](https://codecov.io/gh/apache/servicecomb-service-center/commit/b2bc7a931a2bde31f1ee0f8e5e5348de9a7f67bf?src=pr=desc) will **decrease** coverage by `0.15%`. > The diff coverage is `70.08%`. [![Impacted file tree graph](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/graphs/tree.svg?width=650=GAaF7zrg8R=150=pr)](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=tree) ```diff @@Coverage Diff@@ ## master#503 +/- ## = - Coverage 59.35% 59.2% -0.16% = Files 166 168 +2 Lines 13944 14017 +73 = + Hits 82778299 +22 - Misses 50815132 +51 Partials 586 586 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/notify/publisher.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL25vdGlmeS9wdWJsaXNoZXIuZ28=) | `95.65% <ø> (ø)` | | | [server/service/event/instance\_event\_handler.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvZXZlbnQvaW5zdGFuY2VfZXZlbnRfaGFuZGxlci5nbw==) | `7.54% <0%> (ø)` | :arrow_up: | | [...erver/plugin/pkg/discovery/servicecenter/syncer.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvZGlzY292ZXJ5L3NlcnZpY2VjZW50ZXIvc3luY2VyLmdv) | `41.17% <0%> (-1.58%)` | :arrow_down: | | [server/core/config.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL2NvcmUvY29uZmlnLmdv) | `0% <0%> (ø)` | :arrow_up: | | [server/service/event/rule\_event\_handler.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvZXZlbnQvcnVsZV9ldmVudF9oYW5kbGVyLmdv) | `8.33% <0%> (ø)` | :arrow_up: | | [server/service/event/tag\_event\_handler.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvZXZlbnQvdGFnX2V2ZW50X2hhbmRsZXIuZ28=) | `7.14% <0%> (ø)` | :arrow_up: | | [server/service/instance.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvaW5zdGFuY2UuZ28=) | `67.75% <0%> (-0.5%)` | :arrow_down: | | [server/admin/controller\_v4.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL2FkbWluL2NvbnRyb2xsZXJfdjQuZ28=) | `16.21% <10%> (-6.01%)` | :arrow_down: | | [pkg/util/json.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-cGtnL3V0aWwvanNvbi5nbw==) | `100% <100%> (ø)` | | | [server/error/error.go](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree#diff-c2VydmVyL2Vycm9yL2Vycm9yLmdv) | `100% <100%> (ø)` | :arrow_up: | | ... and [26 more](https://codecov.io/gh/apache/servicecomb-service-center/pull/503/diff?src=pr=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=footer). Last update [b2bc7a9...7184fc2](https://codecov.io/gh/apache/servicecomb-service-center/pull/503?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). 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 > Alarm center > > > Key: SCB-1049 > URL: https://issues.apache.org/jira/browse/SCB-1049 > Project: Apache
[jira] [Commented] (SCB-1051) when interface set produces=text/plain;charset=utf-8. and consumers set accept = text/plain,will cause error
[ https://issues.apache.org/jira/browse/SCB-1051?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708816#comment-16708816 ] ASF GitHub Bot commented on SCB-1051: - heyile commented on a change in pull request #1015: [SCB-1051]when interface set produces=text/plain;charset=utf-8. and c… URL: https://github.com/apache/servicecomb-java-chassis/pull/1015#discussion_r238695923 ## File path: integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestAcceptType.java ## @@ -0,0 +1,110 @@ +/* + * 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.servicecomb.it.testcase; + +import org.apache.servicecomb.it.Consumers; +import org.apache.servicecomb.swagger.invocation.exception.InvocationException; +import org.junit.Assert; +import org.junit.Test; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; + +public class TestAcceptType { + interface AcceptTypeIntf { + } + + private static Consumers consumersAcceptTypeSpringmvc = new Consumers<>("acceptTypeSpringmvcSchema", + AcceptTypeIntf.class); + + private static Consumers consumersAcceptTypeJaxrs = new Consumers<>("acceptTypeJaxrsSchema", + AcceptTypeIntf.class); + + + @Test + public void testTextPlain_rt() { +checkTextPlain(consumersAcceptTypeSpringmvc); +checkTextPlain(consumersAcceptTypeJaxrs); + } + + private void checkTextPlain(Consumers consumers) { +String result = textHeader_rt(consumers, MediaType.TEXT_PLAIN_VALUE); +Assert.assertEquals("cse", result); + +try { + textHeader_rt(consumers, MediaType.APPLICATION_JSON_VALUE); + Assert.fail("should throw exception"); +} catch (InvocationException e) { + Assert.assertEquals(406, e.getStatusCode()); + Assert.assertTrue(e.getMessage().contains("Accept application/json is not supported")); +} catch (Exception e) { Review comment: ok This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > when interface set produces=text/plain;charset=utf-8. and consumers set > accept = text/plain,will cause error > > > Key: SCB-1051 > URL: https://issues.apache.org/jira/browse/SCB-1051 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > Attachments: screenshot-1.png > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708730#comment-16708730 ] ASF GitHub Bot commented on SCB-1044: - heyile commented on a change in pull request #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#discussion_r238671015 ## File path: metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/cpu/OsCpuUsage.java ## @@ -0,0 +1,68 @@ +/* + * 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.servicecomb.metrics.core.meter.os.cpu; + +import com.google.common.annotations.VisibleForTesting; +import com.netflix.spectator.api.Id; + +/* + * unit : 1 jiffies = 10ms = 0.01 s + * more details : + * http://man7.org/linux/man-pages/man5/proc.5.html + * CMD : /proc/stat + * cpu 2445171 599297 353967 24490633 11242 0107802993 0 0 + * cpu usernice system idle iowait irq softirq stealstolen guest guest_nice + * 01 2 3 456 78 + * total = user + nice + system + idle + iowait + irq + softirq + stealstolen + * busy = total - idle + */ +public class OsCpuUsage extends AbstractCpuUsage { + private long lastTotalTime; + + private long currentTotalTime; + + public OsCpuUsage(Id id) { +super(id, "/proc/stat"); + } + + @Override + protected void update(String[] stats) { +currentTotalTime = readCurrentTotalTime(stats); +periodTotalTime = currentTotalTime - lastTotalTime; +lastTotalTime = currentTotalTime; + +super.update(stats); + } + + private long readCurrentTotalTime(String[] stats) { +long total = 0L; +for (int i = 1; i <= 8; i++) { + total += Long.parseLong(stats[i]); +} +return total; + } + + @Override + protected long readCurrentBusyTime(String[] stats) { +return currentTotalTime - Long.parseLong(stats[4]); + } + + @VisibleForTesting Review comment: ok, I will delete it 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 > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708736#comment-16708736 ] ASF GitHub Bot commented on SCB-1044: - heyile commented on a change in pull request #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#discussion_r238671350 ## File path: metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/NetMeter.java ## @@ -43,101 +46,48 @@ public static final Tag TAG_RECEIVE = new BasicTag(STATISTIC, "receive"); - public static final Tag TAG_SEND = new BasicTag(STATISTIC, "send"); - - private final Id id; - - private Map interfaceInfoMap = new ConcurrentHashMap<>(); - - public static class InterfaceInfo { -private final String name; - -private Id sendId; - -private Id receiveId; - -//receive bytes -private long lastRxBytes; - -//transmit bytes -private long lastTxBytes; - -// bytes per second -private double sendRate; - -private double receiveRate; - -InterfaceInfo(Id id, String name) { - this.name = name; - id = id.withTag(INTERFACE, name); - this.sendId = id.withTag(TAG_SEND); - this.receiveId = id.withTag(TAG_RECEIVE); -} - -public void update(String interfaceData, long secondInterval) { - String[] netInfo = interfaceData.trim().split("\\s+"); - long rxBytes = Long.parseLong(netInfo[0]); - long txBytes = Long.parseLong(netInfo[8]); - sendRate = (double) (txBytes - lastTxBytes) / secondInterval; - receiveRate = (double) (rxBytes - lastRxBytes) / secondInterval; - lastRxBytes = rxBytes; - lastTxBytes = txBytes; -} - -public String getName() { - return name; -} + public static final Tag TAG_PACKETS_RECEIVE = new BasicTag(STATISTIC, "receivePackets"); -public long getLastRxBytes() { - return lastRxBytes; -} + public static final Tag TAG_SEND = new BasicTag(STATISTIC, "send"); -public long getLastTxBytes() { - return lastTxBytes; -} + public static final Tag TAG_PACKETS_SEND = new BasicTag(STATISTIC, "sendPackets"); -public double getSendRate() { - return sendRate; -} + private final Id id; -public double getReceiveRate() { - return receiveRate; -} - } + private Map interfaceUsageMap = new ConcurrentHashMap<>(); public NetMeter(Id id) { this.id = id; - -// init lastRxBytes and lastTxBytes +// init lastRxBytes, lastRxPackets, lastTxBytes, lastTxPackets refreshNet(1); -for (InterfaceInfo interfaceInfo : interfaceInfoMap.values()) { - interfaceInfo.sendRate = 0; - interfaceInfo.receiveRate = 0; -} +interfaceUsageMap.values().forEach(interfaceUsage -> { + interfaceUsage.getNetStats().forEach(NetStat::clearRate); +}); } public void calcMeasurements(List measurements, long msNow, long secondInterval) { refreshNet(secondInterval); -for (InterfaceInfo interfaceInfo : interfaceInfoMap.values()) { - measurements.add(new Measurement(interfaceInfo.sendId, msNow, interfaceInfo.sendRate)); - measurements.add(new Measurement(interfaceInfo.receiveId, msNow, interfaceInfo.receiveRate)); -} +interfaceUsageMap.values().stream() Review comment: I see 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 > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708735#comment-16708735 ] ASF GitHub Bot commented on SCB-1044: - heyile commented on a change in pull request #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#discussion_r238672021 ## File path: metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/CpuMeter.java ## @@ -16,92 +16,59 @@ */ package org.apache.servicecomb.metrics.core.meter.os; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.util.List; -import org.apache.commons.io.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.servicecomb.metrics.core.meter.os.cpu.OsCpuUsage; +import org.apache.servicecomb.metrics.core.meter.os.cpu.ProcessCpuUsage; +import com.google.common.annotations.VisibleForTesting; +import com.netflix.spectator.api.BasicTag; import com.netflix.spectator.api.Id; import com.netflix.spectator.api.Measurement; +import com.netflix.spectator.api.Tag; public class CpuMeter { - private static final Logger LOGGER = LoggerFactory.getLogger(CpuMeter.class); - private double rate; + public static final Tag TAG_All = new BasicTag(OsMeter.OS_TYPE, OsMeter.OS_TYPE_ALL_CPU); - private long lastTotalTime; + public static final Tag TAG_CURRENT = new BasicTag(OsMeter.OS_TYPE, OsMeter.OS_TYPE_PROCESS_CPU); Review comment: ok. I will modify it 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 > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1056) Put provider QPS flow control in front
[ https://issues.apache.org/jira/browse/SCB-1056?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708727#comment-16708727 ] ASF GitHub Bot commented on SCB-1056: - liubao68 closed pull request #1017: [SCB-1056] put provider flow control logic in front URL: https://github.com/apache/servicecomb-java-chassis/pull/1017 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/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java index 932aef4c3..d2b08aa05 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java @@ -26,6 +26,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response.Status; +import javax.xml.ws.Holder; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor; @@ -36,6 +37,7 @@ import org.apache.servicecomb.common.rest.locator.OperationLocator; import org.apache.servicecomb.common.rest.locator.ServicePathManager; import org.apache.servicecomb.core.Const; +import org.apache.servicecomb.core.Handler; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.definition.MicroserviceMeta; import org.apache.servicecomb.core.definition.OperationMeta; @@ -126,6 +128,19 @@ protected void scheduleInvocation() { invocation.getInvocationStageTrace().startSchedule(); OperationMeta operationMeta = restOperationMeta.getOperationMeta(); +try { + this.setContext(); +} catch (Exception e) { + LOGGER.error("failed to set invocation context", e); + sendFailResponse(e); + return; +} + +Holder qpsFlowControlReject = checkQpsFlowControl(operationMeta); +if (qpsFlowControlReject.value) { + return; +} + operationMeta.getExecutor().execute(() -> { synchronized (this.requestEx) { try { @@ -150,6 +165,26 @@ protected void scheduleInvocation() { }); } + private Holder checkQpsFlowControl(OperationMeta operationMeta) { +Holder qpsFlowControlReject = new Holder<>(false); +@SuppressWarnings("deprecation") +Handler providerQpsFlowControlHandler = operationMeta.getProviderQpsFlowControlHandler(); +if (null != providerQpsFlowControlHandler) { + try { +providerQpsFlowControlHandler.handle(invocation, response -> { + qpsFlowControlReject.value = true; + produceProcessor = ProduceProcessorManager.JSON_PROCESSOR; + sendResponse(response); +}); + } catch (Exception e) { +LOGGER.error("failed to execute ProviderQpsFlowControlHandler", e); +qpsFlowControlReject.value = true; +sendFailResponse(e); + } +} +return qpsFlowControlReject; + } + private boolean isInQueueTimeout() { return System.nanoTime() - invocation.getInvocationStageTrace().getStart() > CommonRestConfig.getRequestWaitInPoolTimeout() * 1_000_000; @@ -183,7 +218,6 @@ public void invoke() { protected Response prepareInvoke() throws Throwable { this.initProduceProcessor(); -this.setContext(); invocation.getHandlerContext().put(RestConst.REST_REQUEST, requestEx); invocation.getInvocationStageTrace().startServerFiltersRequest(); @@ -201,9 +235,7 @@ protected Response prepareInvoke() throws Throwable { protected void doInvoke() throws Throwable { invocation.getInvocationStageTrace().startHandlersRequest(); -invocation.next(resp -> { - sendResponseQuietly(resp); -}); +invocation.next(resp -> sendResponseQuietly(resp)); } public void sendFailResponse(Throwable throwable) { diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java index faf37a539..5a8c85962 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java @@ -17,6 +17,8 @@ package org.apache.servicecomb.common.rest; +import static org.junit.Assert.assertEquals; + import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -49,10 +51,11 @@ import org.apache.servicecomb.foundation.common.utils.JsonUtils; import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils; import
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708681#comment-16708681 ] ASF GitHub Bot commented on SCB-1044: - wujimin commented on a change in pull request #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#discussion_r238655349 ## File path: metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/cpu/OsCpuUsage.java ## @@ -0,0 +1,68 @@ +/* + * 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.servicecomb.metrics.core.meter.os.cpu; + +import com.google.common.annotations.VisibleForTesting; +import com.netflix.spectator.api.Id; + +/* + * unit : 1 jiffies = 10ms = 0.01 s + * more details : + * http://man7.org/linux/man-pages/man5/proc.5.html + * CMD : /proc/stat + * cpu 2445171 599297 353967 24490633 11242 0107802993 0 0 + * cpu usernice system idle iowait irq softirq stealstolen guest guest_nice + * 01 2 3 456 78 + * total = user + nice + system + idle + iowait + irq + softirq + stealstolen + * busy = total - idle + */ +public class OsCpuUsage extends AbstractCpuUsage { + private long lastTotalTime; + + private long currentTotalTime; + + public OsCpuUsage(Id id) { +super(id, "/proc/stat"); + } + + @Override + protected void update(String[] stats) { +currentTotalTime = readCurrentTotalTime(stats); +periodTotalTime = currentTotalTime - lastTotalTime; +lastTotalTime = currentTotalTime; + +super.update(stats); + } + + private long readCurrentTotalTime(String[] stats) { +long total = 0L; +for (int i = 1; i <= 8; i++) { + total += Long.parseLong(stats[i]); +} +return total; + } + + @Override + protected long readCurrentBusyTime(String[] stats) { +return currentTotalTime - Long.parseLong(stats[4]); + } + + @VisibleForTesting Review comment: too many VisibleForTesting 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 > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708676#comment-16708676 ] ASF GitHub Bot commented on SCB-1044: - wujimin commented on a change in pull request #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#discussion_r238654827 ## File path: metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/NetMeter.java ## @@ -43,101 +46,48 @@ public static final Tag TAG_RECEIVE = new BasicTag(STATISTIC, "receive"); - public static final Tag TAG_SEND = new BasicTag(STATISTIC, "send"); - - private final Id id; - - private Map interfaceInfoMap = new ConcurrentHashMap<>(); - - public static class InterfaceInfo { -private final String name; - -private Id sendId; - -private Id receiveId; - -//receive bytes -private long lastRxBytes; - -//transmit bytes -private long lastTxBytes; - -// bytes per second -private double sendRate; - -private double receiveRate; - -InterfaceInfo(Id id, String name) { - this.name = name; - id = id.withTag(INTERFACE, name); - this.sendId = id.withTag(TAG_SEND); - this.receiveId = id.withTag(TAG_RECEIVE); -} - -public void update(String interfaceData, long secondInterval) { - String[] netInfo = interfaceData.trim().split("\\s+"); - long rxBytes = Long.parseLong(netInfo[0]); - long txBytes = Long.parseLong(netInfo[8]); - sendRate = (double) (txBytes - lastTxBytes) / secondInterval; - receiveRate = (double) (rxBytes - lastRxBytes) / secondInterval; - lastRxBytes = rxBytes; - lastTxBytes = txBytes; -} - -public String getName() { - return name; -} + public static final Tag TAG_PACKETS_RECEIVE = new BasicTag(STATISTIC, "receivePackets"); -public long getLastRxBytes() { - return lastRxBytes; -} + public static final Tag TAG_SEND = new BasicTag(STATISTIC, "send"); -public long getLastTxBytes() { - return lastTxBytes; -} + public static final Tag TAG_PACKETS_SEND = new BasicTag(STATISTIC, "sendPackets"); -public double getSendRate() { - return sendRate; -} + private final Id id; -public double getReceiveRate() { - return receiveRate; -} - } + private Map interfaceUsageMap = new ConcurrentHashMap<>(); public NetMeter(Id id) { this.id = id; - -// init lastRxBytes and lastTxBytes +// init lastRxBytes, lastRxPackets, lastTxBytes, lastTxPackets refreshNet(1); -for (InterfaceInfo interfaceInfo : interfaceInfoMap.values()) { - interfaceInfo.sendRate = 0; - interfaceInfo.receiveRate = 0; -} +interfaceUsageMap.values().forEach(interfaceUsage -> { + interfaceUsage.getNetStats().forEach(NetStat::clearRate); +}); } public void calcMeasurements(List measurements, long msNow, long secondInterval) { refreshNet(secondInterval); -for (InterfaceInfo interfaceInfo : interfaceInfoMap.values()) { - measurements.add(new Measurement(interfaceInfo.sendId, msNow, interfaceInfo.sendRate)); - measurements.add(new Measurement(interfaceInfo.receiveId, msNow, interfaceInfo.receiveRate)); -} +interfaceUsageMap.values().stream() Review comment: so complex, create a temp list and loop it to add to another list? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708683#comment-16708683 ] ASF GitHub Bot commented on SCB-1044: - wujimin commented on a change in pull request #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#discussion_r238655992 ## File path: metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/NetStat.java ## @@ -0,0 +1,63 @@ +/* + * 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.servicecomb.metrics.core.meter.os.net; + +import com.netflix.spectator.api.Id; + +public class NetStat { + private final int index; + + private Id id; + + // send/recv bytes/packets + private long lastValue; + + // Bps/pps + private double rate; + + Review comment: why always have useless empty lines? 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 > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1044) add current process CPU rate and net packets in the metrics
[ https://issues.apache.org/jira/browse/SCB-1044?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708669#comment-16708669 ] ASF GitHub Bot commented on SCB-1044: - wujimin commented on a change in pull request #1012: [SCB-1044]add current process CPU rate and net packets in the metrics URL: https://github.com/apache/servicecomb-java-chassis/pull/1012#discussion_r238653915 ## File path: metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/CpuMeter.java ## @@ -16,92 +16,59 @@ */ package org.apache.servicecomb.metrics.core.meter.os; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.util.List; -import org.apache.commons.io.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.servicecomb.metrics.core.meter.os.cpu.OsCpuUsage; +import org.apache.servicecomb.metrics.core.meter.os.cpu.ProcessCpuUsage; +import com.google.common.annotations.VisibleForTesting; +import com.netflix.spectator.api.BasicTag; import com.netflix.spectator.api.Id; import com.netflix.spectator.api.Measurement; +import com.netflix.spectator.api.Tag; public class CpuMeter { - private static final Logger LOGGER = LoggerFactory.getLogger(CpuMeter.class); - private double rate; + public static final Tag TAG_All = new BasicTag(OsMeter.OS_TYPE, OsMeter.OS_TYPE_ALL_CPU); - private long lastTotalTime; + public static final Tag TAG_CURRENT = new BasicTag(OsMeter.OS_TYPE, OsMeter.OS_TYPE_PROCESS_CPU); - private long lastIdleTime; + // read from /proc/stat + private OsCpuUsage allCpuUsage; - private int cpuNum; - - private Id id; + // read from /proc/{pid}/stat + private ProcessCpuUsage processCpuUsage; public CpuMeter(Id id) { -this.id = id; -this.cpuNum = Runtime.getRuntime().availableProcessors(); -refreshCpu(); -rate = 0.0; - } - - public void calcMeasurements(List measurements, long msNow) { -refreshCpu(); -measurements.add(new Measurement(id, msNow, rate)); - } - - /* - * unit : 1 jiffies = 10ms = 0.01 s - * more details : - * http://man7.org/linux/man-pages/man5/proc.5.html - * cpu 2445171 599297 353967 24490633 11242 0107802993 0 0 - * cpu usernice system idle iowait irq softirq stealstolen guest guest_nice - * 01 2 3 456 78 - * cpuTotal = user + nice + system + idle + iowait + irq + softirq + stealstolen - */ - protected void refreshCpu() { -try { - File file = new File("/proc/stat"); - //just use first line - String cpuStr = FileUtils.readLines(file, StandardCharsets.UTF_8).get(0); - String[] cpuInfo = cpuStr.trim().split("\\s+"); - long idle = Long.parseLong(cpuInfo[4]); - long total = 0L; - for (int i = 1; i <= 8; i++) { -total += Long.parseLong(cpuInfo[i]); - } - //just check, make sure it's safe - if (total != lastTotalTime) { -rate = 1.0 - (double) (idle - lastIdleTime) / (total - lastTotalTime); -rate *= cpuNum; - } - lastTotalTime = total; - lastIdleTime = idle; -} catch (IOException e) { - LOGGER.error("Failed to read current cpu info.", e); -} - } +allCpuUsage = new OsCpuUsage(id.withTag(TAG_All)); +processCpuUsage = new ProcessCpuUsage(id.withTag(TAG_CURRENT)); - public double getRate() { -return rate; +//must refresh all first +update(); +allCpuUsage.setUsage(0); +processCpuUsage.setUsage(0); } - public long getLastTotalTime() { -return lastTotalTime; + public void calcMeasurements(List measurements, long msNow) { +update(); +measurements.add(new Measurement(allCpuUsage.getId(), msNow, allCpuUsage.getUsage())); +measurements.add(new Measurement(processCpuUsage.getId(), msNow, processCpuUsage.getUsage())); } - public long getLastIdleTime() { -return lastIdleTime; + @VisibleForTesting Review comment: why so many VisibleForTesting? just check measurements is not enough? 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 > add current process CPU rate and net packets in the metrics > > > Key: SCB-1044 > URL: https://issues.apache.org/jira/browse/SCB-1044 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Java-Chassis >Reporter: 何一乐 >Assignee: 何一乐 >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1065) when request not contain traceId,should use provider's invocation's traceId
[ https://issues.apache.org/jira/browse/SCB-1065?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708663#comment-16708663 ] ASF GitHub Bot commented on SCB-1065: - wujimin commented on a change in pull request #1022: [SCB-1065] when request not contain traceId,should use provider's invocation's traceId URL: https://github.com/apache/servicecomb-java-chassis/pull/1022#discussion_r238653191 ## File path: swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java ## @@ -68,6 +68,22 @@ public void addContext(Map otherContext) { context.putAll(otherContext); } + public void mergeContext(InvocationContext otherContext) { +mergeContext(otherContext.getContext()); + } + + public void mergeContext(Map otherContext) { +if (otherContext == null) { + return; +} +if (otherContext.size() > context.size()) { + otherContext.putAll(context); Review comment: 1.loop context and otherContext.putIfAbsent 2.still did not process highway transport? 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 > when request not contain traceId,should use provider's invocation's traceId > --- > > Key: SCB-1065 > URL: https://issues.apache.org/jira/browse/SCB-1065 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: WeiChao >Assignee: WeiChao >Priority: Major > Fix For: java-chassis-1.2.0 > > > when request not contain traceId,should use provider's invocation's traceId -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-1047) microservice.yaml service_description.version support format xxx.xx.xxx.xxx
[ https://issues.apache.org/jira/browse/SCB-1047?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16708546#comment-16708546 ] ASF GitHub Bot commented on SCB-1047: - liubao68 closed pull request #1013: [SCB-1047]microservice.yaml service_description.version support form… URL: https://github.com/apache/servicecomb-java-chassis/pull/1013 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/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestConsumerProviderManager.java b/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestConsumerProviderManager.java index 7cee5e3fb..56bfe3897 100644 --- a/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestConsumerProviderManager.java +++ b/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestConsumerProviderManager.java @@ -94,7 +94,7 @@ public void createReferenceConfig_default() { Assert.assertEquals("app", referenceConfig.getMicroserviceVersionRule().getAppId()); Assert.assertEquals("app:ms", referenceConfig.getMicroserviceVersionRule().getMicroserviceName()); -Assert.assertEquals("0.0.0+", referenceConfig.getMicroserviceVersionRule().getVersionRule().getVersionRule()); +Assert.assertEquals("0.0.0.0+", referenceConfig.getMicroserviceVersionRule().getVersionRule().getVersionRule()); Assert.assertEquals(Const.ANY_TRANSPORT, referenceConfig.getTransport()); } @@ -107,7 +107,7 @@ public void createReferenceConfig_config() { Assert.assertEquals("app", referenceConfig.getMicroserviceVersionRule().getAppId()); Assert.assertEquals("app:ms", referenceConfig.getMicroserviceVersionRule().getMicroserviceName()); -Assert.assertEquals("1.0.0+", referenceConfig.getMicroserviceVersionRule().getVersionRule().getVersionRule()); +Assert.assertEquals("1.0.0.0+", referenceConfig.getMicroserviceVersionRule().getVersionRule().getVersionRule()); Assert.assertEquals(Const.RESTFUL, referenceConfig.getTransport()); } diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestCompatiblePathVersionMapper.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestCompatiblePathVersionMapper.java index 2cfb9fc98..871c25d41 100644 --- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestCompatiblePathVersionMapper.java +++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestCompatiblePathVersionMapper.java @@ -35,7 +35,7 @@ public void getOrCreate() { VersionRule versionRule = mapper.getOrCreate("v1"); -Assert.assertEquals("1.0.0-2.0.0", versionRule.getVersionRule()); +Assert.assertEquals("1.0.0.0-2.0.0.0", versionRule.getVersionRule()); } @Test @@ -82,6 +82,6 @@ public void createVersionRule_tooBig() { public void createVersionRule_32767() { VersionRule versionRule = mapper.getOrCreate("v32767"); -Assert.assertEquals("32767.0.0+", versionRule.getVersionRule()); +Assert.assertEquals("32767.0.0.0+", versionRule.getVersionRule()); } } diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java index 518740a82..e74f13aed 100644 --- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java +++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java @@ -71,7 +71,7 @@ public void testOnRequest(@Mocked Router router, @Mocked Route route result = requst; requst.path(); result = "/api/testService/v1/hello"; -invocation.setVersionRule("1.0.0-2.0.0"); +invocation.setVersionRule("1.0.0.0-2.0.0.0"); invocation.init("testService", context, "/testService/v1/hello", Deencapsulation.getField(dispatcher, "httpServerFilters")); invocation.edgeInvoke(); diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceFactory.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceFactory.java index 97b2df482..2ace55f91 100644 --- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceFactory.java +++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceFactory.java @@ -34,6 +34,7 @@ import org.apache.servicecomb.serviceregistry.config.ConfigurePropertyUtils; import org.apache.servicecomb.serviceregistry.config.MicroservicePropertiesLoader; import