chore: update configurations for PG and monitoring

- README에 Round 6 작업 내용 추가
- build.gradle.kts에 Resilience4j 의존성 추가
- application.yml PG base-url 설정 추가
- resilience4j.yml TIME_BASED 설정으로 변경
- monitoring-compose.yml, monitoring.yml 업데이트

Author: sylee6529

README.md

@@ -27,7 +27,8 @@ docker-compose -f ./docker/monitoring-compose.yml up
 Root
 ├── apps ( spring-applications )
 │   ├── 📦 commerce-api
-│   └── 📦 commerce-streamer
+│   ├── 📦 commerce-streamer
+│   └── 📦 pg-simulator
 ├── modules ( reusable-configurations )
 │   ├── 📦 jpa
 │   ├── 📦 redis
@@ -37,3 +38,25 @@ Root
     ├── 📦 monitoring
     └── 📦 logging
 ```
+
+## PG Payment System
+
+완전한 결제 시스템 구현 (Resilience 패턴 적용)
+
+### 빠른 시작
+```shell
+# PG Simulator 실행
+./gradlew :apps:pg-simulator:bootRun
+
+# Commerce API 실행
+./gradlew :apps:commerce-api:bootRun
+
+# 테스트
+curl -X POST http://localhost:8080/api/v1/payments/test/request \
+  -H "X-USER-ID: 12345" -H "Content-Type: application/json" \
+  -d '{"orderId":"ORDER-001","cardType":"SAMSUNG","cardNo":"1234-5678-9012-3456","amount":50000}'
+```
+
+### 문서
+- **PAYMENT-GUIDE.md**: 전체 가이드 (구현 사항, API, 테스트)
+- **test-payment-flow.http**: HTTP 테스트 시나리오

apps/commerce-api/build.gradle.kts

@@ -12,6 +12,10 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${project.properties["springDocOpenApiVersion"]}")
 
+    // resilience4j (Spring Boot 3.x 호환 버전)
+    implementation("io.github.resilience4j:resilience4j-spring-boot3:2.2.0")
+    implementation("org.springframework.boot:spring-boot-starter-aop")
+
     // querydsl
     annotationProcessor("com.querydsl:querydsl-apt::jakarta")
     annotationProcessor("jakarta.persistence:jakarta.persistence-api")

apps/commerce-api/src/main/resources/application.yml

@@ -23,12 +23,18 @@ spring:
       - redis.yml
       - logging.yml
       - monitoring.yml
+      - resilience4j.yml
 
 springdoc:
   use-fqn: true
   swagger-ui:
     path: /swagger-ui.html
 
+# PG Simulator 설정
+payment:
+  pg:
+    base-url: http://localhost:8082
+
 ---
 spring:
   config:

apps/commerce-api/src/main/resources/resilience4j.yml

@@ -2,22 +2,15 @@ resilience4j:
   circuitbreaker:
     configs:
       default:
-        # Sliding Window 설정
-        slidingWindowType: COUNT_BASED
-        slidingWindowSize: 10  # 최근 10개 호출을 기준으로 판단
-        minimumNumberOfCalls: 5  # 최소 5번 호출 후 Circuit Breaker 작동
-
-        # 실패율 임계값
-        failureRateThreshold: 50  # 실패율 50% 이상이면 OPEN
-        slowCallRateThreshold: 50  # 느린 호출 50% 이상이면 OPEN
-        slowCallDurationThreshold: 2s  # 2초 이상 걸리면 느린 호출로 간주
-
-        # Circuit Breaker 상태 전환
-        waitDurationInOpenState: 10s  # OPEN 상태에서 10초 후 HALF_OPEN으로 전환
-        permittedNumberOfCallsInHalfOpenState: 3  # HALF_OPEN에서 3번 테스트
+        slidingWindowType: TIME_BASED
+        slidingWindowSize: 30
+        minimumNumberOfCalls: 5
+        failureRateThreshold: 50
+        slowCallRateThreshold: 50
+        slowCallDurationThreshold: 2s
+        waitDurationInOpenState: 10s
+        permittedNumberOfCallsInHalfOpenState: 3
         automaticTransitionFromOpenToHalfOpenEnabled: true
-
-        # 예외 설정
         registerHealthIndicator: true
         recordExceptions:
           - java.util.concurrent.TimeoutException
@@ -28,17 +21,19 @@ resilience4j:
     instances:
       pgSimulator:
         baseConfig: default
-        failureRateThreshold: 60  # PG는 60% 실패율까지 허용 (40% 실패율 고려)
-        slowCallDurationThreshold: 1s  # PG는 1초 이상이면 느린 호출
-        waitDurationInOpenState: 15s  # OPEN 시 15초 대기
+        slidingWindowSize: 20
+        minimumNumberOfCalls: 3
+        failureRateThreshold: 60
+        slowCallDurationThreshold: 1s
+        waitDurationInOpenState: 15s
 
   retry:
     configs:
       default:
-        maxAttempts: 3  # 최대 3번 재시도
-        waitDuration: 500ms  # 재시도 간격 500ms
-        enableExponentialBackoff: true  # 지수 백오프 활성화
-        exponentialBackoffMultiplier: 2  # 2배씩 증가
+        maxAttempts: 3
+        waitDuration: 500ms
+        enableExponentialBackoff: true
+        exponentialBackoffMultiplier: 2
         retryExceptions:
           - java.util.concurrent.TimeoutException
           - org.springframework.web.client.ResourceAccessException
@@ -48,15 +43,14 @@ resilience4j:
     instances:
       pgSimulator:
         baseConfig: default
-        maxAttempts: 1  # PG는 재시도 안 함 (멱등성 보장 어려움)
-        # Payment 엔티티 저장 후 requiresRetry 플래그로 수동 재시도 처리
+        maxAttempts: 1
         waitDuration: 300ms
 
   timelimiter:
     configs:
       default:
-        timeoutDuration: 3s  # 기본 타임아웃 3초
+        timeoutDuration: 3s
         cancelRunningFuture: true
     instances:
       pgSimulator:
-        timeoutDuration: 2s  # PG 호출은 2초 타임아웃 (요청 지연 100-500ms 고려)
+        timeoutDuration: 2s

docker/monitoring-compose.yml

@@ -1,11 +1,13 @@
 version: '3'
 services:
   prometheus:
-    image: prom/prometheus
+    image: prom/prometheus:v2.48.0
     ports:
       - "9090:9090"
     volumes:
       - ./grafana/prometheus.yml:/etc/prometheus/prometheus.yml
+      - prometheus-data:/prometheus
+    restart: unless-stopped
 
   grafana:
     image: grafana/grafana
@@ -17,6 +19,9 @@ services:
       - GF_SECURITY_ADMIN_USER=admin
       - GF_SECURITY_ADMIN_PASSWORD=admin
 
+volumes:
+  prometheus-data:
+
 networks:
   default:
     driver: bridge

supports/monitoring/src/main/resources/monitoring.yml

@@ -3,15 +3,29 @@ management:
     distribution:
       percentiles-histogram:
         http.server.requests: true
+      percentiles:
+        http.server.requests: 0.5, 0.95, 0.99
+      slo:
+        http.server.requests: 10ms, 50ms, 100ms, 200ms, 500ms, 1s, 2s, 5s, 10s
     tags:
       application:
         ${spring.application.name}
+    # 활성화할 메트릭 명시
+    enable:
+      jvm: true
+      system: true
+      tomcat: true
+      hikaricp: true
+      logback: true
+      process: true
   endpoints:
     web:
       exposure:
         include:
           - health
           - prometheus
+          - metrics
+          - info
   endpoint:
     health:
       probes:
@@ -23,8 +37,13 @@ management:
             - livenessState
         readiness:
           show-components: always
+          include:
+            - readinessState
+            - db
     prometheus:
       access: read_only
+    metrics:
+      enabled: true
   health:
     livenessState:
       enabled: true