Merge pull request #71 from prgrms-web-devcourse-final-project/fix/cluster-marker-lock-retry

geohash 단위 분산 락 키 적용되도록 수정

Author: dnzp75

src/main/java/com/example/log4u/domain/map/cache/dao/ClusterCacheDao.java

@@ -24,7 +24,7 @@
 public class ClusterCacheDao {
 
 	private static final String CLUSTER_CACHE_KEY = "cluster:geohash:%s:level:%d";
-	public static final String CLUSTER_LOCK_KEY = "cluster-lock";
+	public static final String CLUSTER_LOCK_KEY = "cluster-lock:%s";
 
 	private final CacheManager cacheManager;
 
@@ -48,7 +48,7 @@ private List<DiaryClusterResponseDto> convertToClusters(String value) {
 	}
 
 	public List<DiaryClusterResponseDto> loadAndCache(String geohash, int level) {
-		return distributedLockExecutor.runWithLock(CLUSTER_LOCK_KEY, () -> {
+		return distributedLockExecutor.runWithLock(CLUSTER_LOCK_KEY.formatted(geohash), () -> {
 			List<DiaryClusterResponseDto> clusters = loadClustersFromDb(geohash, level);
 			cache(clusters, geohash, level);
 			return clusters;

src/main/java/com/example/log4u/domain/map/cache/dao/MarkerCacheDao.java

@@ -25,7 +25,7 @@
 public class MarkerCacheDao {
 
 	private static final String MARKER_CACHE_KEY = "marker:geohash:%s";
-	public static final String MARKER_LOCK_KEY = "marker-lock";
+	private static final String MARKER_LOCK_KEY = "marker-lock:%s";
 
 	private final CacheManager cacheManager;
 
@@ -49,11 +49,11 @@ private List<DiaryMarkerResponseDto> convertToMarkers(String value) {
 	}
 
 	public List<DiaryMarkerResponseDto> loadAndCache(String geohash) {
-		return distributedLockExecutor.runWithLock(MARKER_LOCK_KEY, () -> {
-			List<DiaryMarkerResponseDto> markers = loadMarkersFromDb(geohash);
-			cache(markers, geohash);
-			return markers;
-		});
+		return distributedLockExecutor.runWithLock(MARKER_LOCK_KEY.formatted(geohash), () -> {
+				List<DiaryMarkerResponseDto> markers = loadMarkersFromDb(geohash);
+				cache(markers, geohash);
+				return markers;
+			});
 	}
 
 	private List<DiaryMarkerResponseDto> loadMarkersFromDb(String geohash) {

src/main/resources/application-dev.yml

@@ -2,13 +2,15 @@ management:
   endpoints:
     web:
       exposure:
-        include: health, metrics
+        include: health, metrics, prometheus
   endpoint:
     metrics:
       enabled: true
+    prometheus:
+      enabled: true
   metrics:
     tags:
-      application: log4u          
+      application: log4u
 
 spring:
   datasource: