Merge branch 'feature/inflow-control-improvement'

- AbstractInflowControlManager 상속 구조 리팩토링
- DualInflowControlManager DAO 이중 호출 제거 및 타겟 메트릭 추가
- 어댑터/인터페이스/클라이언트 유량제어 메트릭 API 추가
- 관련 단위테스트 수정 및 추가
This commit is contained in:
curry772
2026-04-30 10:17:15 +09:00
12 changed files with 1780 additions and 5 deletions
@@ -5,15 +5,16 @@ import java.util.List;
import org.springframework.stereotype.Service;
import com.eactive.eai.common.inflow.AbstractInflowControlManager;
import com.eactive.eai.common.inflow.CustomGroupBucket;
import com.eactive.eai.common.inflow.InflowControlManager;
import com.eactive.eai.common.inflow.InflowControlUtil;
import com.eactive.eai.common.inflow.InflowGroupVO;
@Service
public class InflowGroupBucketService {
public GroupBucketStatusDTO getGroupBucketStatus(String groupId) {
InflowControlManager manager = InflowControlManager.getInstance();
AbstractInflowControlManager manager = InflowControlUtil.getInflowControlManager();
InflowGroupVO groupVo = manager.getGroupInflowThreshold(groupId);
if (groupVo == null) {
@@ -71,11 +72,11 @@ public class InflowGroupBucketService {
}
public CustomGroupBucket getCustomGroupBucket(String groupId) {
return InflowControlManager.getInstance().getGroupBucket(groupId);
return InflowControlUtil.getInflowControlManager().getGroupBucket(groupId);
}
public List<GroupBucketStatusDTO> getAllGroupBucketStatus() {
InflowControlManager manager = InflowControlManager.getInstance();
AbstractInflowControlManager manager = InflowControlUtil.getInflowControlManager();
String[] groupIds = manager.getGroupAllKeys();
List<GroupBucketStatusDTO> result = new ArrayList<>();
@@ -0,0 +1,106 @@
package com.eactive.eai.manage.inflow;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 어댑터/인터페이스/클라이언트 버킷 상태 모니터링 API.
*
* DualInflowControlManager 가 활성화된 환경에서만 정상 응답한다.
* 비활성화 환경에서는 success=false 또는 빈 목록을 반환한다.
*
* GET /manage/inflow/adapter/bucket-status → 전체 어댑터 버킷 상태
* GET /manage/inflow/adapter/{adapterId}/bucket-status → 특정 어댑터 버킷 상태
* GET /manage/inflow/interface/bucket-status → 전체 인터페이스 버킷 상태
* GET /manage/inflow/interface/{interfaceId}/bucket-status → 특정 인터페이스 버킷 상태
* GET /manage/inflow/client/bucket-status → 전체 클라이언트 버킷 상태
* GET /manage/inflow/client/{clientId}/bucket-status → 특정 클라이언트 버킷 상태
*/
@RestController
@RequestMapping("/manage/inflow")
public class InflowTargetBucketController {
@Autowired
private InflowTargetBucketService bucketService;
// =========================================================================
// 어댑터
// =========================================================================
@GetMapping("/adapter/bucket-status")
public ResponseEntity<?> getAllAdapterBucketStatus() {
List<TargetBucketStatusDTO> list = bucketService.getAllAdapterBucketStatus();
return ok(list);
}
@GetMapping("/adapter/{adapterId}/bucket-status")
public ResponseEntity<?> getAdapterBucketStatus(@PathVariable String adapterId) {
TargetBucketStatusDTO dto = bucketService.getAdapterBucketStatus(adapterId);
return single(dto, "어댑터를 찾을 수 없습니다: " + adapterId);
}
// =========================================================================
// 인터페이스
// =========================================================================
@GetMapping("/interface/bucket-status")
public ResponseEntity<?> getAllInterfaceBucketStatus() {
List<TargetBucketStatusDTO> list = bucketService.getAllInterfaceBucketStatus();
return ok(list);
}
@GetMapping("/interface/{interfaceId}/bucket-status")
public ResponseEntity<?> getInterfaceBucketStatus(@PathVariable String interfaceId) {
TargetBucketStatusDTO dto = bucketService.getInterfaceBucketStatus(interfaceId);
return single(dto, "인터페이스를 찾을 수 없습니다: " + interfaceId);
}
// =========================================================================
// 클라이언트
// =========================================================================
@GetMapping("/client/bucket-status")
public ResponseEntity<?> getAllClientBucketStatus() {
List<TargetBucketStatusDTO> list = bucketService.getAllClientBucketStatus();
return ok(list);
}
@GetMapping("/client/{clientId}/bucket-status")
public ResponseEntity<?> getClientBucketStatus(@PathVariable String clientId) {
TargetBucketStatusDTO dto = bucketService.getClientBucketStatus(clientId);
return single(dto, "클라이언트를 찾을 수 없습니다: " + clientId);
}
// =========================================================================
// Helpers
// =========================================================================
private ResponseEntity<?> ok(List<TargetBucketStatusDTO> list) {
Map<String, Object> result = new HashMap<>();
result.put("success", true);
result.put("data", list);
result.put("count", list.size());
return ResponseEntity.ok(result);
}
private ResponseEntity<?> single(TargetBucketStatusDTO dto, String notFoundMsg) {
if (dto == null) {
Map<String, Object> error = new HashMap<>();
error.put("success", false);
error.put("message", notFoundMsg);
return ResponseEntity.ok(error);
}
Map<String, Object> result = new HashMap<>();
result.put("success", true);
result.put("data", dto);
return ResponseEntity.ok(result);
}
}
@@ -0,0 +1,122 @@
package com.eactive.eai.manage.inflow;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;
import com.eactive.eai.common.inflow.AbstractInflowControlManager;
import com.eactive.eai.common.inflow.InflowControlUtil;
import com.eactive.eai.common.inflow.InflowTargetVO;
import com.eactive.eai.common.inflow.dual.DualCustomBucket;
import com.eactive.eai.common.inflow.dual.DualInflowControlManager;
/**
* 어댑터/인터페이스/클라이언트 버킷 상태 조회 서비스.
*
* DualInflowControlManager 가 활성화된 경우에만 동작한다.
* InflowControlManager 가 기본 구현체인 경우 빈 목록 또는 null 을 반환한다.
*/
@Service
public class InflowTargetBucketService {
// -------------------------------------------------------------------------
// 어댑터
// -------------------------------------------------------------------------
public TargetBucketStatusDTO getAdapterBucketStatus(String adapterId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return null;
DualCustomBucket bucket = manager.getAdapterBucket(adapterId);
if (bucket == null) return null;
return toDto(adapterId, "ADAPTER", bucket);
}
public List<TargetBucketStatusDTO> getAllAdapterBucketStatus() {
DualInflowControlManager manager = getDualManager();
if (manager == null) return new ArrayList<>();
return toDtoList("ADAPTER", manager.getAdapterBucketMap());
}
// -------------------------------------------------------------------------
// 인터페이스
// -------------------------------------------------------------------------
public TargetBucketStatusDTO getInterfaceBucketStatus(String interfaceId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return null;
DualCustomBucket bucket = manager.getInterfaceBucket(interfaceId);
if (bucket == null) return null;
return toDto(interfaceId, "INTERFACE", bucket);
}
public List<TargetBucketStatusDTO> getAllInterfaceBucketStatus() {
DualInflowControlManager manager = getDualManager();
if (manager == null) return new ArrayList<>();
return toDtoList("INTERFACE", manager.getInterfaceBucketMap());
}
// -------------------------------------------------------------------------
// 클라이언트
// -------------------------------------------------------------------------
public TargetBucketStatusDTO getClientBucketStatus(String clientId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return null;
DualCustomBucket bucket = manager.getClientBucket(clientId);
if (bucket == null) return null;
return toDto(clientId, "CLIENT", bucket);
}
public List<TargetBucketStatusDTO> getAllClientBucketStatus() {
DualInflowControlManager manager = getDualManager();
if (manager == null) return new ArrayList<>();
return toDtoList("CLIENT", manager.getClientBucketMap());
}
// -------------------------------------------------------------------------
// Private helpers
// -------------------------------------------------------------------------
protected DualInflowControlManager getDualManager() {
AbstractInflowControlManager base = InflowControlUtil.getInflowControlManager();
return (base instanceof DualInflowControlManager) ? (DualInflowControlManager) base : null;
}
private TargetBucketStatusDTO toDto(String targetId, String targetType, DualCustomBucket bucket) {
InflowTargetVO vo = bucket.getInflowTargetVo();
List<GroupBucketStatusDTO.BucketInfo> buckets = new ArrayList<>();
if (vo.getThresholdPerSecond() > 0) {
long capacity = vo.getThresholdPerSecond();
long available = bucket.getPerSecondAvailableTokens();
if (available < 0) available = capacity;
buckets.add(new GroupBucketStatusDTO.BucketInfo(
"perSecond", capacity, Math.min(available, capacity), "SEC"));
}
if (vo.getThreshold() > 0) {
long capacity = vo.getThreshold();
long available = bucket.getThresholdAvailableTokens();
if (available < 0) available = capacity;
buckets.add(new GroupBucketStatusDTO.BucketInfo(
"threshold", capacity, Math.min(available, capacity), vo.getThresholdTimeUnit()));
}
TargetBucketStatusDTO dto = new TargetBucketStatusDTO();
dto.setTargetId(targetId);
dto.setTargetType(targetType);
dto.setActivate(vo.isActivate());
dto.setBuckets(buckets);
return dto;
}
private List<TargetBucketStatusDTO> toDtoList(String targetType, Map<String, DualCustomBucket> bucketMap) {
List<TargetBucketStatusDTO> result = new ArrayList<>();
for (Map.Entry<String, DualCustomBucket> entry : bucketMap.entrySet()) {
result.add(toDto(entry.getKey(), targetType, entry.getValue()));
}
return result;
}
}
@@ -0,0 +1,166 @@
package com.eactive.eai.manage.inflow;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 어댑터/인터페이스/클라이언트 유량제어 메트릭 API.
*
* DualInflowControlManager 가 활성화된 환경에서만 정상 응답한다.
*
* GET /manage/inflow/adapter/metric → 전체 어댑터 메트릭
* GET /manage/inflow/adapter/{adapterId}/metric → 특정 어댑터 메트릭
* POST /manage/inflow/adapter/metric/reset → 전체 어댑터 메트릭 초기화
* POST /manage/inflow/adapter/{adapterId}/metric/reset → 특정 어댑터 메트릭 초기화
*
* GET /manage/inflow/interface/metric → 전체 인터페이스 메트릭
* GET /manage/inflow/interface/{interfaceId}/metric → 특정 인터페이스 메트릭
* POST /manage/inflow/interface/metric/reset → 전체 인터페이스 메트릭 초기화
* POST /manage/inflow/interface/{interfaceId}/metric/reset → 특정 인터페이스 메트릭 초기화
*
* GET /manage/inflow/client/metric → 전체 클라이언트 메트릭
* GET /manage/inflow/client/{clientId}/metric → 특정 클라이언트 메트릭
* POST /manage/inflow/client/metric/reset → 전체 클라이언트 메트릭 초기화
* POST /manage/inflow/client/{clientId}/metric/reset → 특정 클라이언트 메트릭 초기화
*/
@RestController
@RequestMapping("/manage/inflow")
public class InflowTargetMetricController {
@Autowired
private InflowTargetMetricService metricService;
// =========================================================================
// 어댑터
// =========================================================================
@GetMapping("/adapter/metric")
public ResponseEntity<?> getAllAdapterMetrics() {
List<TargetMetricDTO> list = metricService.getAllAdapterMetrics();
return okList(list);
}
@GetMapping("/adapter/{adapterId}/metric")
public ResponseEntity<?> getAdapterMetric(@PathVariable String adapterId) {
TargetMetricDTO dto = metricService.getAdapterMetric(adapterId);
return okSingle(dto, "어댑터를 찾을 수 없습니다: " + adapterId);
}
@PostMapping("/adapter/metric/reset")
public ResponseEntity<?> resetAllAdapterMetrics() {
metricService.resetAllAdapterMetrics();
return okReset("전체 어댑터 메트릭 초기화 완료");
}
@PostMapping("/adapter/{adapterId}/metric/reset")
public ResponseEntity<?> resetAdapterMetric(@PathVariable String adapterId) {
boolean ok = metricService.resetAdapterMetric(adapterId);
return okResetSingle(ok, adapterId, "어댑터");
}
// =========================================================================
// 인터페이스
// =========================================================================
@GetMapping("/interface/metric")
public ResponseEntity<?> getAllInterfaceMetrics() {
List<TargetMetricDTO> list = metricService.getAllInterfaceMetrics();
return okList(list);
}
@GetMapping("/interface/{interfaceId}/metric")
public ResponseEntity<?> getInterfaceMetric(@PathVariable String interfaceId) {
TargetMetricDTO dto = metricService.getInterfaceMetric(interfaceId);
return okSingle(dto, "인터페이스를 찾을 수 없습니다: " + interfaceId);
}
@PostMapping("/interface/metric/reset")
public ResponseEntity<?> resetAllInterfaceMetrics() {
metricService.resetAllInterfaceMetrics();
return okReset("전체 인터페이스 메트릭 초기화 완료");
}
@PostMapping("/interface/{interfaceId}/metric/reset")
public ResponseEntity<?> resetInterfaceMetric(@PathVariable String interfaceId) {
boolean ok = metricService.resetInterfaceMetric(interfaceId);
return okResetSingle(ok, interfaceId, "인터페이스");
}
// =========================================================================
// 클라이언트
// =========================================================================
@GetMapping("/client/metric")
public ResponseEntity<?> getAllClientMetrics() {
List<TargetMetricDTO> list = metricService.getAllClientMetrics();
return okList(list);
}
@GetMapping("/client/{clientId}/metric")
public ResponseEntity<?> getClientMetric(@PathVariable String clientId) {
TargetMetricDTO dto = metricService.getClientMetric(clientId);
return okSingle(dto, "클라이언트를 찾을 수 없습니다: " + clientId);
}
@PostMapping("/client/metric/reset")
public ResponseEntity<?> resetAllClientMetrics() {
metricService.resetAllClientMetrics();
return okReset("전체 클라이언트 메트릭 초기화 완료");
}
@PostMapping("/client/{clientId}/metric/reset")
public ResponseEntity<?> resetClientMetric(@PathVariable String clientId) {
boolean ok = metricService.resetClientMetric(clientId);
return okResetSingle(ok, clientId, "클라이언트");
}
// =========================================================================
// Helpers
// =========================================================================
private ResponseEntity<?> okList(List<TargetMetricDTO> list) {
Map<String, Object> result = new HashMap<>();
result.put("success", true);
result.put("data", list);
result.put("count", list.size());
return ResponseEntity.ok(result);
}
private ResponseEntity<?> okSingle(TargetMetricDTO dto, String notFoundMsg) {
if (dto == null) {
Map<String, Object> error = new HashMap<>();
error.put("success", false);
error.put("message", notFoundMsg);
return ResponseEntity.ok(error);
}
Map<String, Object> result = new HashMap<>();
result.put("success", true);
result.put("data", dto);
return ResponseEntity.ok(result);
}
private ResponseEntity<?> okReset(String message) {
Map<String, Object> result = new HashMap<>();
result.put("success", true);
result.put("message", message);
return ResponseEntity.ok(result);
}
private ResponseEntity<?> okResetSingle(boolean ok, String targetId, String targetLabel) {
Map<String, Object> result = new HashMap<>();
result.put("success", ok);
result.put("message", ok
? "초기화 완료: " + targetId
: targetLabel + "를 찾을 수 없습니다: " + targetId);
return ResponseEntity.ok(result);
}
}
@@ -0,0 +1,157 @@
package com.eactive.eai.manage.inflow;
import java.util.ArrayList;
import java.util.List;
import org.springframework.stereotype.Service;
import com.eactive.eai.common.inflow.AbstractInflowControlManager;
import com.eactive.eai.common.inflow.InflowControlUtil;
import com.eactive.eai.common.inflow.InflowTargetVO;
import com.eactive.eai.common.inflow.dual.DualInflowControlManager;
@Service
public class InflowTargetMetricService {
// -------------------------------------------------------------------------
// 어댑터
// -------------------------------------------------------------------------
public TargetMetricDTO getAdapterMetric(String adapterId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return null;
InflowTargetVO vo = manager.getAdapterInflowThreashold(adapterId);
if (vo == null) return null;
return buildDTO(adapterId, "ADAPTER", vo, manager.getAdapterMetrics(adapterId));
}
public List<TargetMetricDTO> getAllAdapterMetrics() {
DualInflowControlManager manager = getDualManager();
if (manager == null) return new ArrayList<>();
List<TargetMetricDTO> result = new ArrayList<>();
for (String id : manager.getAdapterAllKeys()) {
TargetMetricDTO dto = getAdapterMetric(id);
if (dto != null) result.add(dto);
}
return result;
}
public boolean resetAdapterMetric(String adapterId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return false;
if (manager.getAdapterInflowThreashold(adapterId) == null) return false;
manager.resetAdapterMetrics(adapterId);
return true;
}
public void resetAllAdapterMetrics() {
DualInflowControlManager manager = getDualManager();
if (manager != null) manager.resetAllAdapterMetrics();
}
// -------------------------------------------------------------------------
// 인터페이스
// -------------------------------------------------------------------------
public TargetMetricDTO getInterfaceMetric(String interfaceId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return null;
InflowTargetVO vo = manager.getInterfaceInflowThreashold(interfaceId);
if (vo == null) return null;
return buildDTO(interfaceId, "INTERFACE", vo, manager.getInterfaceMetrics(interfaceId));
}
public List<TargetMetricDTO> getAllInterfaceMetrics() {
DualInflowControlManager manager = getDualManager();
if (manager == null) return new ArrayList<>();
List<TargetMetricDTO> result = new ArrayList<>();
for (String id : manager.getInterfaceAllKeys()) {
TargetMetricDTO dto = getInterfaceMetric(id);
if (dto != null) result.add(dto);
}
return result;
}
public boolean resetInterfaceMetric(String interfaceId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return false;
if (manager.getInterfaceInflowThreashold(interfaceId) == null) return false;
manager.resetInterfaceMetrics(interfaceId);
return true;
}
public void resetAllInterfaceMetrics() {
DualInflowControlManager manager = getDualManager();
if (manager != null) manager.resetAllInterfaceMetrics();
}
// -------------------------------------------------------------------------
// 클라이언트
// -------------------------------------------------------------------------
public TargetMetricDTO getClientMetric(String clientId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return null;
InflowTargetVO vo = manager.getClientInflowThreshold(clientId);
if (vo == null) return null;
return buildDTO(clientId, "CLIENT", vo, manager.getClientMetrics(clientId));
}
public List<TargetMetricDTO> getAllClientMetrics() {
DualInflowControlManager manager = getDualManager();
if (manager == null) return new ArrayList<>();
List<TargetMetricDTO> result = new ArrayList<>();
for (String id : manager.getClientBucketMap().keySet()) {
TargetMetricDTO dto = getClientMetric(id);
if (dto != null) result.add(dto);
}
return result;
}
public boolean resetClientMetric(String clientId) {
DualInflowControlManager manager = getDualManager();
if (manager == null) return false;
if (manager.getClientInflowThreshold(clientId) == null) return false;
manager.resetClientMetrics(clientId);
return true;
}
public void resetAllClientMetrics() {
DualInflowControlManager manager = getDualManager();
if (manager != null) manager.resetAllClientMetrics();
}
// -------------------------------------------------------------------------
// Private helpers
// -------------------------------------------------------------------------
protected DualInflowControlManager getDualManager() {
AbstractInflowControlManager base = InflowControlUtil.getInflowControlManager();
return (base instanceof DualInflowControlManager) ? (DualInflowControlManager) base : null;
}
private TargetMetricDTO buildDTO(String targetId, String targetType,
InflowTargetVO vo,
DualInflowControlManager.TargetMetrics m) {
TargetMetricDTO dto = new TargetMetricDTO();
dto.setTargetId(targetId);
dto.setTargetType(targetType);
dto.setActivate(vo.isActivate());
if (m != null) {
long allowed = m.allowed.get();
long rejPs = m.rejectedPerSecond.get();
long rejTh = m.rejectedThreshold.get();
long total = allowed + rejPs + rejTh;
dto.setAllowed(allowed);
dto.setRejectedPerSecond(rejPs);
dto.setRejectedThreshold(rejTh);
dto.setTotalRequests(total);
dto.setRejectRatio(total > 0
? Math.round((double)(rejPs + rejTh) / total * 10000) / 100.0
: 0.0);
dto.setLastResetTime(m.lastResetTime);
}
return dto;
}
}
@@ -0,0 +1,27 @@
package com.eactive.eai.manage.inflow;
import java.util.List;
/**
* 어댑터/인터페이스/클라이언트 버킷 상태 DTO.
* {@link GroupBucketStatusDTO}와 동일한 BucketInfo 구조를 공유한다.
*/
public class TargetBucketStatusDTO {
private String targetId; // 어댑터명 | 인터페이스ID | 클라이언트ID
private String targetType; // "ADAPTER" | "INTERFACE" | "CLIENT"
private boolean activate;
private List<GroupBucketStatusDTO.BucketInfo> buckets;
public String getTargetId() { return targetId; }
public void setTargetId(String targetId) { this.targetId = targetId; }
public String getTargetType() { return targetType; }
public void setTargetType(String targetType) { this.targetType = targetType; }
public boolean isActivate() { return activate; }
public void setActivate(boolean activate) { this.activate = activate; }
public List<GroupBucketStatusDTO.BucketInfo> getBuckets() { return buckets; }
public void setBuckets(List<GroupBucketStatusDTO.BucketInfo> buckets) { this.buckets = buckets; }
}
@@ -0,0 +1,44 @@
package com.eactive.eai.manage.inflow;
/**
* 어댑터/인터페이스/클라이언트 메트릭 DTO.
*/
public class TargetMetricDTO {
private String targetId;
private String targetType; // "ADAPTER" | "INTERFACE" | "CLIENT"
private boolean activate;
private long allowed;
private long rejectedPerSecond;
private long rejectedThreshold;
private long totalRequests;
private double rejectRatio;
private long lastResetTime;
public String getTargetId() { return targetId; }
public void setTargetId(String targetId) { this.targetId = targetId; }
public String getTargetType() { return targetType; }
public void setTargetType(String targetType) { this.targetType = targetType; }
public boolean isActivate() { return activate; }
public void setActivate(boolean activate) { this.activate = activate; }
public long getAllowed() { return allowed; }
public void setAllowed(long allowed) { this.allowed = allowed; }
public long getRejectedPerSecond() { return rejectedPerSecond; }
public void setRejectedPerSecond(long rejectedPerSecond) { this.rejectedPerSecond = rejectedPerSecond; }
public long getRejectedThreshold() { return rejectedThreshold; }
public void setRejectedThreshold(long rejectedThreshold) { this.rejectedThreshold = rejectedThreshold; }
public long getTotalRequests() { return totalRequests; }
public void setTotalRequests(long totalRequests) { this.totalRequests = totalRequests; }
public double getRejectRatio() { return rejectRatio; }
public void setRejectRatio(double rejectRatio) { this.rejectRatio = rejectRatio; }
public long getLastResetTime() { return lastResetTime; }
public void setLastResetTime(long lastResetTime) { this.lastResetTime = lastResetTime; }
}