From d9fe14dd567312661990d1c2649290ba863daf2d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 10 Dec 2016 22:44:55 +0000 Subject: [PATCH] Update to Camden.SR3 --- bootstrap/pom.xml | 2 +- bus/pom.xml | 2 +- config-client-decrypt/pom.xml | 2 +- config-client/pom.xml | 2 +- config-retry/pom.xml | 2 +- configserver-bootstrap/pom.xml | 2 +- configserver-eureka/pom.xml | 2 +- configserver/pom.xml | 2 +- eureka-client/pom.xml | 2 +- eureka-first/pom.xml | 2 +- eureka-noweb/pom.xml | 2 +- eureka-server/pom.xml | 2 +- feign-eureka/pom.xml | 2 +- feign-hystrix/pom.xml | 2 +- feign/pom.xml | 2 +- hystrix-amqp/pom.xml | 2 +- hystrix/pom.xml | 2 +- netflix-sidecar/pom.xml | 2 +- noweb/pom.xml | 2 +- oauth2-ribbon/pom.xml | 2 +- oauth2-zuul/pom.xml | 2 +- ribbon-default-config/pom.xml | 2 +- ribbon-eureka/pom.xml | 2 +- sleuth/pom.xml | 5 +-- .../src/main/java/demo/TraceApplication.java | 43 +++++++++++++++++++ sleuth/src/main/resources/application.yml | 4 -- stream-bus/pom.xml | 2 +- turbine-amqp/pom.xml | 2 +- turbine/pom.xml | 2 +- vanilla/pom.xml | 2 +- zipkin/pom.xml | 2 +- zuul-config-discovery/pom.xml | 2 +- zuul-proxy-eureka/pom.xml | 2 +- zuul-proxy/pom.xml | 2 +- zuul/pom.xml | 2 +- 35 files changed, 77 insertions(+), 39 deletions(-) diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 6179963..586346b 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/bus/pom.xml b/bus/pom.xml index ee5a97f..ef9fb0d 100644 --- a/bus/pom.xml +++ b/bus/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml index 65b84da..641a20a 100644 --- a/config-client-decrypt/pom.xml +++ b/config-client-decrypt/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/config-client/pom.xml b/config-client/pom.xml index 05a91b5..65c5023 100644 --- a/config-client/pom.xml +++ b/config-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/config-retry/pom.xml b/config-retry/pom.xml index d636c17..4351267 100644 --- a/config-retry/pom.xml +++ b/config-retry/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml index 94aa2c9..3645d9e 100644 --- a/configserver-bootstrap/pom.xml +++ b/configserver-bootstrap/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml index 307d4a7..a684b26 100644 --- a/configserver-eureka/pom.xml +++ b/configserver-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/configserver/pom.xml b/configserver/pom.xml index 57302c3..4b9f909 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/eureka-client/pom.xml b/eureka-client/pom.xml index 4434638..19f4bd0 100644 --- a/eureka-client/pom.xml +++ b/eureka-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml index d277d9b..74afba9 100644 --- a/eureka-first/pom.xml +++ b/eureka-first/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml index b66bb3e..7fde534 100644 --- a/eureka-noweb/pom.xml +++ b/eureka-noweb/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml index da920be..cf22c6f 100644 --- a/eureka-server/pom.xml +++ b/eureka-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml index d0482d2..498c6ec 100644 --- a/feign-eureka/pom.xml +++ b/feign-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/feign-hystrix/pom.xml b/feign-hystrix/pom.xml index e462d3b..bc42fc3 100644 --- a/feign-hystrix/pom.xml +++ b/feign-hystrix/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/feign/pom.xml b/feign/pom.xml index 7b388e8..71b9256 100644 --- a/feign/pom.xml +++ b/feign/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/hystrix-amqp/pom.xml b/hystrix-amqp/pom.xml index e465ad3..a58f421 100644 --- a/hystrix-amqp/pom.xml +++ b/hystrix-amqp/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/hystrix/pom.xml b/hystrix/pom.xml index 0b6034f..091e732 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml index 9d9f8cc..731e63e 100644 --- a/netflix-sidecar/pom.xml +++ b/netflix-sidecar/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/noweb/pom.xml b/noweb/pom.xml index 4c961c3..da3afff 100644 --- a/noweb/pom.xml +++ b/noweb/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml index 3e7bedc..adf4d20 100644 --- a/oauth2-ribbon/pom.xml +++ b/oauth2-ribbon/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/oauth2-zuul/pom.xml b/oauth2-zuul/pom.xml index 70f065e..bab61a5 100644 --- a/oauth2-zuul/pom.xml +++ b/oauth2-zuul/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/ribbon-default-config/pom.xml b/ribbon-default-config/pom.xml index 9db41ad..976235d 100644 --- a/ribbon-default-config/pom.xml +++ b/ribbon-default-config/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml index 0244d7d..31ed066 100644 --- a/ribbon-eureka/pom.xml +++ b/ribbon-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/sleuth/pom.xml b/sleuth/pom.xml index 8db9e2d..f857d53 100644 --- a/sleuth/pom.xml +++ b/sleuth/pom.xml @@ -14,15 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE UTF-8 - demo.DemoApplication 1.7 - Camden.RC1 + Camden.SR3 diff --git a/sleuth/src/main/java/demo/TraceApplication.java b/sleuth/src/main/java/demo/TraceApplication.java index 054b2c2..2e5ab30 100644 --- a/sleuth/src/main/java/demo/TraceApplication.java +++ b/sleuth/src/main/java/demo/TraceApplication.java @@ -1,12 +1,55 @@ package demo; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; @SpringBootApplication public class TraceApplication { + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } + public static void main(String[] args) { SpringApplication.run(TraceApplication.class, args); } } + +@RestController +class HomeController { + + private static final Log log = LogFactory.getLog(HomeController.class); + @Autowired + private RestTemplate restTemplate; + @Value("${app.url:http://localhost:${local.server.port:${server.port:8080}}}") + private String url; + + @RequestMapping("/") + public String home() { + log.info("Home"); + String s = this.restTemplate.getForObject(url + "/hi", String.class); + return "hi/" + s; + } + +} + +@RestController +class HiController { + + private static final Log log = LogFactory.getLog(HiController.class); + + @RequestMapping("/hi") + public String hi() { + log.info("Hi"); + return "hi"; + } +} \ No newline at end of file diff --git a/sleuth/src/main/resources/application.yml b/sleuth/src/main/resources/application.yml index 1647069..d3669a5 100644 --- a/sleuth/src/main/resources/application.yml +++ b/sleuth/src/main/resources/application.yml @@ -5,7 +5,3 @@ spring: log: json: enabled: true - -logging: - pattern: - console: '%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(---){faint} %clr([trace=%X{X-Trace-Id:-},span=%X{X-Span-Id:-}]){yellow} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex' diff --git a/stream-bus/pom.xml b/stream-bus/pom.xml index d43aa56..d026b59 100644 --- a/stream-bus/pom.xml +++ b/stream-bus/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/turbine-amqp/pom.xml b/turbine-amqp/pom.xml index a7404b4..7df5e4c 100644 --- a/turbine-amqp/pom.xml +++ b/turbine-amqp/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/turbine/pom.xml b/turbine/pom.xml index ba14f98..835a58a 100644 --- a/turbine/pom.xml +++ b/turbine/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/vanilla/pom.xml b/vanilla/pom.xml index e03e9a2..5b361e5 100644 --- a/vanilla/pom.xml +++ b/vanilla/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/zipkin/pom.xml b/zipkin/pom.xml index e4a38d5..072bf8c 100644 --- a/zipkin/pom.xml +++ b/zipkin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/zuul-config-discovery/pom.xml b/zuul-config-discovery/pom.xml index 432f815..0e950cb 100755 --- a/zuul-config-discovery/pom.xml +++ b/zuul-config-discovery/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/zuul-proxy-eureka/pom.xml b/zuul-proxy-eureka/pom.xml index 66a7c1c..05d9d46 100644 --- a/zuul-proxy-eureka/pom.xml +++ b/zuul-proxy-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/zuul-proxy/pom.xml b/zuul-proxy/pom.xml index 38fcc1e..f942aca 100644 --- a/zuul-proxy/pom.xml +++ b/zuul-proxy/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE diff --git a/zuul/pom.xml b/zuul/pom.xml index f73d7d0..97a7a92 100644 --- a/zuul/pom.xml +++ b/zuul/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE