From 11f01982220d860557d975d22d1ec4bab204bc80 Mon Sep 17 00:00:00 2001 From: assu10 Date: Sun, 14 Feb 2021 19:55:02 +0900 Subject: [PATCH] =?UTF-8?q?Spring=20Cloud=20Sleuth,=20Open=20Zipkin=20?= =?UTF-8?q?=EC=9D=84=20=EC=9D=B4=EC=9A=A9=ED=95=9C=20=EB=B6=84=EC=82=B0=20?= =?UTF-8?q?=EC=B6=94=EC=A0=81=20(4/4)=20-=20=EB=A1=9C=EA=B7=B8=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=81=ED=99=94=EB=A5=BC=20=EC=9C=84=ED=95=9C=20Open=20Zipki?= =?UTF-8?q?n=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- event-service/pom.xml | 9 +++++++++ .../cloud/eventservice/controller/EventController.java | 5 +++++ event-service/src/main/resources/application.yaml | 8 ++++++++ event-service/src/main/resources/logback.xml | 5 +++++ member-service/pom.xml | 9 +++++++++ .../cloud/memberservice/controller/MemberController.java | 3 ++- member-service/src/main/resources/application.yaml | 8 ++++++++ member-service/src/main/resources/bootstrap.yaml | 8 -------- member-service/src/main/resources/logback.xml | 5 +++++ pom.xml | 1 + zuulserver/pom.xml | 9 +++++++++ zuulserver/src/main/resources/application.yaml | 2 ++ 12 files changed, 63 insertions(+), 9 deletions(-) delete mode 100644 member-service/src/main/resources/bootstrap.yaml diff --git a/event-service/pom.xml b/event-service/pom.xml index 85d1937..470ac89 100644 --- a/event-service/pom.xml +++ b/event-service/pom.xml @@ -102,6 +102,15 @@ 6.6 + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-starter-zipkin + + org.springframework.boot spring-boot-starter-test diff --git a/event-service/src/main/java/com/assu/cloud/eventservice/controller/EventController.java b/event-service/src/main/java/com/assu/cloud/eventservice/controller/EventController.java index ccc2771..1df5ba8 100644 --- a/event-service/src/main/java/com/assu/cloud/eventservice/controller/EventController.java +++ b/event-service/src/main/java/com/assu/cloud/eventservice/controller/EventController.java @@ -51,6 +51,7 @@ public class EventController { */ @GetMapping(value = "member/{nick}") public String getMemberName(@PathVariable("nick") String nick) { + logger.info("[EVENT] Calling member's name/nick {}", nick); return memberFeignClient.getYourName(nick); } @@ -60,6 +61,10 @@ public class EventController { @GetMapping(value = "gift/{name}") public String gift(@PathVariable("name") String gift) { //sleep(); + logger.info("[EVENT] Gift is {} logging...gift is {}.", gift); + + memberFeignClient.getYourName(gift); + return "[EVENT] Gift is " + gift; } diff --git a/event-service/src/main/resources/application.yaml b/event-service/src/main/resources/application.yaml index 50dbcfa..119699a 100644 --- a/event-service/src/main/resources/application.yaml +++ b/event-service/src/main/resources/application.yaml @@ -14,6 +14,14 @@ spring: binder: zkNodes: localhost # zkNodes, brokers 는 스트림에게 카프카와 주키퍼의 네트워크 위치 전달 brokers: localhost + zipkin: + enabled: true + base-url: http://localhost:9411 # 집킨 통신에 사용되는 URL + sleuth: + enabled: true + sampler: + probability: 1.0 # 집킨 으로 데이터를 전송하는 트랜잭션 샘플링 비율 + server: port: 8070 your.name: "EVENT DEFAULT." diff --git a/event-service/src/main/resources/logback.xml b/event-service/src/main/resources/logback.xml index f526804..59f2b3c 100644 --- a/event-service/src/main/resources/logback.xml +++ b/event-service/src/main/resources/logback.xml @@ -4,6 +4,11 @@ + + + localhost:4560 diff --git a/member-service/pom.xml b/member-service/pom.xml index 0feb86e..ce5322b 100644 --- a/member-service/pom.xml +++ b/member-service/pom.xml @@ -91,6 +91,15 @@ 6.6 + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-starter-zipkin + + org.springframework.boot spring-boot-starter-test diff --git a/member-service/src/main/java/com/assu/cloud/memberservice/controller/MemberController.java b/member-service/src/main/java/com/assu/cloud/memberservice/controller/MemberController.java index d618e83..91e6e2e 100644 --- a/member-service/src/main/java/com/assu/cloud/memberservice/controller/MemberController.java +++ b/member-service/src/main/java/com/assu/cloud/memberservice/controller/MemberController.java @@ -32,7 +32,7 @@ public class MemberController { @GetMapping(value = "name/{nick}") public String getYourName(ServletRequest req, @PathVariable("nick") String nick) { - logger.info("[MEMBER] name/{nick} logging...nick is {}.", nick); + logger.info("[MEMBER] ASSU name/{nick} logging...nick is {}.", nick); return "[MEMBER] Your name is " + customConfig.getYourName() + " / nickname is " + nick + " / port is " + req.getServerPort(); } @@ -41,6 +41,7 @@ public class MemberController { */ @GetMapping(value = "gift/{name}") public String gift(ServletRequest req, @PathVariable("name") String name) { + logger.info("[MEMBER] gift/{name} logging...name is {}.", name); return "[MEMBER] " + eventRestTemplateClient.gift(name) + " / port is " + req.getServerPort(); } diff --git a/member-service/src/main/resources/application.yaml b/member-service/src/main/resources/application.yaml index 2269cdd..1dfc908 100644 --- a/member-service/src/main/resources/application.yaml +++ b/member-service/src/main/resources/application.yaml @@ -13,6 +13,14 @@ spring: binder: zkNodes: localhost # zkNodes, brokers 는 스트림에게 카프카와 주키퍼의 네트워크 위치 전달 brokers: localhost + zipkin: + enabled: true + base-url: http://localhost:9411 # 집킨 통신에 사용되는 URL + sleuth: + enabled: true + sampler: + probability: 1.0 # 집킨 으로 데이터를 전송하는 트랜잭션 샘플링 비율 + server: port: 8090 your.name: "MEMBER DEFAULT..." diff --git a/member-service/src/main/resources/bootstrap.yaml b/member-service/src/main/resources/bootstrap.yaml deleted file mode 100644 index f069e71..0000000 --- a/member-service/src/main/resources/bootstrap.yaml +++ /dev/null @@ -1,8 +0,0 @@ -#spring: -# application: -# name: member-service # 서비스 ID (컨피그 클라이언트가 어떤 서비스를 조회하는지 매핑) -# profiles: -# active: default # 서비스가 실행할 기본 프로파일 -# cloud: -# config: -# uri: http://localhost:8889 # 컨피그 서버 위치 diff --git a/member-service/src/main/resources/logback.xml b/member-service/src/main/resources/logback.xml index f526804..025359f 100644 --- a/member-service/src/main/resources/logback.xml +++ b/member-service/src/main/resources/logback.xml @@ -4,6 +4,11 @@ + + + localhost:4560 diff --git a/pom.xml b/pom.xml index 0f12df2..e5e7410 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ eurekaserver zuulserver auth-service + diff --git a/zuulserver/pom.xml b/zuulserver/pom.xml index a796e1e..6e28008 100644 --- a/zuulserver/pom.xml +++ b/zuulserver/pom.xml @@ -72,6 +72,15 @@ spring-cloud-starter-netflix-hystrix --> + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-starter-zipkin + + org.springframework.boot spring-boot-starter-test diff --git a/zuulserver/src/main/resources/application.yaml b/zuulserver/src/main/resources/application.yaml index 05cad67..9d9a63e 100644 --- a/zuulserver/src/main/resources/application.yaml +++ b/zuulserver/src/main/resources/application.yaml @@ -3,6 +3,8 @@ spring: name: zuulserver # 서비스 ID (컨피그 클라이언트가 어떤 서비스를 조회하는지 매핑) profiles: active: default # 서비스가 실행할 기본 프로파일 + zipkin: + base-url: http://localhost:9411 # 집킨 통신에 사용되는 URL server: port: 5555