Test/#184 loadtest

.github/workflows/deploy-multiarch.yml

@@ -3,8 +3,8 @@ name: Deployment Workflow
 on:
   push:
     branches: [ "develop" ]
-#  pull_request:
-#    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
 
 jobs:
   build-and-push:

src/main/java/KUSITMS/WITHUS/global/infra/email/MailProperties.java

@@ -11,6 +11,8 @@
 @ConfigurationProperties(prefix = "mail")
 public class MailProperties {
     private String provider = "smtp";
+    /** provider=noop 일 때 실제 발송 대신 흉내낼 지연(ms). 부하 테스트용. */
+    private long noopDelayMs = 0L;
     private String fromEmail;
     private String fromName = "WITHUS";
     private String sendgridApiKey;

src/main/java/KUSITMS/WITHUS/global/infra/email/sender/NoopMailSender.java

@@ -0,0 +1,75 @@
+package KUSITMS.WITHUS.global.infra.email.sender;
+
+import KUSITMS.WITHUS.global.infra.email.MailProperties;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.io.InputStreamSource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+import java.util.List;
+
+/**
+ * 실제 발송 없이 발송 지연만 재현하는 구현체.
+ * 부하 테스트에서 SendGrid/Gmail 일일 한도를 소모하지 않기 위해 사용한다.
+ *
+ * <p>{@link SmtpMailSender}, {@link SendGridMailSender} 와 동일하게 커밋 이후에 동작한다.
+ * 트랜잭션 안에서 지연을 주면 DB 커넥션 점유 시간이 함께 늘어나 전혀 다른 것을 측정하게 되므로
+ * afterCommit 구조를 반드시 맞춰야 한다.
+ */
+@Slf4j
+@Component
+@Profile("!test")
+@ConditionalOnProperty(name = "mail.provider", havingValue = "noop")
+@RequiredArgsConstructor
+public class NoopMailSender implements MailSender {
+
+    private final MailProperties mailProperties;
+
+    @Override
+    public void send(String to, String subject, String text) {
+        simulateAfterCommit(to, subject);
+    }
+
+    @Override
+    public void sendWithAttachments(
+            String to,
+            String subject,
+            String html,
+            List<InputStreamSource> attachments
+    ) {
+        simulateAfterCommit(to, subject);
+    }
+
+    private void simulateAfterCommit(String to, String subject) {
+        if (!TransactionSynchronizationManager.isSynchronizationActive()) {
+            simulate(to, subject);
+            return;
+        }
+
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+            @Override
+            public void afterCommit() {
+                simulate(to, subject);
+            }
+        });
+    }
+
+    private void simulate(String to, String subject) {
+        long delayMs = mailProperties.getNoopDelayMs();
+
+        if (delayMs > 0) {
+            try {
+                Thread.sleep(delayMs);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                return;
+            }
+        }
+
+        log.info("Email skipped by noop provider (simulated {}ms): [{}] subject: {}", delayMs, to, subject);
+    }
+}

src/main/java/KUSITMS/WITHUS/global/infra/email/sender/SendGridMailSender.java

@@ -83,10 +83,14 @@ private void sendMail(String to, String subject, String html, List<InputStreamSo
                     .POST(HttpRequest.BodyPublishers.ofString(requestBody))
                     .build();
 
+            long startedAt = System.nanoTime();
             HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+            long elapsedMs = (System.nanoTime() - startedAt) / 1_000_000L;
+
             if (response.statusCode() != ACCEPTED) {
                 log.error(
-                        "SendGrid rejected email: status={} to={} subject={} body={}",
+                        "SendGrid rejected email in {}ms: status={} to={} subject={} body={}",
+                        elapsedMs,
                         response.statusCode(),
                         to,
                         subject,
@@ -96,7 +100,13 @@ private void sendMail(String to, String subject, String html, List<InputStreamSo
             }
 
             String messageId = response.headers().firstValue("X-Message-Id").orElse("unknown");
-            log.info("Email accepted by SendGrid: [{}] subject: {} messageId: {}", to, subject, messageId);
+            log.info(
+                    "Email accepted by SendGrid in {}ms: [{}] subject: {} messageId: {}",
+                    elapsedMs,
+                    to,
+                    subject,
+                    messageId
+            );
         } catch (CustomException e) {
             throw e;
         } catch (IOException e) {

src/main/java/KUSITMS/WITHUS/global/infra/email/sender/SmtpMailSender.java

@@ -41,8 +41,6 @@ public void send(String to, String subject, String text) {
             helper.setText(text, true);
 
             javaMailSender.send(message);
-
-            log.info("Email accepted by SMTP: [{}] subject: {}", to, subject);
         });
     }
 
@@ -69,7 +67,6 @@ public void sendWithAttachments(
             }
 
             javaMailSender.send(msg);
-            log.info("Email accepted by SMTP: [{}] subject: {}", to, subject);
         });
     }
 
@@ -93,10 +90,19 @@ public void afterCommit() {
 
     private void sendWithRetry(String to, String subject, MailSendOperation operation) {
         Exception lastException = null;
+        long startedAt = System.nanoTime();
 
         for (int attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
             try {
                 operation.send();
+                log.info(
+                        "Email accepted by SMTP in {}ms (attempt {}/{}): [{}] subject: {}",
+                        elapsedMs(startedAt),
+                        attempt,
+                        MAX_ATTEMPTS,
+                        to,
+                        subject
+                );
                 return;
             } catch (MessagingException | MailException e) {
                 lastException = e;
@@ -115,10 +121,20 @@ private void sendWithRetry(String to, String subject, MailSendOperation operatio
             }
         }
 
-        log.error("Email send failed after retries: [{}] subject: {}", to, subject, lastException);
+        log.error(
+                "Email send failed after retries in {}ms: [{}] subject: {}",
+                elapsedMs(startedAt),
+                to,
+                subject,
+                lastException
+        );
         throw new CustomException(ErrorCode.EMAIL_SEND_FAIL);
     }
 
+    private long elapsedMs(long startedAt) {
+        return (System.nanoTime() - startedAt) / 1_000_000L;
+    }
+
     private void sleepBeforeRetry() {
         try {
             Thread.sleep(RETRY_BACKOFF_MS);