Feat#15 prometheus,k6

backend/build.gradle

@@ -58,6 +58,9 @@ dependencies {
 
     implementation 'org.redisson:redisson-spring-boot-starter:3.27.0'
 
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
+
 }
 
 tasks.named('test') {

backend/docker-compose.yml

@@ -0,0 +1,30 @@
+version: '3.8'
+services:
+  promethus:
+    image: prom/prometheus:latest
+    container_name: prometheus
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+    ports:
+      - "9090:9090"
+    networks:
+      - monitoring-network
+  grafana:
+    image: grafana/grafana:latest
+    container_name: grafana
+    ports:
+      - "3001:3000"
+    networks:
+      - monitoring-network
+  k6:
+    image: grafana/k6
+    volumes:
+      - ./scripts:/scripts
+    entrypoint: ""
+    command: ["k6", "run", "/scripts/myscript.js"]
+
+networks:
+    monitoring-network:
+        driver: bridge

backend/prometheus.yml

@@ -0,0 +1,8 @@
+global:
+  scrape_interval: 15s
+
+scrape_configs:
+  - job_name: prometheus
+    metrics_path: '/actuator/prometheus'
+    static_configs:
+      - targets: ['host.docker.internal:8080']

backend/scripts/myscript.js

@@ -0,0 +1,39 @@
+import  http from 'k6/http';
+import { check } from 'k6';
+
+function getRandomPageId(min, max) {
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+export let options = {
+    scenarios: {
+        constant_request_rate: {
+            executor: 'ramping-arrival-rate',
+            startRate: 167, // 초당 약 167개의 요청으로 시작
+            timeUnit: '1s',
+            preAllocatedVus: 50, // 사전 할당된 VU 수
+            maxVUs: 100, // 최대 VU 수
+            stages: [
+                { duration: '1m', target: 167},
+            ]
+        }
+    }
+}
+
+export default function () {
+    const pageId = getRandomPageId(0,1);
+    const payload = JSON.stringify({
+        userId: pageId
+    });
+    const params = {
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    };
+
+    let response = http.get('http://host.docker.internal:8080/api/posts/' + pageId, payload, params);
+
+    check(response, {
+        'status is 200': (r) => r.status === 200,
+    })
+}

backend/src/main/java/org/juniortown/backend/config/SecurityConfig.java

@@ -18,6 +18,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.util.matcher.RegexRequestMatcher;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 
@@ -76,7 +77,9 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
 		//경로별 인가 작업
 		http
 			.authorizeHttpRequests((auth) -> auth
-				.requestMatchers("/api/auth/login", "/", "/api/auth/signup","/swagger-ui/**","/v3/api-docs/**","/api/posts/details/**").permitAll()
+				.requestMatchers("/api/auth/login", "/", "/api/auth/signup","/swagger-ui/**","/v3/api-docs/**",
+					"/api/posts/details/**", "/actuator/**").permitAll()
+				.requestMatchers(RegexRequestMatcher.regexMatcher("/api/posts/\\d+")).permitAll()
 				.requestMatchers("/admin").hasRole("ADMIN")
 				.anyRequest().authenticated());
 

backend/src/main/java/org/juniortown/backend/interceptor/GuestCookieInterceptor.java

@@ -30,6 +30,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 			cookie.setPath("/");
 			cookie.setMaxAge(60 * 60 * 24 * 15); // 15 days
 			cookie.setHttpOnly(true);
+			request.setAttribute(COOKIE_NAME, guestId);
 			response.addCookie(cookie);
 		}
 		return true;

backend/src/main/java/org/juniortown/backend/post/controller/PostController.java

@@ -61,10 +61,10 @@ public ResponseEntity<PostResponse> update(@AuthenticationPrincipal CustomUserDe
 
 	// 게시글 목록 조회, 페이지네이션 적용
 	@GetMapping("/posts/{page}")
-	public ResponseEntity<PageResponse<PostResponse>> getPosts(@AuthenticationPrincipal CustomUserDetails customUserDetails, @PathVariable int page) {
-		Long userId = customUserDetails.getUserId();
-		// null체크
-
+	public ResponseEntity<PageResponse<PostResponse>> getPosts(@AuthenticationPrincipal CustomUserDetails customUserDetails,
+		@PathVariable int page
+	) {
+		Long userId = (customUserDetails != null) ? customUserDetails.getUserId() : null;
 	 	Page<PostResponse> posts = postService.getPosts(userId, page);
 		PageResponse<PostResponse> response = new PageResponse<>(posts);
 		return ResponseEntity.ok(response);

backend/src/main/java/org/juniortown/backend/post/repository/PostRepository.java

@@ -9,6 +9,8 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import jakarta.persistence.Index;
+
 @Repository
 public interface PostRepository extends JpaRepository<Post, Long>, PostRepositoryCustom {
 	Page<Post> findAllByDeletedAtIsNull(Pageable pageable);
@@ -25,5 +27,16 @@ public interface PostRepository extends JpaRepository<Post, Long>, PostRepositor
 			"WHERE p.deletedAt IS NULL " +
 			"GROUP BY p.id, p.title, p.readCount, u.name, u.id, p.createdAt, p.updatedAt, p.deletedAt"
 	)
-	Page<PostWithLikeCountProjection> findAllWithLikeCount(@Param("userId") Long userId, Pageable pageable);
+	Page<PostWithLikeCountProjection> findAllWithLikeCountForUser(@Param("userId") Long userId, Pageable pageable);
+
+	@Query(
+		"SELECT p.id AS id, p.title AS title, p.readCount AS readCount, u.name AS username, u.id AS userId, COUNT(l.id) AS likeCount, " +
+			"p.createdAt AS createdAt, p.updatedAt AS updatedAt " +
+			"FROM Post p " +
+			"JOIN p.user u " +
+			"LEFT JOIN Like l ON l.post.id = p.id " +
+			"WHERE p.deletedAt IS NULL " +
+			"GROUP BY p.id, p.title, p.readCount, u.name, u.id, p.createdAt, p.updatedAt, p.deletedAt"
+	)
+	Page<PostWithLikeCountProjection> findAllWithLikeCountForNonUser(Pageable pageable);
 }

backend/src/main/java/org/juniortown/backend/post/service/PostService.java

@@ -1,7 +1,9 @@
 package org.juniortown.backend.post.service;
 
 import java.time.Clock;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -24,6 +26,7 @@
 import org.juniortown.backend.user.entity.User;
 import org.juniortown.backend.user.exception.UserNotFoundException;
 import org.juniortown.backend.user.repository.UserRepository;
+import org.springframework.dao.DataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
@@ -90,40 +93,54 @@ public PostResponse update(Long postId, Long userId, PostCreateRequest postCreat
 	}
 	@Transactional(readOnly = true)
 	public Page<PostResponse> getPosts(Long userId, int page) {
-		Pageable pageable = PageRequest.of(page, PAGE_SIZE, Sort.by("createdAt").descending());
-		Page<PostWithLikeCountProjection> postPage = postRepository.findAllWithLikeCount(userId, pageable);
-
-		List<Long> redisReadCounts = getReadCountFromRedisCache(postPage);
-
-		List<PostResponse> content = IntStream.range(0, postPage.getContent().size())
-			.mapToObj(i -> {
-				PostWithLikeCountProjection post = postPage.getContent().get(i);
-				Long redisReadCount = (redisReadCounts.size() > i && redisReadCounts.get(i) != null)
-					? redisReadCounts.get(i)
-					: 0L;
-				return PostResponse.builder()
-					.id(post.getId())
-					.title(post.getTitle())
-					.userId(post.getUserId())
-					.userName(post.getUsername())
-					.likeCount(post.getLikeCount())
-					.isLiked(post.getIsLiked())
-					.createdAt(post.getCreatedAt())
-					.updatedAt(post.getUpdatedAt())
-					.readCount(post.getReadCount() + redisReadCount)
-					.build();
-			})
+		Pageable pageable = PageRequest.of(page, PAGE_SIZE, Sort.by(Sort.Order.desc("createdAt"), Sort.Order.desc("id")));
+
+		Page<PostWithLikeCountProjection> postPage = (userId == null)
+			? postRepository.findAllWithLikeCountForNonUser(pageable)
+			: postRepository.findAllWithLikeCountForUser(userId, pageable);
+
+		Map<Long,Long> redisReadCounts = getReadCountFromRedisCache(postPage);
+
+		List<PostResponse> content = postPage.getContent().stream()
+			.map(post -> PostResponse.builder()
+			   .id(post.getId())
+			   .title(post.getTitle())
+			   .userId(post.getUserId())
+			   .userName(post.getUsername())
+			   .likeCount(post.getLikeCount())
+			   .isLiked(Boolean.TRUE.equals(post.getIsLiked()))
+			   .createdAt(post.getCreatedAt())
+			   .updatedAt(post.getUpdatedAt())
+			   .readCount(post.getReadCount() + redisReadCounts.getOrDefault(post.getId(), 0L))
+			   .build())
 			.collect(Collectors.toList());
 
+
 		return new PageImpl<>(content, pageable, postPage.getTotalElements());
 	}
 
-	private List<Long> getReadCountFromRedisCache(Page<PostWithLikeCountProjection> postPage) {
-		List<String> keys = postPage.getContent().stream()
-			.map(post -> ViewCountService.VIEW_COUNT_KEY + post.getId())
-			.collect(Collectors.toList());
-		List<Long> redisReadCounts = redisTemplate.opsForValue().multiGet(keys);
-		return redisReadCounts;
+	private Map<Long,Long> getReadCountFromRedisCache(Page<PostWithLikeCountProjection> postPage) {
+		List<Long> ids = postPage.getContent().stream()
+			.map(PostWithLikeCountProjection::getId)
+			.toList();
+		if(ids.isEmpty()) return Map.of();
+
+		List<String> keys = ids.stream()
+			.map(id -> ViewCountService.VIEW_COUNT_KEY + id)
+			.toList();
+		try {
+			List<Long> readCounts = redisTemplate.opsForValue().multiGet(keys);
+
+			HashMap<Long, Long> map = new HashMap<>();
+			for (int i = 0; i < ids.size(); i++) {
+				Long readCount = (readCounts != null && i < readCounts.size()) ? readCounts.get(i) : null;
+				map.put(ids.get(i), (readCount != null) ? readCount : 0L);
+			}
+			return map;
+		} catch (DataAccessException e) {
+			log.error("Redis 장애: {}", e.getMessage());
+			return ids.stream().collect(Collectors.toMap(id -> id, id -> 0L));
+		}
 	}
 
 	@Transactional(readOnly = true)

backend/src/main/java/org/juniortown/backend/user/dto/CustomUserDetails.java

@@ -33,9 +33,11 @@ public String getPassword() {
 
 	@Override
 	public String getUsername() {
-		return user.getEmail();
+		return user.getName();
 	}
 
+	public String getUserEmail() {return user.getEmail();}
+
 	public Long getUserId() {
 		return user.getId();
 	}

backend/src/main/java/org/juniortown/backend/user/jwt/JWTUtil.java

@@ -21,6 +21,10 @@ public JWTUtil(@Value("${spring.jwt.secret}")String secret) {
 	}
 
 	public String getUsername(String token) {
+		return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().get("username", String.class);
+	}
+
+	public String getUserEmail(String token) {
 		return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().get("email", String.class);
 	}
 
@@ -35,11 +39,12 @@ public Boolean isExpired(String token) {
 		return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().getExpiration().before(new Date());
 	}
 
-	public String createJwt(Long id, String email, String role, Long expiredMs) {
+	public String createJwt(Long id, String email, String username, String role, Long expiredMs) {
 
 		return Jwts.builder()
 			.claim("userId", id)
 			.claim("email", email)
+			.claim("username", username)
 			.claim("role", role)
 			.issuedAt(new Date(System.currentTimeMillis()))
 			.expiration(new Date(System.currentTimeMillis() + expiredMs))

backend/src/main/java/org/juniortown/backend/user/jwt/LoginFilter.java

@@ -7,7 +7,6 @@
 import org.juniortown.backend.user.dto.CustomUserDetails;
 import org.juniortown.backend.user.dto.LoginDTO;
 import org.juniortown.backend.user.response.LoginResultDTO;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationServiceException;
@@ -48,6 +47,7 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
 	@Override
 	protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain, Authentication authentication) {
 		CustomUserDetails customUserDetails = (CustomUserDetails)authentication.getPrincipal();
+		String userEmail = customUserDetails.getUserEmail();
 		String username = customUserDetails.getUsername();
 		Long userId = customUserDetails.getUserId();
 
@@ -57,7 +57,7 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
 
 		String role = auth.getAuthority();
 
-		String token = jwtUtil.createJwt(userId, username, role, 1000 * 60 * 60 * 24L ); // 24시간 유효한 토큰 생성
+		String token = jwtUtil.createJwt(userId, userEmail, username, role, 1000 * 60 * 60 * 24L ); // 24시간 유효한 토큰 생성
 
 		response.addHeader("Authorization", "Bearer " + token);
 

backend/src/main/resources/application.yml

@@ -29,6 +29,16 @@ spring:
   jwt:
     secret: ${JWT_SECRET_KEY}
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+          "*"
+  endpoint:
+    health:
+      show-details: always
+
 
 
 

backend/src/test/java/org/juniortown/backend/comment/service/CommentServiceTest.java

@@ -280,16 +280,14 @@ void create_child_comment_fail_by_parent_post_not_exist() {
 			.build();
 
 
-
-
 		when(userRepository.findById(USER_ID)).thenReturn(Optional.of(user));
 		when(postRepository.findById(POST_ID)).thenReturn(Optional.of(post));
 		when(commentRepository.findById(parentId)).thenReturn(Optional.empty());
 
 		// when, then
 		Assertions.assertThatThrownBy(() -> commentService.createComment(USER_ID, commentCreateRequest))
-			.isInstanceOf(CircularReferenceException.class)
-			.hasMessage(CircularReferenceException.MESSAGE);
+			.isInstanceOf(CommentNotFoundException.class)
+			.hasMessage(CommentNotFoundException.MESSAGE);
 		verify(commentRepository, never()).save(any(Comment.class));
 	}
 	@Test