Merge pull request #15 from sazzeo/prometheus

프로메테우스, 그라파나
sazzeo · Aug 22, 2022 · 6eb44b3 · 6eb44b3
2 parents 1e8071d + 8ac4b7c
commit 6eb44b3
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 6 deletions.
diff --git a/d-gateway/build.gradle b/d-gateway/build.gradle
@@ -21,6 +21,7 @@ dependencies {
     //actuator
     implementation 'org.springframework.boot:spring-boot-starter-actuator:2.7.2'
    // implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp:3.1.2'
+    implementation 'io.micrometer:micrometer-registry-prometheus:1.9.2'
 }
 
 //버전 알아서 찾아주는 애

diff --git a/d-gateway/src/main/resources/application.yml b/d-gateway/src/main/resources/application.yml
@@ -97,6 +97,6 @@ management:
   endpoints:
     web:
       exposure:
-        include: refresh , health , beans , httptrace , busrefresh
+        include: refresh , health , beans , httptrace , busrefresh , info , metrics , prometheus
 
 
diff --git a/d-order-service/build.gradle b/d-order-service/build.gradle
@@ -9,6 +9,8 @@ dependencies {
     implementation 'org.springframework.kafka:spring-kafka:2.9.0'  //카프카
     implementation 'org.springframework.cloud:spring-cloud-starter-sleuth:3.1.3'  //sleuth
     implementation 'org.springframework.cloud:spring-cloud-starter-zipkin:2.2.8.RELEASE' //zipkin
+    implementation 'org.springframework.boot:spring-boot-starter-actuator:2.7.3'  //spring cloud actuator
+    implementation 'io.micrometer:micrometer-registry-prometheus:1.9.2'
 
 
     runtimeOnly 'com.h2database:h2'   //runtime scope로 실행

diff --git a/d-order-service/src/main/resources/application.yml b/d-order-service/src/main/resources/application.yml
@@ -23,4 +23,11 @@ eureka:
 
 logging:
   level:
-    com.example.dorderservice : DEBUG
+    com.example.dorderservice : DEBUG
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: info , metrics , prometheus
+
diff --git a/d-user-service/build.gradle b/d-user-service/build.gradle
@@ -25,6 +25,7 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:2.1.3' //resilience4j
     implementation 'org.springframework.cloud:spring-cloud-starter-sleuth:3.1.3'  //sleuth
     implementation 'org.springframework.cloud:spring-cloud-starter-zipkin:2.2.8.RELEASE' //zipkin
+    implementation 'io.micrometer:micrometer-registry-prometheus:1.9.2'
 
     implementation 'org.postgresql:postgresql:42.3.6'
 

diff --git a/d-user-service/src/main/java/com/example/duserservice/controller/UserApiController.java b/d-user-service/src/main/java/com/example/duserservice/controller/UserApiController.java
@@ -4,6 +4,7 @@
 import com.example.duserservice.config.EnvironmentDto;
 import com.example.duserservice.service.UserService;
 import com.example.duserservice.vo.*;
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.modelmapper.ModelMapper;
@@ -26,6 +27,7 @@ public class UserApiController {
     private final Environment env;
 
     //상태 체크 함수
+    @Timed(value = "users.status", longTask = true)
     @GetMapping("/health_check")
     public EnvironmentDto status() {
 
@@ -37,13 +39,19 @@ public EnvironmentDto status() {
                 .build();
     }
 
+    @Timed(value = "users.welcome", longTask = true)
+    @GetMapping("/welcome")
+    public String welcome() {
+        return "welcome user-service";
+    }
+
     @PostMapping("/users")
     public ResponseEntity<ResponseUser> createUser(@RequestBody @Valid RequestUser requestUser) {
 
         UserDto userDto = modelMapper.map(requestUser, UserDto.class);
         userService.createUser(userDto);
 
-        ResponseUser responseUser = modelMapper.map(userDto , ResponseUser.class);
+        ResponseUser responseUser = modelMapper.map(userDto, ResponseUser.class);
 
         return ResponseEntity.status(HttpStatus.CREATED).body(responseUser);
     }
@@ -52,8 +60,8 @@ public ResponseEntity<ResponseUser> createUser(@RequestBody @Valid RequestUser r
     public ResponseEntity findUsers() {
         return ResponseEntity.status(HttpStatus.ACCEPTED).body(userService.findUserByAll());
     }
-    
-    
+
+
     //유저정보와 오더정보를 한번에 가져오기 (order : restTemplate 호출)
     @GetMapping("/users/{userId}")
     public ResponseEntity findUserByUserId(@PathVariable String userId) {

diff --git a/d-user-service/src/main/resources/application.yml b/d-user-service/src/main/resources/application.yml
@@ -31,6 +31,6 @@ management:
   endpoints:
     web:
       exposure:
-        include: refresh , health , beans , busrefresh
+        include: refresh , health , beans , busrefresh , info , metrics , prometheus