[GitHub] coveralls commented on issue #205: [SCB-647] Update license for Saga-0.2.0
coveralls commented on issue #205: [SCB-647] Update license for Saga-0.2.0 URL: https://github.com/apache/incubator-servicecomb-saga/pull/205#issuecomment-394924545 [](https://coveralls.io/builds/17341506) Coverage decreased (-0.09%) to 94.572% when pulling **fbf44244f2cccec1bc711e003bf9815b7d22480c on yangbor:master** into **6600268065adb8d02cb7a2754f16b0b110b8995a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong opened a new pull request #97: add how-to-grow-up-to-be-an-apache-committer blog
zhengyangyong opened a new pull request #97: add how-to-grow-up-to-be-an-apache-committer blog URL: https://github.com/apache/incubator-servicecomb-website/pull/97 Signed-off-by: zhengyangyong This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] yangbor commented on a change in pull request #205: [SCB-647] Update license for Saga-0.2.0
yangbor commented on a change in pull request #205: [SCB-647] Update license for Saga-0.2.0 URL: https://github.com/apache/incubator-servicecomb-saga/pull/205#discussion_r193279627 ## File path: saga-distribution/src/release/LICENSE ## @@ -353,45 +353,48 @@ For details, see their respective project links. Apache Commons Logging (http://commons.apache.org/proper/commons-logging/) commons-logging:commons-logging:jar:1.2 Bean Validation API (http://beanvalidation.org) javax.validation:validation-api:jar:1.1.0.Final -ClassMate (http://github.com/cowtowncoder/java-classmate) com.fasterxml:classmate:bundle:1.3.3 -com.google.api.grpc:proto-google-common-protos (https://github.com/googleapis/googleapis) com.google.api.grpc:proto-google-common-protos:jar:0.1.9 +ClassMate (http://github.com/cowtowncoder/java-classmate) com.fasterxml:classmate:bundle:1.3.4 +com.google.api.grpc:proto-google-common-protos (https://github.com/googleapis/googleapis) com.google.api.grpc:proto-google-common-protos:jar:1.0.0 dubbo (https://github.com/apache/incubator-dubbo) com.alibaba:dubbo:jar:2.6.1 -error-prone annotations (http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) com.google.errorprone:error_prone_annotations:jar:2.0.19 +error-prone annotations (http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) com.google.errorprone:error_prone_annotations:jar:2.1.2 FindBugs-jsr305 (http://findbugs.sourceforge.net/) com.google.code.findbugs:jsr305:jar:3.0.0 Gson (https://github.com/google/gson/gson) com.google.code.gson:gson:jar:2.7 Review comment: Updated the LICENSE and add description for the 2 versions of gson jar. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #205: [SCB-647] Update license for Saga-0.2.0
coveralls commented on issue #205: [SCB-647] Update license for Saga-0.2.0 URL: https://github.com/apache/incubator-servicecomb-saga/pull/205#issuecomment-394924545 [](https://coveralls.io/builds/17341060) Coverage decreased (-0.09%) to 94.572% when pulling **bfb3337bfab7635ff3ead27502c15e6ed048f0e5 on yangbor:master** into **6600268065adb8d02cb7a2754f16b0b110b8995a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] yangbor commented on a change in pull request #205: [SCB-647] Update license for Saga-0.2.0
yangbor commented on a change in pull request #205: [SCB-647] Update license for Saga-0.2.0 URL: https://github.com/apache/incubator-servicecomb-saga/pull/205#discussion_r193278837 ## File path: saga-distribution/src/release/LICENSE ## @@ -353,45 +353,48 @@ For details, see their respective project links. Apache Commons Logging (http://commons.apache.org/proper/commons-logging/) commons-logging:commons-logging:jar:1.2 Bean Validation API (http://beanvalidation.org) javax.validation:validation-api:jar:1.1.0.Final -ClassMate (http://github.com/cowtowncoder/java-classmate) com.fasterxml:classmate:bundle:1.3.3 -com.google.api.grpc:proto-google-common-protos (https://github.com/googleapis/googleapis) com.google.api.grpc:proto-google-common-protos:jar:0.1.9 +ClassMate (http://github.com/cowtowncoder/java-classmate) com.fasterxml:classmate:bundle:1.3.4 +com.google.api.grpc:proto-google-common-protos (https://github.com/googleapis/googleapis) com.google.api.grpc:proto-google-common-protos:jar:1.0.0 dubbo (https://github.com/apache/incubator-dubbo) com.alibaba:dubbo:jar:2.6.1 -error-prone annotations (http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) com.google.errorprone:error_prone_annotations:jar:2.0.19 +error-prone annotations (http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) com.google.errorprone:error_prone_annotations:jar:2.1.2 FindBugs-jsr305 (http://findbugs.sourceforge.net/) com.google.code.findbugs:jsr305:jar:3.0.0 Gson (https://github.com/google/gson/gson) com.google.code.gson:gson:jar:2.7 Review comment: Yes, both the gson-2.7.jar and gson-2.8.4.jar are included in the release. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] WillemJiang commented on a change in pull request #205: [SCB-647] Update license for Saga-0.2.0
WillemJiang commented on a change in pull request #205: [SCB-647] Update license for Saga-0.2.0 URL: https://github.com/apache/incubator-servicecomb-saga/pull/205#discussion_r193278397 ## File path: saga-distribution/src/release/LICENSE ## @@ -353,45 +353,48 @@ For details, see their respective project links. Apache Commons Logging (http://commons.apache.org/proper/commons-logging/) commons-logging:commons-logging:jar:1.2 Bean Validation API (http://beanvalidation.org) javax.validation:validation-api:jar:1.1.0.Final -ClassMate (http://github.com/cowtowncoder/java-classmate) com.fasterxml:classmate:bundle:1.3.3 -com.google.api.grpc:proto-google-common-protos (https://github.com/googleapis/googleapis) com.google.api.grpc:proto-google-common-protos:jar:0.1.9 +ClassMate (http://github.com/cowtowncoder/java-classmate) com.fasterxml:classmate:bundle:1.3.4 +com.google.api.grpc:proto-google-common-protos (https://github.com/googleapis/googleapis) com.google.api.grpc:proto-google-common-protos:jar:1.0.0 dubbo (https://github.com/apache/incubator-dubbo) com.alibaba:dubbo:jar:2.6.1 -error-prone annotations (http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) com.google.errorprone:error_prone_annotations:jar:2.0.19 +error-prone annotations (http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) com.google.errorprone:error_prone_annotations:jar:2.1.2 FindBugs-jsr305 (http://findbugs.sourceforge.net/) com.google.code.findbugs:jsr305:jar:3.0.0 Gson (https://github.com/google/gson/gson) com.google.code.gson:gson:jar:2.7 Review comment: Do we use these two same gson version? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？
ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/issues/722#issuecomment-394920278
CSE版本是2.3.12。
使用方式参照的是https://java.huaweicse.com/using-cse-in-spring-boot/web-application.html
通过在应用中注入一个io.opentracing.Tracer
bean的方式，使用opentracing-spring-web-autoconfigure的能力，配置jaeger相关，并没有其他的额外配置。
@Bean
public io.opentracing.Tracer jaegerTracer()
{
SenderConfiguration sender = new SenderConfiguration().withAgentHost(
System.getProperty("jaegeragent.ip",
"100.114.160.214")).withAgentPort(
Integer.getInteger("jaegeragent.port", 6831));
SamplerConfiguration sampler = new
SamplerConfiguration().withType(ProbabilisticSampler.TYPE).withParam(1);
return new
Configuration("configservice").withSampler(sampler).withReporter(
new
Configuration.ReporterConfiguration().withSender(sender)).getTracer();
}
调用方式
@Autowired
private RestTemplate restTemplate;
@RequestMapping(path = "/test", method = RequestMethod.GET)
public ResponseEntity queryTenant()
{
QueryTenantRsp resp = restTemplate.getForObject(
"cse://configservice/v1/tenants?tenant_id=111_size=10",
QueryTenantRsp.class);
return new ResponseEntity(resp, HttpStatus.CREATED);
}
jaegerui上看到的是调用/test一条，然后/v1/tenants一条。
是否当前ServiceComb并不支持集成jaeger，而仅支持zipkin呢？
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？
ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/issues/722#issuecomment-394920278
CSE版本是2.3.12。
使用方式参照的是https://java.huaweicse.com/using-cse-in-spring-boot/web-application.html。
通过在应用中注入一个io.opentracing.Tracer
bean的方式，使用opentracing-spring-web-autoconfigure的能力，配置jaeger相关，并没有其他的额外配置。
@Bean
public io.opentracing.Tracer jaegerTracer()
{
SenderConfiguration sender = new SenderConfiguration().withAgentHost(
System.getProperty("jaegeragent.ip",
"100.114.160.214")).withAgentPort(
Integer.getInteger("jaegeragent.port", 6831));
SamplerConfiguration sampler = new
SamplerConfiguration().withType(ProbabilisticSampler.TYPE).withParam(1);
return new
Configuration("configservice").withSampler(sampler).withReporter(
new
Configuration.ReporterConfiguration().withSender(sender)).getTracer();
}
调用方式
@Autowired
private RestTemplate restTemplate;
@RequestMapping(path = "/test", method = RequestMethod.GET)
public ResponseEntity queryTenant()
{
QueryTenantRsp resp = restTemplate.getForObject(
"cse://configservice/v1/tenants?tenant_id=111_size=10",
QueryTenantRsp.class);
return new ResponseEntity(resp, HttpStatus.CREATED);
}
jaegerui上看到的是调用/test一条，然后/v1/tenants一条。
是否当前ServiceComb并不支持集成jaeger，而仅支持zipkin呢？
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] yangbor opened a new pull request #205: [SCB-647] Update license for Saga-0.2.0
yangbor opened a new pull request #205: [SCB-647] Update license for Saga-0.2.0 URL: https://github.com/apache/incubator-servicecomb-saga/pull/205 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. - [ ] 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 With regards, Apache Git Services
[GitHub] ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？
ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？ URL: https://github.com/apache/incubator-servicecomb-java-chassis/issues/722#issuecomment-394918844 CSE版本是2.3.12，使用方式参照的https://huawei-servicecomb.gitbooks.io/developerguide/content/using-cse-in-spring-boot/web-application.html， This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？
ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/issues/722#issuecomment-394918899
。@Bean
public io.opentracing.Tracer jaegerTracer()
{
SenderConfiguration sender = new SenderConfiguration().withAgentHost(
System.getProperty("jaegeragent.ip",
"100.114.160.214")).withAgentPort(
Integer.getInteger("jaegeragent.port", 6831));
SamplerConfiguration sampler = new
SamplerConfiguration().withType(ProbabilisticSampler.TYPE).withParam(1);
return new
Configuration("configservice").withSampler(sampler).withReporter(
new
Configuration.ReporterConfiguration().withSender(sender)).getTracer();
}
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？
ryphnyuan commented on issue #722: ServiceComb的调用链默认是对接zipkin的，如何对接jaeger？ URL: https://github.com/apache/incubator-servicecomb-java-chassis/issues/722#issuecomment-394918844 CSE版本是2.3.12，使用方式参照的https://huawei-servicecomb.gitbooks.io/developerguide/content/using-cse-in-spring-boot/web-application.html， This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] yangbor commented on a change in pull request #204: Update the License File
yangbor commented on a change in pull request #204: Update the License File URL: https://github.com/apache/incubator-servicecomb-saga/pull/204#discussion_r193271620 ## File path: saga-distribution/src/release/LICENSE ## @@ -368,51 +351,33 @@ io.grpc:grpc-netty (https://github.com/grpc/grpc-java) io.grpc:grpc-netty:jar:1. io.grpc:grpc-protobuf (https://github.com/grpc/grpc-java) io.grpc:grpc-protobuf:jar:1.11.0 io.grpc:grpc-protobuf-lite (https://github.com/grpc/grpc-java) io.grpc:grpc-protobuf-lite:jar:1.11.0 io.grpc:grpc-stub (https://github.com/grpc/grpc-java) io.grpc:grpc-stub:jar:1.11.0 -Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.8.7 -Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.8.7 -jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.8.7 JBoss Logging 3 (http://www.jboss.org) org.jboss.logging:jboss-logging:jar:3.3.0.Final +Javassist (http://www.javassist.org/) org.javassist:javassist:bundle:3.20.0-GA Log4j Implemented Over SLF4J (http://www.slf4j.org) org.slf4j:log4j-over-slf4j:jar:1.7.25 +Netty/Netty (https://github.com/netty/netty) io.netty:netty:jar:3.2.5.Final Netty/Buffer (http://netty.io/netty-buffer/) io.netty:netty-buffer:jar:4.1.21.Final Netty/Codec/HTTP2 (http://netty.io/netty-codec-http2/) io.netty:netty-codec-http2:jar:4.1.21.Final Netty/Codec/HTTP (http://netty.io/netty-codec-http/) io.netty:netty-codec-http:jar:4.1.21.Final Netty/Codec (http://netty.io/netty-codec/) io.netty:netty-codec:jar:4.1.21.Final -Netty/Codec/Socks (http://netty.io/netty-codec-socks/) io.netty:netty-codec-socks:jar:4.1.21.Final -Netty/Common (http://netty.io/netty-common/) io.netty:netty-common:jar:4.1.21.Final -Netty/Handler (http://netty.io/netty-handler/) io.netty:netty-handler:jar:4.1.21.Final -Netty/Handler/Proxy (http://netty.io/netty-handler-proxy/) io.netty:netty-handler-proxy:jar:4.1.21.Final -Netty/Resolver (http://netty.io/netty-resolver/) io.netty:netty-resolver:jar:4.1.21.Final +Netty/Codec/Socks (http://netty.io/netty-codec-socks/) io.netty:netty-codec-socks:jar:4.1.22.Final +Netty/Common (http://netty.io/netty-common/) io.netty:netty-common:jar:4.1.22.Final +Netty/Handler (http://netty.io/netty-handler/) io.netty:netty-handler:jar:4.1.22.Final +Netty/Handler/Proxy (http://netty.io/netty-handler-proxy/) io.netty:netty-handler-proxy:jar:4.1.22.Final +Netty/Resolver (http://netty.io/netty-resolver/) io.netty:netty-resolver:jar:4.1.22.Final Netty/TomcatNative (https://github.com/netty/netty-tcnative) netty-tcnative-boringssl-static:2.0.7.Final -Netty/Transport (http://netty.io/netty-transport/) io.netty:netty-transport:jar:4.1.21.Final +Netty/Transport (http://netty.io/netty-transport/) io.netty:netty-transport:jar:4.1.22.Final Objenesis (http://objenesis.org) org.objenesis:objenesis:jar:2.5.1 OpenCensus (https://github.com/census-instrumentation/opencensus-java) io.opencensus:opencensus-api:jar:0.11.0 OpenCensus (https://github.com/census-instrumentation/opencensus-java) io.opencensus:opencensus-contrib-grpc-metrics:jar:0.11.0 SnakeYAML (http://www.snakeyaml.org) org.yaml:snakeyaml:bundle:1.17 Spring AOP (https://github.com/spring-projects/spring-framework) org.springframework:spring-aop:jar:4.3.17.RELEASE -Spring Aspects (https://github.com/spring-projects/spring-framework) org.springframework:spring-aspects:jar:4.3.17.RELEASE Review comment: Spring Boot is used by alpha-server. They are included in the alpha-server fat jar. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] yangbor commented on a change in pull request #204: Update the License File
yangbor commented on a change in pull request #204: Update the License File URL: https://github.com/apache/incubator-servicecomb-saga/pull/204#discussion_r193271468 ## File path: saga-distribution/src/release/LICENSE ## @@ -368,51 +351,33 @@ io.grpc:grpc-netty (https://github.com/grpc/grpc-java) io.grpc:grpc-netty:jar:1. io.grpc:grpc-protobuf (https://github.com/grpc/grpc-java) io.grpc:grpc-protobuf:jar:1.11.0 io.grpc:grpc-protobuf-lite (https://github.com/grpc/grpc-java) io.grpc:grpc-protobuf-lite:jar:1.11.0 io.grpc:grpc-stub (https://github.com/grpc/grpc-java) io.grpc:grpc-stub:jar:1.11.0 -Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.8.7 -Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.8.7 -jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.8.7 JBoss Logging 3 (http://www.jboss.org) org.jboss.logging:jboss-logging:jar:3.3.0.Final +Javassist (http://www.javassist.org/) org.javassist:javassist:bundle:3.20.0-GA Log4j Implemented Over SLF4J (http://www.slf4j.org) org.slf4j:log4j-over-slf4j:jar:1.7.25 +Netty/Netty (https://github.com/netty/netty) io.netty:netty:jar:3.2.5.Final Netty/Buffer (http://netty.io/netty-buffer/) io.netty:netty-buffer:jar:4.1.21.Final Review comment: All Netty modules are upgraded to 4.1.22.Final, including Buffer etc. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] WillemJiang commented on a change in pull request #204: Update the License File
WillemJiang commented on a change in pull request #204: Update the License File URL: https://github.com/apache/incubator-servicecomb-saga/pull/204#discussion_r193236178 ## File path: saga-distribution/src/release/LICENSE ## @@ -251,25 +251,9 @@ For details, see http://logback.qos.ch You can find a copy of the License at licenses/LICENSE-logback === -For org.postgresql:postgresql:bundle:9.4.1212.jre7 Review comment: We use postgresql in the AlphaServer. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #204: Update the License File
coveralls commented on issue #204: Update the License File URL: https://github.com/apache/incubator-servicecomb-saga/pull/204#issuecomment-394837682 [](https://coveralls.io/builds/17333550) Coverage remained the same at 94.664% when pulling **adef775edc024c8f3f50f7e8489de63aa1ada5f3 on asifdxtreme:master** into **6600268065adb8d02cb7a2754f16b0b110b8995a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #204: Update the License File
coveralls commented on issue #204: Update the License File URL: https://github.com/apache/incubator-servicecomb-saga/pull/204#issuecomment-394837682 [](https://coveralls.io/builds/17333216) Coverage increased (+0.3%) to 94.94% when pulling **b73ca3dbb04459938d3009d1d8eff1988743943a on asifdxtreme:master** into **6600268065adb8d02cb7a2754f16b0b110b8995a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #204: Update the License File
coveralls commented on issue #204: Update the License File URL: https://github.com/apache/incubator-servicecomb-saga/pull/204#issuecomment-394837682 [](https://coveralls.io/builds/17332878) Coverage decreased (-0.4%) to 94.296% when pulling **cd48bf7f7b17a59f071969cfe649fd2ca034873b on asifdxtreme:master** into **6600268065adb8d02cb7a2754f16b0b110b8995a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asifdxtreme opened a new pull request #204: Update the License File
asifdxtreme opened a new pull request #204: Update the License File
URL: https://github.com/apache/incubator-servicecomb-saga/pull/204
Please review the contents carefully
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
With regards,
Apache Git Services
[GitHub] WillemJiang commented on issue #751: Can't clone project as filename to long
WillemJiang commented on issue #751: Can't clone project as filename to long URL: https://github.com/apache/incubator-servicecomb-java-chassis/issues/751#issuecomment-394724367 It's a configuration issue on the window, you can find the solution here. https://ourcodeworld.com/articles/read/109/how-to-solve-filename-too-long-error-in-git-powershell-and-github-application-for-windows This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #753: [SCB-640]add public key black/white feature and samples
coveralls commented on issue #753: [SCB-640]add public key black/white feature and samples URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/753#issuecomment-394718917 [](https://coveralls.io/builds/17327360) Coverage increased (+0.09%) to 87.546% when pulling **6257929a75c94bc5e5e025ce4ab895a1da758cc2 on liubao68:edit-06** into **b6ec5487c573f90986faa8f314e2bdb9379fb8cc on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #745: [SCB-636] change config mapping machanism
coveralls commented on issue #745: [SCB-636] change config mapping machanism URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/745#issuecomment-394054129 [](https://coveralls.io/builds/17326846) Coverage decreased (-0.04%) to 87.46% when pulling **c7b9a88d034ff93f526429c6a8d59f7d2bc4619b on jeho0815:Branch_master_SCB-636** into **517a9ff762f8c5f969ed7dee834a6fc88c32e340 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] jeho0815 commented on a change in pull request #745: [SCB-636] change config mapping machanism
jeho0815 commented on a change in pull request #745: [SCB-636] change config mapping machanism URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/745#discussion_r193068461 ## File path: foundations/foundation-config/src/test/resources/mapping.yaml ## @@ -0,0 +1,26 @@ +## --- +## 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. +## --- + +servicecomb: Review comment: accept This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] liubao68 opened a new pull request #753: [SCB-640]add public key black/white feature and samples
liubao68 opened a new pull request #753: [SCB-640]add public key black/white feature and samples URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/753 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 With regards, Apache Git Services
[GitHub] coveralls commented on issue #370: SCB-644 Add resource limitations
coveralls commented on issue #370: SCB-644 Add resource limitations URL: https://github.com/apache/incubator-servicecomb-service-center/pull/370#issuecomment-394684130 [](https://coveralls.io/builds/17325716) Coverage decreased (-0.03%) to 74.613% when pulling **0f03c04d7e5a53d614af26c03d23654ab6fd409c on little-cui:master** into **e729a5ee0faf8bd5db2a1fd2539fc7b62bb66b54 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] codecov-io commented on issue #370: SCB-644 Add resource limitations
codecov-io commented on issue #370: SCB-644 Add resource limitations URL: https://github.com/apache/incubator-servicecomb-service-center/pull/370#issuecomment-394683645 # [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370?src=pr=h1) Report > Merging [#370](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370?src=pr=desc) into [master](https://codecov.io/gh/apache/incubator-servicecomb-service-center/commit/e729a5ee0faf8bd5db2a1fd2539fc7b62bb66b54?src=pr=desc) will **not change** coverage. > The diff coverage is `94%`. [](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370?src=pr=tree) ```diff @@ Coverage Diff @@ ## master #370 +/- ## === Coverage 71.46% 71.46% === Files 25 25 Lines3690 3690 === Hits 2637 2637 Misses884 884 Partials 169 169 ``` | [Impacted Files](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/service/dependency\_validator.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvZGVwZW5kZW5jeV92YWxpZGF0b3IuZ28=) | `100% <ø> (ø)` | :arrow_up: | | [server/service/schema\_validator.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvc2NoZW1hX3ZhbGlkYXRvci5nbw==) | `100% <100%> (ø)` | :arrow_up: | | [server/service/rule\_validator.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvcnVsZV92YWxpZGF0b3IuZ28=) | `100% <100%> (ø)` | :arrow_up: | | [server/service/instance\_validator.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvaW5zdGFuY2VfdmFsaWRhdG9yLmdv) | `100% <100%> (ø)` | :arrow_up: | | [server/service/microservice\_validator.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvbWljcm9zZXJ2aWNlX3ZhbGlkYXRvci5nbw==) | `100% <100%> (ø)` | :arrow_up: | | [server/service/schema.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvc2NoZW1hLmdv) | `77.58% <83.33%> (+0.19%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370?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/incubator-servicecomb-service-center/pull/370?src=pr=footer). Last update [e729a5e...0f03c04](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/370?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 With regards, Apache Git Services
[GitHub] little-cui opened a new pull request #370: SCB-644 Add resource limitations
little-cui opened a new pull request #370: SCB-644 Add resource limitations URL: https://github.com/apache/incubator-servicecomb-service-center/pull/370 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 With regards, Apache Git Services
[GitHub] coveralls commented on issue #752: [SCB-646] if local swagger exists, not generate swagger according to class
coveralls commented on issue #752: [SCB-646] if local swagger exists, not generate swagger according to class URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/752#issuecomment-394679681 [](https://coveralls.io/builds/17325454) Coverage increased (+0.005%) to 87.457% when pulling **2c94d8b5d2a48d748726d442e5dba3867d4bdebf on weichao666:jaxrsnoannocation** into **b6ec5487c573f90986faa8f314e2bdb9379fb8cc on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weichao666 opened a new pull request #752: [SCB-646] if local swagger exists, not generate swagger according to class
weichao666 opened a new pull request #752: [SCB-646] if local swagger exists, not generate swagger according to class URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/752 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 With regards, Apache Git Services
[incubator-servicecomb-website] 01/03: Polish the team page
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git commit 02da81f92629cbdfd54bb87523c96b9843cd9754 Author: Willem Jiang AuthorDate: Tue Jun 5 16:51:40 2018 +0800 Polish the team page --- _developers/cn/team.md | 2 +- _developers/team.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_developers/cn/team.md b/_developers/cn/team.md index 68b022d..121502a 100644 --- a/_developers/cn/team.md +++ b/_developers/cn/team.md @@ -1,5 +1,5 @@ --- -title: "Team" +title: "ServiceComb开发团队" lang: cn ref: ServiceComb-Team permalink: /cn/developers/team/ diff --git a/_developers/team.md b/_developers/team.md index f91149f..37d1a75 100644 --- a/_developers/team.md +++ b/_developers/team.md @@ -1,5 +1,5 @@ --- -title: "Team" +title: "ServiceComb Develop Team" lang: en ref: ServiceComb-Team permalink: /developers/team/ -- To stop receiving notification emails like this one, please contact ningji...@apache.org.
[incubator-servicecomb-website] 03/03: Publish the website
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git
commit 14683ed870252a06583b04f226165e25cb3ee7f4
Author: Willem Jiang
AuthorDate: Tue Jun 5 16:54:21 2018 +0800
Publish the website
---
content/cn/developers/team/index.html | 10 +-
content/developers/team/index.html| 10 +-
content/feed.xml | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/content/cn/developers/team/index.html
b/content/cn/developers/team/index.html
index 9038d41..6bf946a 100644
--- a/content/cn/developers/team/index.html
+++ b/content/cn/developers/team/index.html
@@ -19,7 +19,7 @@
-Team - Apache ServiceComb (incubating)
+ServiceComb开发团队 - Apache ServiceComb (incubating)
@@ -33,7 +33,7 @@
-
+
http://github.com/pages/apache/incubator-servicecomb-website/cn/developers/team/;>
@@ -46,7 +46,7 @@
-
+
@@ -376,7 +376,7 @@
http://schema.org/CreativeWork;>
-
+
@@ -385,7 +385,7 @@
-Team
+ServiceComb开发团队
diff --git a/content/developers/team/index.html
b/content/developers/team/index.html
index a05b23f..91bb10f 100644
--- a/content/developers/team/index.html
+++ b/content/developers/team/index.html
@@ -19,7 +19,7 @@
-Team - Apache ServiceComb (incubating)
+ServiceComb Develop Team - Apache ServiceComb (incubating)
@@ -33,7 +33,7 @@
-
+
http://github.com/pages/apache/incubator-servicecomb-website/developers/team/;>
@@ -46,7 +46,7 @@
-
+
@@ -353,7 +353,7 @@
http://schema.org/CreativeWork;>
-
+
@@ -362,7 +362,7 @@
-Team
+ServiceComb Develop
Team
diff --git a/content/feed.xml b/content/feed.xml
index 407456d..33483bd 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,4 @@
-http://www.w3.org/2005/Atom; >https://jekyllrb.com/;
version="3.4.3">Jekyll2018-06-05T16:39:40+08:00/Apache ServiceComb (incubating)The homepage of
ServiceComb{name=nil,
avatar= [...]
+http://www.w3.org/2005/Atom; >https://jekyllrb.com/;
version="3.4.3">Jekyll2018-06-05T16:52:09+08:00/Apache ServiceComb (incubating)The homepage of
ServiceComb{name=nil,
avatar= [...]
p在前一篇博文a
href=http://servicecomb.incubator.apache.org/cn/docs/easy-build-microservice-system-part-I/《轻松微服务系列：从一键构建微服务和DDD设计开始》/a，我们已经详细介绍了如何快速构建微服务和DDD相关概念，并引入了一个经典场景——地产CRM。通过a
href=https://en.wikipedia.org/wiki/Event_stormingEvent
Storming/a实践获得了系统设计：/p
pimg
src=/assets/images/scaffold/MicroserviceDesign4.png
alt=MicroserviceDesign4 //p
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[incubator-servicecomb-website] 02/03: Merge branch 'master' into asf-site
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git commit 1fc24c7865802bf5e479c9fff8f8c61911e2942e Merge: 7a11fed 02da81f Author: Willem Jiang AuthorDate: Tue Jun 5 16:51:53 2018 +0800 Merge branch 'master' into asf-site _developers/cn/team.md | 2 +- _developers/team.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact ningji...@apache.org.
[incubator-servicecomb-website] branch asf-site updated (7a11fed -> 14683ed)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git. from 7a11fed Publish the website new 02da81f Polish the team page new 1fc24c7 Merge branch 'master' into asf-site new 14683ed Publish the website The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: _developers/cn/team.md| 2 +- _developers/team.md | 2 +- content/cn/developers/team/index.html | 10 +- content/developers/team/index.html| 10 +- content/feed.xml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact ningji...@apache.org.
[incubator-servicecomb-website] 02/02: Publish the website
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git
commit 7a11fed586c26bd40ad2df37e7146d9e06925704
Author: Willem Jiang
AuthorDate: Tue Jun 5 16:40:28 2018 +0800
Publish the website
---
content/cn/developers/contributing.html| 11 +
content/cn/developers/index.html | 11 +
content/cn/developers/release-guide/index.html | 11 +
.../developers/setup-committer-rights/index.html | 11 +
.../setup-develop-environment/index.html | 11 +
content/cn/developers/submit-codes/index.html | 11 +
.../cn/developers/subscribe-mail-list/index.html | 11 +
content/cn/developers/{ => team}/index.html| 244 +
content/cn/developers/use-gitter/index.html| 11 +
content/cn/developers/use-jira/index.html | 11 +
content/developers/contributing.html | 11 +
content/developers/index.html | 11 +
content/developers/release-guide/index.html| 11 +
.../developers/setup-committer-rights/index.html | 11 +
.../setup-develop-environment/index.html | 11 +
content/developers/submit-codes/index.html | 11 +
.../developers/{roadmap.html => team/index.html} | 244 +
content/developers/use-jira/index.html | 11 +
content/feed.xml | 2 +-
content/sitemap.xml| 150 +++--
20 files changed, 658 insertions(+), 158 deletions(-)
diff --git a/content/cn/developers/contributing.html
b/content/cn/developers/contributing.html
index 680a26e..ebbfbc9 100644
--- a/content/cn/developers/contributing.html
+++ b/content/cn/developers/contributing.html
@@ -272,6 +272,17 @@
+ 开发团队
+
+
+
+
+
+
+
+
+
+
如何做贡献
diff --git a/content/cn/developers/index.html b/content/cn/developers/index.html
index 7c1f5ad..489071a 100644
--- a/content/cn/developers/index.html
+++ b/content/cn/developers/index.html
@@ -272,6 +272,17 @@
+ 开发团队
+
+
+
+
+
+
+
+
+
+
如何做贡献
diff --git a/content/cn/developers/release-guide/index.html
b/content/cn/developers/release-guide/index.html
index a9dd244..bff5f0b 100644
--- a/content/cn/developers/release-guide/index.html
+++ b/content/cn/developers/release-guide/index.html
@@ -274,6 +274,17 @@
+ 开发团队
+
+
+
+
+
+
+
+
+
+
如何做贡献
diff --git a/content/cn/developers/setup-committer-rights/index.html
b/content/cn/developers/setup-committer-rights/index.html
index b0884a9..61659c1 100644
--- a/content/cn/developers/setup-committer-rights/index.html
+++ b/content/cn/developers/setup-committer-rights/index.html
@@ -272,6 +272,17 @@
+ 开发团队
+
+
+
+
+
+
+
+
+
+
如何做贡献
diff --git a/content/cn/developers/setup-develop-environment/index.html
b/content/cn/developers/setup-develop-environment/index.html
index 7bbeeae..34aa7b9 100644
--- a/content/cn/developers/setup-develop-environment/index.html
+++ b/content/cn/developers/setup-develop-environment/index.html
@@ -272,6 +272,17 @@
+ 开发团队
+
+
+
+
+
+
+
+
+
+
如何做贡献
diff --git a/content/cn/developers/submit-codes/index.html
b/content/cn/developers/submit-codes/index.html
index 8b1dcd0..97d1e82 100644
--- a/content/cn/developers/submit-codes/index.html
+++ b/content/cn/developers/submit-codes/index.html
@@ -272,6 +272,17 @@
+ 开发团队
+
+
+
+
+
+
+
+
+
+
如何做贡献
diff --git a/content/cn/developers/subscribe-mail-list/index.html
b/content/cn/developers/subscribe-mail-list/index.html
index a1cc937..c7045ef 100644
--- a/content/cn/developers/subscribe-mail-list/index.html
+++ b/content/cn/developers/subscribe-mail-list/index.html
@@ -272,6 +272,17 @@
+ 开发团队
+
+
+
+
+
+
+
+
+
+
如何做贡献
diff --git a/content/cn/developers/index.html
b/content/cn/developers/team/index.html
similarity index 71%
copy from content/cn/developers/index.html
copy to content/cn/developers/team/index.html
index 7c1f5ad..9038d41 100644
--- a/content/cn/developers/index.html
+++ b/content/cn/developers/team/index.html
@@ -19,12 +19,12 @@
-开发者指南 - Apache ServiceComb (incubating)
+Team - Apache ServiceComb
[incubator-servicecomb-website] branch asf-site updated (a7b3170 -> 7a11fed)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch asf-site
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git.
from a7b3170 Publish the website
add dd0c665 Added the developer team page
new 037abf2 Merge branch 'master' into asf-site
new 7a11fed Publish the website
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
_data/navigation.yml | 4 +
_developers/cn/team.md | 54 +
_developers/team.md| 55 +
content/cn/developers/contributing.html| 11 +
content/cn/developers/index.html | 11 +
content/cn/developers/release-guide/index.html | 11 +
.../developers/setup-committer-rights/index.html | 11 +
.../setup-develop-environment/index.html | 11 +
content/cn/developers/submit-codes/index.html | 11 +
.../cn/developers/subscribe-mail-list/index.html | 11 +
content/cn/developers/{ => team}/index.html| 244 +
content/cn/developers/use-gitter/index.html| 11 +
content/cn/developers/use-jira/index.html | 11 +
content/developers/contributing.html | 11 +
content/developers/index.html | 11 +
content/developers/release-guide/index.html| 11 +
.../developers/setup-committer-rights/index.html | 11 +
.../setup-develop-environment/index.html | 11 +
content/developers/submit-codes/index.html | 11 +
.../developers/{roadmap.html => team/index.html} | 244 +
content/developers/use-jira/index.html | 11 +
content/feed.xml | 2 +-
content/sitemap.xml| 150 +++--
23 files changed, 771 insertions(+), 158 deletions(-)
create mode 100644 _developers/cn/team.md
create mode 100644 _developers/team.md
copy content/cn/developers/{ => team}/index.html (71%)
rename content/developers/{roadmap.html => team/index.html} (71%)
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[incubator-servicecomb-website] 01/02: Merge branch 'master' into asf-site
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git commit 037abf2428f2a42c3a95edd9c0d7760f9172d88e Merge: a7b3170 dd0c665 Author: Willem Jiang AuthorDate: Tue Jun 5 16:39:06 2018 +0800 Merge branch 'master' into asf-site _data/navigation.yml | 4 _developers/cn/team.md | 54 + _developers/team.md| 55 ++ 3 files changed, 113 insertions(+) -- To stop receiving notification emails like this one, please contact ningji...@apache.org.
[incubator-servicecomb-java-chassis] 02/06: [SCB-616] define new AccessLogPatternParser
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 789593956bb9a396d838b63fa948894417adcc56
Author: yaohaishi
AuthorDate: Sun May 27 01:31:50 2018 +0800
[SCB-616] define new AccessLogPatternParser
---
.../vertx/accesslog/parser/AccessLogItemMeta.java | 57
.../accesslog/parser/AccessLogPatternParser.java | 33 +
.../parser/VertxRestAccessLogItemCreator.java | 45
.../impl/VertxRestAccessLogPatternParser.java | 79 ++
.../impl/VertxRestAccessLogPatternParserTest.java | 21 ++
5 files changed, 235 insertions(+)
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemMeta.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemMeta.java
new file mode 100644
index 000..131743e
--- /dev/null
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemMeta.java
@@ -0,0 +1,57 @@
+/*
+ * 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.transport.rest.vertx.accesslog.parser;
+
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
+
+/**
+ * The meta data of {@linkplain AccessLogItem}.
+ */
+public class AccessLogItemMeta {
+ private String prefix;
+
+ private String suffix;
+
+ /**
+ * Used for sorting {@linkplain AccessLogItemMeta}. Default value is 0.
+ * Smaller one has higher priority.
+ */
+ private int order;
+
+ public AccessLogItemMeta(String prefix, String suffix, int order) {
+this.prefix = prefix;
+this.suffix = suffix;
+this.order = order;
+ }
+
+ public AccessLogItemMeta(String prefix, String suffix) {
+this(prefix, suffix, 0);
+ }
+
+ public String getPrefix() {
+return prefix;
+ }
+
+ public String getSuffix() {
+return suffix;
+ }
+
+ public int getOrder() {
+return order;
+ }
+}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogPatternParser.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogPatternParser.java
new file mode 100644
index 000..bc38768
--- /dev/null
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogPatternParser.java
@@ -0,0 +1,33 @@
+/*
+ * 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.transport.rest.vertx.accesslog.parser;
+
+import java.util.List;
+
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
+
+/**
+ * This parser will parse the rawPattern of access log and generate a list of
{@link AccessLogItem},
+ * which will be used in {@link
org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogGenerator} to
generate
+ * access log content.
+ * @param the type of {@linkplain
org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam#contextData
+ * AccessLogParam.contextData}, which usually depends on the transport
[incubator-servicecomb-java-chassis] 06/06: [SCB-616] refactor access log extension
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit b6ec5487c573f90986faa8f314e2bdb9379fb8cc
Author: yaohaishi
AuthorDate: Mon Jun 4 11:13:20 2018 +0800
[SCB-616] refactor access log extension
---
...gItemCreator.java => AccessLogItemCreator.java} | 19 +--
.../vertx/accesslog/parser/AccessLogItemMeta.java | 43 --
...va => CompositeVertxRestAccessLogItemMeta.java} | 42 ++
...emMeta.java => VertxRestAccessLogItemMeta.java} | 38 ++
.../parser/impl/DefaultAccessLogItemCreator.java | 137 ---
...DefaultCompositeVertxRestAccessLogItemMeta.java | 87
.../impl/VertxRestAccessLogPatternParser.java | 126 +++--
...tx.accesslog.parser.VertxRestAccessLogItemMeta} | 2 +-
.../element/impl/UserDefinedAccessLogItem.java}| 42 ++
.../impl/UserDefinedAccessLogItemLowPriority.java} | 42 ++
.../vertx/accesslog/impl/AccessLogHandlerTest.java | 104 ++
.../TestCompositeExtendedAccessLogItemMeta.java} | 45 ++
.../impl/TestSingleExtendedAccessLogItemMeta.java} | 42 +-
.../impl/VertxRestAccessLogPatternParserTest.java | 151 +
...tx.accesslog.parser.VertxRestAccessLogItemMeta} | 3 +-
15 files changed, 405 insertions(+), 518 deletions(-)
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/VertxRestAccessLogItemCreator.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemCreator.java
similarity index 66%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/VertxRestAccessLogItemCreator.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemCreator.java
index f1917eb..ebd522b 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/VertxRestAccessLogItemCreator.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemCreator.java
@@ -17,29 +17,18 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.parser;
-import java.util.List;
-
import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
-import io.vertx.ext.web.RoutingContext;
-
/**
- * The {@linkplain VertxRestAccessLogItemCreator}s are able to instantiate a
group of {@linkplain AccessLogItem}.
+ * The {@linkplain AccessLogItemCreator}s are able to instantiate a group of
{@linkplain AccessLogItem}.
*/
-public interface VertxRestAccessLogItemCreator {
- /**
- * @return A list of {@linkplain AccessLogItemMeta} to show that what kinds
of {@linkplain AccessLogItem}
- * this creator is able to instantiate.
- */
- List getAccessLogItemMeta();
-
+public interface AccessLogItemCreator {
/**
- * Create an instance of {@linkplain AccessLogItem} which is specified by
{@linkplain AccessLogItemMeta} and config.
- * @param accessLogItemMeta determine which kind of {@linkplain
AccessLogItem} is created.
+ * Create an instance of {@linkplain AccessLogItem} which is specified by
the config.
* @param config
* e.g. For {@linkplain
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.CookieItem
CookieItem},
* the pattern may be "%{varName}C", and it's config is "varName". Some
{@linkplain AccessLogItem} with no configurable
* pattern (like "%m") will receive {@code null} as config.
*/
- AccessLogItem createItem(AccessLogItemMeta
accessLogItemMeta, String config);
+ AccessLogItem createItem(String config);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemMeta.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemMeta.java
index 131743e..b47e5d1 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemMeta.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemMeta.java
@@ -22,36 +22,53 @@ import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogIt
/**
* The meta data of {@linkplain AccessLogItem}.
*/
-public class AccessLogItemMeta {
- private String prefix;
+public class AccessLogItemMeta {
+ protected String prefix;
- private String suffix;
+ protected String suffix;
/**
[incubator-servicecomb-java-chassis] 01/06: [SCB-616] remove old access log parse logic
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 7b768e2ad599e41dc8b6dffb1bc3897e52449246
Author: yaohaishi
AuthorDate: Mon May 28 17:36:02 2018 +0800
[SCB-616] remove old access log parse logic
---
.../transport/rest/vertx/RestServerVerticle.java | 7 +-
.../rest/vertx/accesslog/AccessLogGenerator.java | 16 +--
.../accesslog/element/AccessLogItemFactory.java| 67 ---
.../element/creator/AccessLogItemCreator.java | 28 -
.../PercentagePrefixConfigurableItemCreator.java | 68 ---
.../creator/SimpleAccessLogItemCreator.java| 76 -
.../vertx/accesslog/impl/AccessLogHandler.java | 5 +-
.../accesslog/parser/AccessLogItemLocation.java| 86 --
.../accesslog/parser/AccessLogPatternParser.java | 27 -
.../parser/impl/DefaultAccessLogPatternParser.java | 125 -
.../parser/matcher/AccessLogItemMatcher.java | 28 -
.../PercentagePrefixConfigurableMatcher.java | 84 --
.../parser/matcher/SimpleItemMatcher.java | 78 -
.../vertx/accesslog/AccessLogGeneratorTest.java| 14 +--
.../element/AccessLogItemFactoryTest.java | 56 -
...ercentagePrefixConfigurableItemCreatorTest.java | 106 -
.../impl/DefaultAccessLogPatternParserTest.java| 119
.../PercentagePrefixConfigurableMatcherTest.java | 73
.../parser/matcher/SimpleItemMatcherTest.java | 58 --
19 files changed, 8 insertions(+), 1113 deletions(-)
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
index 2075d15..f2ac2fb 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
@@ -29,7 +29,6 @@ import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
import org.apache.servicecomb.foundation.vertx.VertxTLSBuilder;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogConfiguration;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.impl.AccessLogHandler;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.impl.DefaultAccessLogPatternParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,15 +85,15 @@ public class RestServerVerticle extends AbstractVerticle {
LOGGER.info("access log enabled, pattern = {}", pattern);
mainRouter.route()
.handler(new AccessLogHandler(
- pattern,
- new DefaultAccessLogPatternParser()));
+ pattern
+ ));
}
}
private void initDispatcher(Router mainRouter) {
List dispatchers =
SPIServiceUtils.getSortedService(VertxHttpDispatcher.class);
for (VertxHttpDispatcher dispatcher : dispatchers) {
- if(dispatcher.enabled()) {
+ if (dispatcher.enabled()) {
dispatcher.init(mainRouter);
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
index c44491e..f05e8d4 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
@@ -17,12 +17,7 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog;
-import java.util.List;
-
import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItemFactory;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogPatternParser;
import io.vertx.ext.web.RoutingContext;
@@ -37,15 +32,9 @@ public class AccessLogGenerator {
*/
private AccessLogItem[] accessLogItems;
- private AccessLogItemFactory accessLogItemFactory = new
AccessLogItemFactory();
-
@SuppressWarnings("unchecked")
- public AccessLogGenerator(String rawPattern, AccessLogPatternParser
accessLogPatternParser) {
-List locationList =
accessLogPatternParser.parsePattern(rawPattern);
-
-
[incubator-servicecomb-java-chassis] branch master updated (cb2be07 -> b6ec548)
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from cb2be07 Client Request Timeout support for operation/schema/service
level:Review fix
new 7b768e2 [SCB-616] remove old access log parse logic
new 7895939 [SCB-616] define new AccessLogPatternParser
new 62647a9 [SCB-616] add AccessLogItemMeta compare logic
new 34cf795 [SCB-616] finish parse logic refactor
new 2b15544 [SCB-616] make VertxRestAccessLogItemCreator extensible
new b6ec548 [SCB-616] refactor access log extension
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../transport/rest/vertx/RestServerVerticle.java | 7 +-
.../rest/vertx/accesslog/AccessLogGenerator.java | 15 +-
.../accesslog/element/AccessLogItemFactory.java| 67
.../PercentagePrefixConfigurableItemCreator.java | 68
.../creator/SimpleAccessLogItemCreator.java| 76 -
.../accesslog/element/impl/ResponseSizeItem.java | 4 +
.../vertx/accesslog/impl/AccessLogHandler.java | 5 +-
.../creator => parser}/AccessLogItemCreator.java | 14 +-
.../accesslog/parser/AccessLogItemLocation.java| 86 -
.../vertx/accesslog/parser/AccessLogItemMeta.java | 74 +
.../accesslog/parser/AccessLogPatternParser.java | 12 +-
...va => CompositeVertxRestAccessLogItemMeta.java} | 19 +-
...Parser.java => VertxRestAccessLogItemMeta.java} | 26 +-
.../parser/impl/DefaultAccessLogPatternParser.java | 125
...DefaultCompositeVertxRestAccessLogItemMeta.java | 87 +
.../impl/VertxRestAccessLogPatternParser.java | 350 +
.../PercentagePrefixConfigurableMatcher.java | 84 -
.../parser/matcher/SimpleItemMatcher.java | 78 -
...rtx.accesslog.parser.VertxRestAccessLogItemMeta | 4 +-
.../vertx/accesslog/AccessLogGeneratorTest.java| 14 +-
.../element/AccessLogItemFactoryTest.java | 56
...ercentagePrefixConfigurableItemCreatorTest.java | 106 ---
.../element/impl/UserDefinedAccessLogItem.java}| 12 +-
.../impl/UserDefinedAccessLogItemLowPriority.java} | 12 +-
.../vertx/accesslog/impl/AccessLogHandlerTest.java | 104 ++
.../impl/DefaultAccessLogPatternParserTest.java| 119 ---
.../TestCompositeExtendedAccessLogItemMeta.java} | 26 +-
.../impl/TestSingleExtendedAccessLogItemMeta.java} | 15 +-
.../impl/VertxRestAccessLogPatternParserTest.java | 322 +++
.../PercentagePrefixConfigurableMatcherTest.java | 73 -
.../parser/matcher/SimpleItemMatcherTest.java | 58
...rtx.accesslog.parser.VertxRestAccessLogItemMeta | 5 +-
32 files changed, 1042 insertions(+), 1081 deletions(-)
delete mode 100644
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactory.java
delete mode 100644
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreator.java
delete mode 100644
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/SimpleAccessLogItemCreator.java
copy
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/{element/creator
=> parser}/AccessLogItemCreator.java (59%)
delete mode 100644
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemLocation.java
create mode 100644
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/AccessLogItemMeta.java
rename
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/{matcher/AccessLogItemMatcher.java
=> CompositeVertxRestAccessLogItemMeta.java} (60%)
copy
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/{AccessLogPatternParser.java
=> VertxRestAccessLogItemMeta.java} (51%)
delete mode 100644
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/DefaultAccessLogPatternParser.java
create mode 100644
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/DefaultCompositeVertxRestAccessLogItemMeta.java
create mode 100644
[incubator-servicecomb-java-chassis] 05/06: [SCB-616] make VertxRestAccessLogItemCreator extensible
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 2b15544f8a7f0532180dbb1b8f20742b76328da2
Author: yaohaishi
AuthorDate: Tue May 29 15:38:14 2018 +0800
[SCB-616] make VertxRestAccessLogItemCreator extensible
---
.../impl/VertxRestAccessLogPatternParser.java | 21 --
accesslog.parser.VertxRestAccessLogItemCreator | 18 ++
.../impl/VertxRestAccessLogPatternParserTest.java | 74 ++
3 files changed, 109 insertions(+), 4 deletions(-)
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParser.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParser.java
index f299426..69776cc 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParser.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParser.java
@@ -22,11 +22,14 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemMeta;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogPatternParser;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.VertxRestAccessLogItemCreator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import io.vertx.ext.web.RoutingContext;
@@ -34,6 +37,8 @@ import io.vertx.ext.web.RoutingContext;
* The parser is used for rest-over-vertx transport.
*/
public class VertxRestAccessLogPatternParser implements
AccessLogPatternParser {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(VertxRestAccessLogPatternParser.class);
+
public static final Comparator
accessLogItemMetaWrapperComparator = (w1, w2) -> {
AccessLogItemMeta meta1 = w1.getAccessLogItemMeta();
AccessLogItemMeta meta2 = w2.getAccessLogItemMeta();
@@ -56,13 +61,17 @@ public class VertxRestAccessLogPatternParser implements
AccessLogPatternParser creators = new ArrayList<>();
+ private List creators;
private List accessLogItemMetaWrappers = new
ArrayList<>();
public VertxRestAccessLogPatternParser() {
-creators.add(new DefaultAccessLogItemCreator());
-for (VertxRestAccessLogItemCreator creator : creators) {
+List creators =
loadVertxRestAccessLogItemCreators();
+this.creators = creators;
+if (null == creators) {
+ LOGGER.error("cannot load VertxRestAccessLogItemCreator!");
+}
+for (VertxRestAccessLogItemCreator creator : this.creators) {
for (AccessLogItemMeta accessLogItemMeta :
creator.getAccessLogItemMeta()) {
accessLogItemMetaWrappers.add(new
AccessLogItemMetaWrapper(accessLogItemMeta, creator));
}
@@ -70,6 +79,10 @@ public class VertxRestAccessLogPatternParser implements
AccessLogPatternParser
loadVertxRestAccessLogItemCreators() {
+return
SPIServiceUtils.getOrLoadSortedService(VertxRestAccessLogItemCreator.class);
+ }
+
/**
* Behavior of this compare:
* 1. comparePlaceholderString("abc","bbc") < 0
@@ -135,6 +148,7 @@ public class VertxRestAccessLogPatternParser implements
AccessLogPatternParser> parsePattern(String rawPattern) {
+LOGGER.info("parse the pattern of access log: [{}]", rawPattern);
List locationList = matchAccessLogItem(rawPattern);
locationList = fillInPlainTextLocation(rawPattern, locationList);
@@ -364,4 +378,3 @@ public class VertxRestAccessLogPatternParser implements
AccessLogPatternParserhttp://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.
+#
+
+org.apache.servicecomb.transport.rest.vertx.accesslog.parser.impl.DefaultAccessLogItemCreator
\ No newline at end of file
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParserTest.java
[incubator-servicecomb-java-chassis] 03/06: [SCB-616] add AccessLogItemMeta compare logic
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 62647a9b77113ae6e0569cc1b69127a1acd6851e
Author: yaohaishi
AuthorDate: Sun May 27 15:11:13 2018 +0800
[SCB-616] add AccessLogItemMeta compare logic
---
.../impl/VertxRestAccessLogPatternParser.java | 86 +++-
.../impl/VertxRestAccessLogPatternParserTest.java | 110 -
2 files changed, 192 insertions(+), 4 deletions(-)
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParser.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParser.java
index 666d9a9..5295f10 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParser.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParser.java
@@ -18,6 +18,7 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.parser.impl;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
@@ -31,11 +32,30 @@ import io.vertx.ext.web.RoutingContext;
* The parser is used for rest-over-vertx transport.
*/
public class VertxRestAccessLogPatternParser implements
AccessLogPatternParser {
+ public static final Comparator
accessLogItemMetaWrapperComparator = (w1, w2) -> {
+AccessLogItemMeta meta1 = w1.getAccessLogItemMeta();
+AccessLogItemMeta meta2 = w2.getAccessLogItemMeta();
+int result = meta1.getOrder() - meta2.getOrder();
+if (result != 0) {
+ return result;
+}
+
+// one of meta1 & meta2 has suffix, but the other one doesn't have
+if (meta1.getSuffix() == null ^ meta2.getSuffix() == null) {
+ return meta1.getSuffix() == null ? 1 : -1;
+}
+
+if (null != meta1.getSuffix()) {
+ result = comparePlaceholderString(meta1.getSuffix(), meta2.getSuffix());
+}
+
+return 0 == result ?
+comparePlaceholderString(meta1.getPrefix(), meta2.getPrefix())
+: result;
+ };
+
private List creators = new ArrayList<>();
- /**
- * All of the {@linkplain AccessLogItemMeta} will be wrapped into
{@linkplain AccessLogItemMetaWrapper}.
- */
private List accessLogItemMetaWrappers = new
ArrayList<>();
public VertxRestAccessLogPatternParser() {
@@ -44,6 +64,28 @@ public class VertxRestAccessLogPatternParser implements
AccessLogPatternParser
+ * Sort rule(priority decreased):
+ *
+ * compare the {@link AccessLogItemMeta#order}
+ * compare the {@link AccessLogItemMeta#suffix} in lexicographic
order, if one's suffix is start with
+ * the other one's suffix, this one(who's suffix is longer) has higher
priority
+ * compare the {@link AccessLogItemMeta#prefix}, compare rule is the
same as suffix.
+ *
+ *
+ * e.g. given a list of {@link AccessLogItemMeta} like below:
+ *
+ * (%ac{,}bcd)
+ * (%ac{,}bc)
+ * (%ac{,}a)
+ * (%ac,)
+ * (%b,)
+ * (%a)
+ * (%{,}b)
+ * (%{,}bc)
+ *
+ * the result is:
+ *
+ * (%ac{,}a)
+ * (%ac{,}bcd)
+ * (%ac{,}bc)
+ * (%{,}bc)
+ * (%{,}b)
+ * (%ac,)
+ * (%a)
+ * (%b,)
+ *
+ */
+ private void sortAccessLogItemMetaWrapper(List
accessLogItemMetaWrapperList) {
+accessLogItemMetaWrapperList.sort(accessLogItemMetaWrapperComparator);
+ }
+
public static class AccessLogItemMetaWrapper {
private AccessLogItemMeta accessLogItemMeta;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParserTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParserTest.java
index c27503e..2fdcc2d 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParserTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/parser/impl/VertxRestAccessLogPatternParserTest.java
@@ -17,5 +17,113 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.parser.impl;
+import java.util.Comparator;
+import java.util.function.Function;
+
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemMeta;
+import
[GitHub] wujimin closed pull request #734: [SCB-616] Make access log mechanism extensible
wujimin closed pull request #734: [SCB-616] Make access log mechanism extensible
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/734
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-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
index 2075d15bf..f2ac2fb15 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
@@ -29,7 +29,6 @@
import org.apache.servicecomb.foundation.vertx.VertxTLSBuilder;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogConfiguration;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.impl.AccessLogHandler;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.impl.DefaultAccessLogPatternParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,15 +85,15 @@ private void mountAccessLogHandler(Router mainRouter) {
LOGGER.info("access log enabled, pattern = {}", pattern);
mainRouter.route()
.handler(new AccessLogHandler(
- pattern,
- new DefaultAccessLogPatternParser()));
+ pattern
+ ));
}
}
private void initDispatcher(Router mainRouter) {
List dispatchers =
SPIServiceUtils.getSortedService(VertxHttpDispatcher.class);
for (VertxHttpDispatcher dispatcher : dispatchers) {
- if(dispatcher.enabled()) {
+ if (dispatcher.enabled()) {
dispatcher.init(mainRouter);
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
index c44491e56..a2079ebf0 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
@@ -20,9 +20,8 @@
import java.util.List;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItemFactory;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogPatternParser;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.impl.VertxRestAccessLogPatternParser;
import io.vertx.ext.web.RoutingContext;
@@ -37,15 +36,12 @@
*/
private AccessLogItem[] accessLogItems;
- private AccessLogItemFactory accessLogItemFactory = new
AccessLogItemFactory();
+ private AccessLogPatternParser accessLogPatternParser = new
VertxRestAccessLogPatternParser();
@SuppressWarnings("unchecked")
- public AccessLogGenerator(String rawPattern, AccessLogPatternParser
accessLogPatternParser) {
-List locationList =
accessLogPatternParser.parsePattern(rawPattern);
-
-List> itemList =
accessLogItemFactory.createAccessLogItem(rawPattern, locationList);
-accessLogItems = new AccessLogItem[itemList.size()];
-accessLogItems = itemList.toArray(accessLogItems);
+ public AccessLogGenerator(String rawPattern) {
+List> accessLogItemList =
accessLogPatternParser.parsePattern(rawPattern);
+accessLogItems = accessLogItemList.toArray(new AccessLogItem[0]);
}
public String generateLog(AccessLogParam accessLogParam) {
@@ -60,7 +56,6 @@ public String generateLog(AccessLogParam
accessLogParam) {
return log.toString();
}
-
private AccessLogItem[] getAccessLogItems() {
return accessLogItems;
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactory.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactory.java
deleted file mode 100644
index df1c47c9e..0
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the
[GitHub] wujimin commented on a change in pull request #745: [SCB-636] change config mapping machanism
wujimin commented on a change in pull request #745: [SCB-636] change config mapping machanism URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/745#discussion_r192971729 ## File path: foundations/foundation-config/src/test/resources/mapping.yaml ## @@ -0,0 +1,26 @@ +## --- +## 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. +## --- + +servicecomb: Review comment: mapping "a" to "b" is ``` a: b ``` not ``` b: a ``` This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] liubao68 closed pull request #744: [SCB-627] Client Request Timeout support for operation/schema/service level
liubao68 closed pull request #744: [SCB-627] Client Request Timeout support for
operation/schema/service level
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/744
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/transport/AbstractTransport.java
b/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
index 0ea905694..f02b9715f 100644
---
a/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
+++
b/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
@@ -38,7 +38,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.netflix.config.DynamicLongProperty;
import com.netflix.config.DynamicPropertyFactory;
import io.vertx.core.Vertx;
@@ -46,24 +45,18 @@
public abstract class AbstractTransport implements Transport {
private static final Logger LOGGER =
LoggerFactory.getLogger(AbstractTransport.class);
+ public static final String PROP_ROOT = "cse.request";
+
+ public static final String PROP_TIMEOUT = ".timeout";
+
/*
* 用于参数传递：比如向RestServerVerticle传递endpoint地址。
*/
public static final String ENDPOINT_KEY = "cse.endpoint";
- private static final long DEFAULT_TIMEOUT_MILLIS = 3;
-
- private static DynamicLongProperty prop = null;
+ private static final long REQUEST_TIMEOUT_CFG_FAIL = -1;
- public static DynamicLongProperty getRequestTimeoutProperty() {
-if (prop != null) {
- return prop;
-}
-
-prop = DynamicPropertyFactory.getInstance()
-.getLongProperty("cse.request.timeout", DEFAULT_TIMEOUT_MILLIS);
-return prop;
- }
+ private static final long DEFAULT_TIMEOUT_MILLIS = 3;
// 所有transport使用同一个vertx实例，避免创建太多的线程
protected Vertx transportVertx =
VertxUtils.getOrCreateVertxByName("transport", null);
@@ -160,4 +153,35 @@ public Object parseAddress(String address) {
}
return new URIEndpointObject(address);
}
+
+ /**
+ * Handles the request timeout configurations.
+ * @param operationName operation name
+ * @param schema schema id
+ * @param microservice micro service name
+ * @return configured value
+ */
+ public static long getReqTimeout(String operationName, String schema, String
microservice) {
+return getLongProperty(DEFAULT_TIMEOUT_MILLIS,
+PROP_ROOT + "." + microservice + "." + schema + "." + operationName +
PROP_TIMEOUT,
+PROP_ROOT + "." + microservice + "." + schema + PROP_TIMEOUT,
+PROP_ROOT + "." + microservice + PROP_TIMEOUT,
+PROP_ROOT + PROP_TIMEOUT);
+ }
+
+ /**
+ * Handles the request timeout configurations.
+ * @param defaultValue
+ * @param keys list of keys
+ * @return configured value
+ */
+ private static long getLongProperty(long defaultValue, String... keys) {
+for (String key : keys) {
+ long property =
DynamicPropertyFactory.getInstance().getLongProperty(key,
REQUEST_TIMEOUT_CFG_FAIL).get();
+ if (property != REQUEST_TIMEOUT_CFG_FAIL) {
+return property;
+ }
+}
+return defaultValue;
+ }
}
diff --git
a/core/src/test/java/org/apache/servicecomb/core/transport/TestAbstractTransport.java
b/core/src/test/java/org/apache/servicecomb/core/transport/TestAbstractTransport.java
index 7ddb13e20..f4e672629 100644
---
a/core/src/test/java/org/apache/servicecomb/core/transport/TestAbstractTransport.java
+++
b/core/src/test/java/org/apache/servicecomb/core/transport/TestAbstractTransport.java
@@ -18,6 +18,7 @@
package org.apache.servicecomb.core.transport;
import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
@@ -32,13 +33,26 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.util.ReflectionUtils;
+
+import com.netflix.config.DynamicProperty;
import mockit.Expectations;
import mockit.Injectable;
import mockit.Mocked;
public class TestAbstractTransport {
+ private Method updatePropertyMethod =
+ ReflectionUtils.findMethod(DynamicProperty.class, "updateProperty",
String.class, Object.class);
+
+ private void updateProperty(String key, Object value) {
+updatePropertyMethod.setAccessible(true);
+ReflectionUtils.invokeMethod(updatePropertyMethod, null, key, value);
+ }
+
class MyAbstractTransport extends AbstractTransport {
+
@Override
public String getName() {
return "my";
@@ -125,7 +139,7 @@ public void testMyAbstractTransport() throws Exception {
transport.setListenAddressWithoutSchema(null);
[incubator-servicecomb-java-chassis] 02/03: Client Request Timeout support for operation/schema/service level: correcting test case
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git commit 428d32d5b47a7f397d34f95dbf0e0d8596e02727 Author: maheshrajus AuthorDate: Thu May 31 16:42:01 2018 +0530 Client Request Timeout support for operation/schema/service level: correcting test case --- demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml b/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml index 439a27c..1fbcc79 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml +++ b/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml @@ -37,5 +37,5 @@ cse: timeout: jaxrs: clientreqtimeout: - sayHello: 500 - add: 500 + sayHello: 100 + add: 100 -- To stop receiving notification emails like this one, please contact liu...@apache.org.
[incubator-servicecomb-java-chassis] 03/03: Client Request Timeout support for operation/schema/service level:Review fix
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit cb2be07d285cc83c92148b82a2a6ae29c8e2e3e3
Author: maheshrajus
AuthorDate: Tue Jun 5 11:12:36 2018 +0530
Client Request Timeout support for operation/schema/service level:Review fix
---
.../core/transport/AbstractTransport.java | 108 +
.../core/transport/TestAbstractTransport.java | 42 +++-
.../src/main/resources/microservice.yaml | 14 ++-
.../transport/highway/HighwayClient.java | 4 +-
.../transport/highway/TestHighwayClient.java | 2 +-
.../rest/client/http/RestClientInvocation.java | 4 +-
6 files changed, 57 insertions(+), 117 deletions(-)
diff --git
a/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
b/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
index a02f14e..f02b971 100644
---
a/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
+++
b/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
@@ -23,16 +23,13 @@ import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.message.BasicNameValuePair;
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.core.Endpoint;
-import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.Transport;
-import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.foundation.common.net.NetUtils;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
@@ -41,7 +38,6 @@ import org.apache.servicecomb.serviceregistry.RegistryUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.netflix.config.DynamicLongProperty;
import com.netflix.config.DynamicPropertyFactory;
import io.vertx.core.Vertx;
@@ -49,21 +45,17 @@ import io.vertx.core.Vertx;
public abstract class AbstractTransport implements Transport {
private static final Logger LOGGER =
LoggerFactory.getLogger(AbstractTransport.class);
- private static final String CONSUMER_REQUEST_TIMEOUT = "cse.request.timeout";
+ public static final String PROP_ROOT = "cse.request";
- // key is configuration parameter.
- private static Map cfgCallback = new ConcurrentHashMapEx<>();
-
- // key is config paramter
- private static Map configCenterValue = new
ConcurrentHashMapEx<>();
-
- private static final long REQUEST_TIMEOUT_CFG_FAIL = -1;
+ public static final String PROP_TIMEOUT = ".timeout";
/*
* 用于参数传递：比如向RestServerVerticle传递endpoint地址。
*/
public static final String ENDPOINT_KEY = "cse.endpoint";
+ private static final long REQUEST_TIMEOUT_CFG_FAIL = -1;
+
private static final long DEFAULT_TIMEOUT_MILLIS = 3;
// 所有transport使用同一个vertx实例，避免创建太多的线程
@@ -163,81 +155,33 @@ public abstract class AbstractTransport implements
Transport {
}
/**
- * Handles the request timeout configurations.
- *
- * @param invocation
- *invocation of request
- * @return configuration value
+ * Handles the request timeout configurations.
+ * @param operationName operation name
+ * @param schema schema id
+ * @param microservice micro service name
+ * @return configured value
*/
- public static long getReqTimeout(Invocation invocation) {
-long value = 0;
-String config;
-
-// get the config base on priority.
operationName-->schema-->service-->global
-String operationName = invocation.getOperationName();
-String schema = invocation.getSchemaId();
-String serviceName = invocation.getMicroserviceName();
-
-config = CONSUMER_REQUEST_TIMEOUT + "." + serviceName + "." + schema + "."
+ operationName;
-value = getConfigValue(config);
-if ((value != REQUEST_TIMEOUT_CFG_FAIL)) {
- return value;
-}
-
-config = CONSUMER_REQUEST_TIMEOUT + "." + serviceName + "." + schema;
-value = getConfigValue(config);
-if ((value != REQUEST_TIMEOUT_CFG_FAIL)) {
- return value;
-}
-
-config = CONSUMER_REQUEST_TIMEOUT + "." + serviceName;
-value = getConfigValue(config);
-if ((value != REQUEST_TIMEOUT_CFG_FAIL)) {
- return value;
-}
-
-value = getConfigValue(CONSUMER_REQUEST_TIMEOUT);
-if ((value != REQUEST_TIMEOUT_CFG_FAIL)) {
- return value;
-}
-return DEFAULT_TIMEOUT_MILLIS;
- }
-
- /**
- * Get the configuration value
- * @param config config parameter
- * @return long value
- */
- private static long
[incubator-servicecomb-java-chassis] 01/03: Client Request Timeout support for operation/schema/service level
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 906fb55ea57791273764b3c774ef5dc09037bf78
Author: maheshrajus
AuthorDate: Thu May 31 12:56:27 2018 +0530
Client Request Timeout support for operation/schema/service level
---
.../core/transport/AbstractTransport.java | 104 ++---
.../core/transport/TestAbstractTransport.java | 79 +++-
.../servicecomb/demo/jaxrs/client/JaxrsClient.java | 44 +
.../src/main/resources/microservice.yaml | 7 ++
.../demo/jaxrs/server/RequestClientTimeOut.java| 49 ++
.../vertx/client/tcp/TcpClientConnection.java | 4 +
.../transport/highway/HighwayClient.java | 15 ++-
.../transport/highway/TestHighwayClient.java | 2 +-
.../rest/client/http/RestClientInvocation.java | 4 +-
9 files changed, 284 insertions(+), 24 deletions(-)
diff --git
a/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
b/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
index 0ea9056..a02f14e 100644
---
a/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
+++
b/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java
@@ -23,13 +23,16 @@ import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.message.BasicNameValuePair;
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.core.Endpoint;
+import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.Transport;
+import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.foundation.common.net.NetUtils;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
@@ -46,6 +49,16 @@ import io.vertx.core.Vertx;
public abstract class AbstractTransport implements Transport {
private static final Logger LOGGER =
LoggerFactory.getLogger(AbstractTransport.class);
+ private static final String CONSUMER_REQUEST_TIMEOUT = "cse.request.timeout";
+
+ // key is configuration parameter.
+ private static Map cfgCallback = new ConcurrentHashMapEx<>();
+
+ // key is config paramter
+ private static Map configCenterValue = new
ConcurrentHashMapEx<>();
+
+ private static final long REQUEST_TIMEOUT_CFG_FAIL = -1;
+
/*
* 用于参数传递：比如向RestServerVerticle传递endpoint地址。
*/
@@ -53,18 +66,6 @@ public abstract class AbstractTransport implements Transport
{
private static final long DEFAULT_TIMEOUT_MILLIS = 3;
- private static DynamicLongProperty prop = null;
-
- public static DynamicLongProperty getRequestTimeoutProperty() {
-if (prop != null) {
- return prop;
-}
-
-prop = DynamicPropertyFactory.getInstance()
-.getLongProperty("cse.request.timeout", DEFAULT_TIMEOUT_MILLIS);
-return prop;
- }
-
// 所有transport使用同一个vertx实例，避免创建太多的线程
protected Vertx transportVertx =
VertxUtils.getOrCreateVertxByName("transport", null);
@@ -160,4 +161,83 @@ public abstract class AbstractTransport implements
Transport {
}
return new URIEndpointObject(address);
}
+
+ /**
+ * Handles the request timeout configurations.
+ *
+ * @param invocation
+ *invocation of request
+ * @return configuration value
+ */
+ public static long getReqTimeout(Invocation invocation) {
+long value = 0;
+String config;
+
+// get the config base on priority.
operationName-->schema-->service-->global
+String operationName = invocation.getOperationName();
+String schema = invocation.getSchemaId();
+String serviceName = invocation.getMicroserviceName();
+
+config = CONSUMER_REQUEST_TIMEOUT + "." + serviceName + "." + schema + "."
+ operationName;
+value = getConfigValue(config);
+if ((value != REQUEST_TIMEOUT_CFG_FAIL)) {
+ return value;
+}
+
+config = CONSUMER_REQUEST_TIMEOUT + "." + serviceName + "." + schema;
+value = getConfigValue(config);
+if ((value != REQUEST_TIMEOUT_CFG_FAIL)) {
+ return value;
+}
+
+config = CONSUMER_REQUEST_TIMEOUT + "." + serviceName;
+value = getConfigValue(config);
+if ((value != REQUEST_TIMEOUT_CFG_FAIL)) {
+ return value;
+}
+
+value = getConfigValue(CONSUMER_REQUEST_TIMEOUT);
+if ((value != REQUEST_TIMEOUT_CFG_FAIL)) {
+ return value;
+}
+return DEFAULT_TIMEOUT_MILLIS;
+ }
+
+ /**
+ * Get the configuration value
+ * @param config config parameter
+ * @return long value
+ */
+
[incubator-servicecomb-java-chassis] branch master updated (32e452f -> cb2be07)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 32e452f [SCB-350] if the file not exist, make a warn log to trace it.
make the error more clearly
new 906fb55 Client Request Timeout support for operation/schema/service
level
new 428d32d Client Request Timeout support for operation/schema/service
level: correcting test case
new cb2be07 Client Request Timeout support for operation/schema/service
level:Review fix
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/transport/AbstractTransport.java | 50 +++-
.../core/transport/TestAbstractTransport.java | 67 +-
.../servicecomb/demo/jaxrs/client/JaxrsClient.java | 44 ++
.../src/main/resources/microservice.yaml | 11
.../{Validator.java => RequestClientTimeOut.java} | 25 +++-
.../vertx/client/tcp/TcpClientConnection.java | 4 ++
.../transport/highway/HighwayClient.java | 17 +++---
.../transport/highway/TestHighwayClient.java | 2 +-
.../rest/client/http/RestClientInvocation.java | 6 +-
9 files changed, 183 insertions(+), 43 deletions(-)
copy
demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/{Validator.java
=> RequestClientTimeOut.java} (67%)
--
To stop receiving notification emails like this one, please contact
liu...@apache.org.
[GitHub] coveralls commented on issue #750: [SCB-484] Servlet rest support download
coveralls commented on issue #750: [SCB-484] Servlet rest support download URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/750#issuecomment-394603236 [](https://coveralls.io/builds/17321574) Coverage decreased (-0.08%) to 87.411% when pulling **3a7e22b41b8e98c713c69c92d110089505d39137 on wujimin:servlet-rest-support-download** into **517a9ff762f8c5f969ed7dee834a6fc88c32e340 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-servicecomb-java-chassis] branch master updated: [SCB-350] if the file not exist, make a warn log to trace it. make the error more clearly
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 32e452f [SCB-350] if the file not exist, make a warn log to trace it.
make the error more clearly
32e452f is described below
commit 32e452f8f0bce1241228a9402b440abe54a307d3
Author: weixing
AuthorDate: Tue Jun 5 09:07:43 2018 +0800
[SCB-350] if the file not exist, make a warn log to trace it. make the
error more clearly
---
.../servicecomb/foundation/vertx/VertxTLSBuilder.java | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
index 9b7fd28..bd6642b 100644
---
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
+++
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
@@ -23,6 +23,8 @@ import org.apache.servicecomb.foundation.ssl.SSLCustom;
import org.apache.servicecomb.foundation.ssl.SSLManager;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import io.vertx.core.http.ClientAuth;
import io.vertx.core.http.HttpClientOptions;
@@ -34,6 +36,8 @@ import io.vertx.core.net.PfxOptions;
import io.vertx.core.net.TCPSSLOptions;
public final class VertxTLSBuilder {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(VertxTLSBuilder.class);
+
private static final String STORE_PKCS12 = "PKCS12";
private static final String STORE_JKS = "JKS";
@@ -93,7 +97,8 @@ public final class VertxTLSBuilder {
options.setSessionCacheEnabled(true);
tcpClientOptions.setOpenSslEngineOptions(new OpenSSLEngineOptions());
}
-if (isFileExists(sslCustom.getFullPath(sslOption.getKeyStore( {
+String fullKeyStore = sslCustom.getFullPath(sslOption.getKeyStore());
+if (isFileExists(fullKeyStore)) {
if (STORE_PKCS12.equalsIgnoreCase(sslOption.getKeyStoreType())) {
PfxOptions keyPfxOptions = new PfxOptions();
keyPfxOptions.setPath(sslCustom.getFullPath(sslOption.getKeyStore()));
@@ -107,9 +112,11 @@ public final class VertxTLSBuilder {
} else {
throw new IllegalArgumentException("invalid key store type.");
}
+} else {
+ LOGGER.warn("keyStore [" + fullKeyStore + "] file not exist, please
check!");
}
-
-if (isFileExists(sslCustom.getFullPath(sslOption.getTrustStore( {
+String fullTrustStore = sslCustom.getFullPath(sslOption.getTrustStore());
+if (isFileExists(fullTrustStore)) {
if (STORE_PKCS12.equalsIgnoreCase(sslOption.getTrustStoreType())) {
PfxOptions trustPfxOptions = new PfxOptions();
trustPfxOptions.setPath(sslCustom.getFullPath(sslOption.getTrustStore()));
@@ -125,6 +132,8 @@ public final class VertxTLSBuilder {
} else {
throw new IllegalArgumentException("invalid trust store type.");
}
+} else {
+ LOGGER.warn("trustStore [" + fullTrustStore + "] file not exist, please
check!");
}
for (String protocol : sslOption.getProtocols().split(",")) {
tcpClientOptions.addEnabledSecureTransportProtocol(protocol);
--
To stop receiving notification emails like this one, please contact
liu...@apache.org.
[GitHub] liubao68 closed pull request #749: [SCB-350] if the file not exist, make a warn log to trace it. make th…
liubao68 closed pull request #749: [SCB-350] if the file not exist, make a warn
log to trace it. make th…
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/749
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-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
index 9b7fd28d1..bd6642b28 100644
---
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
+++
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
@@ -23,6 +23,8 @@
import org.apache.servicecomb.foundation.ssl.SSLManager;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import io.vertx.core.http.ClientAuth;
import io.vertx.core.http.HttpClientOptions;
@@ -34,6 +36,8 @@
import io.vertx.core.net.TCPSSLOptions;
public final class VertxTLSBuilder {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(VertxTLSBuilder.class);
+
private static final String STORE_PKCS12 = "PKCS12";
private static final String STORE_JKS = "JKS";
@@ -93,7 +97,8 @@ private static TCPSSLOptions buildTCPSSLOptions(SSLOption
sslOption, SSLCustom s
options.setSessionCacheEnabled(true);
tcpClientOptions.setOpenSslEngineOptions(new OpenSSLEngineOptions());
}
-if (isFileExists(sslCustom.getFullPath(sslOption.getKeyStore( {
+String fullKeyStore = sslCustom.getFullPath(sslOption.getKeyStore());
+if (isFileExists(fullKeyStore)) {
if (STORE_PKCS12.equalsIgnoreCase(sslOption.getKeyStoreType())) {
PfxOptions keyPfxOptions = new PfxOptions();
keyPfxOptions.setPath(sslCustom.getFullPath(sslOption.getKeyStore()));
@@ -107,9 +112,11 @@ private static TCPSSLOptions buildTCPSSLOptions(SSLOption
sslOption, SSLCustom s
} else {
throw new IllegalArgumentException("invalid key store type.");
}
+} else {
+ LOGGER.warn("keyStore [" + fullKeyStore + "] file not exist, please
check!");
}
-
-if (isFileExists(sslCustom.getFullPath(sslOption.getTrustStore( {
+String fullTrustStore = sslCustom.getFullPath(sslOption.getTrustStore());
+if (isFileExists(fullTrustStore)) {
if (STORE_PKCS12.equalsIgnoreCase(sslOption.getTrustStoreType())) {
PfxOptions trustPfxOptions = new PfxOptions();
trustPfxOptions.setPath(sslCustom.getFullPath(sslOption.getTrustStore()));
@@ -125,6 +132,8 @@ private static TCPSSLOptions buildTCPSSLOptions(SSLOption
sslOption, SSLCustom s
} else {
throw new IllegalArgumentException("invalid trust store type.");
}
+} else {
+ LOGGER.warn("trustStore [" + fullTrustStore + "] file not exist, please
check!");
}
for (String protocol : sslOption.getProtocols().split(",")) {
tcpClientOptions.addEnabledSecureTransportProtocol(protocol);
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] liubao68 commented on issue #732: SCB-333 Update to support the date time with JSR-310
liubao68 commented on issue #732: SCB-333 Update to support the date time with JSR-310 URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/732#issuecomment-394602059 You can check your provider logs for detail messages. It usually maybe you add some new methods and microservice version not changed and the consumer cannot see the newly added method from service center. See here for more details: https://huaweicse.github.io/servicecomb-java-chassis-doc/zh_CN/question-and-answer/interface-compatibility.html This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] fallblank opened a new issue #751: Can't clone project as filename to long
fallblank opened a new issue #751: Can't clone project as filename to long URL: https://github.com/apache/incubator-servicecomb-java-chassis/issues/751 Error occured when clone this project. Cloning into 'D:\workspace\Github\incubator-servicecomb-java-chassis'... POST git-upload-pack (800 bytes) remote: Counting objects: 66134, done. remote: Compressing objects: 100% (26/26), done. Receiving objects: 100% (66134/66134), 11.02 MiB | 1.47 MiB/s, done. Resolving deltas: 100% (25807/25807), done. remote: Total 66134 (delta 5), reused 23 (delta 4), pack-reused 66100 Checking connectivity... done. **error: unable to create file integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java (Filename too long)** Checking out files: 100% (2283/2283), done. fatal: unable to checkout working tree warning: Clone succeeded, but checkout failed. You can inspect what was checked out with 'git status' and retry the checkout with 'git checkout -f HEAD' This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls commented on issue #744: [SCB-627] Client Request Timeout support for operation/schema/service level
coveralls commented on issue #744: [SCB-627] Client Request Timeout support for operation/schema/service level URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/744#issuecomment-393504515 [](https://coveralls.io/builds/17321244) Coverage increased (+0.004%) to 87.526% when pulling **09a8bbbcb2bac3cce13c8eede22173cd86906c4d on maheshrajus:master** into **fc9c7f40f4d957152a602e68f3be889bf5b8c68f on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
