Merge pull request #178 from CleanEngine/dev

Dev

Author: caniro

build.gradle

@@ -58,6 +58,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	implementation 'io.micrometer:micrometer-registry-prometheus'
 	implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.16.0")
+	implementation 'org.hibernate.orm:hibernate-micrometer'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 	implementation 'com.google.code.gson:gson:2.13.1'

docker/mariadb/init.sql

@@ -110,3 +110,5 @@ INSERT INTO `if`.asset (ticker, name) VALUES ('TRUMP', '오피셜트럼프');
 
 INSERT INTO `if`.wallet (wallet_id, account_id, buy_price, roi, size, ticker) VALUES (1, 1, 0, 0, 500000000, 'BTC');
 INSERT INTO `if`.wallet (wallet_id, account_id, buy_price, roi, size, ticker) VALUES (2, 1, 0, 0, 500000000, 'TRUMP');
+INSERT INTO `if`.wallet (wallet_id, account_id, buy_price, roi, size, ticker) VALUES (3, 2, 0, 0, 500000000, 'BTC');
+INSERT INTO `if`.wallet (wallet_id, account_id, buy_price, roi, size, ticker) VALUES (4, 2, 0, 0, 500000000, 'TRUMP');

monitoring/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - ./opentelemetry-javaagent.jar:/app/opentelemetry-javaagent.jar
     working_dir: /app
-    command: [ "java", "-jar", "coin-0.0.1-SNAPSHOT.jar", "--spring.profiles.active=dev,mariadb-local,actuator,apm" ]
+    command: [ "java", "-jar", "coin-0.0.1-SNAPSHOT.jar", "--spring.profiles.active=dev,it,mariadb-local,actuator,apm" ]
     ports:
       - "8080:8080"
     env_file:
@@ -18,14 +18,16 @@ services:
       - TZ=Asia/Seoul
       - OTEL_SERVICE_NAME=my-spring-app
       - OTEL_TRACES_EXPORTER=otlp
-      - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4318
       - OTEL_LOGS_EXPORTER=none
       - OTEL_METRICS_EXPORTER=none
       - OTEL_INSTRUMENTATION_METHODS_ENABLED=true
-      - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005, -javaagent:/app/opentelemetry-javaagent.jar
+      - JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
     depends_on:
       mariadb:
         condition: service_healthy
+      otel-collector:
+        condition: service_started
     networks:
       - app-network
       - monitoring-net
@@ -60,12 +62,31 @@ services:
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
       - '--storage.tsdb.retention.time=30d'
+      - '--web.enable-remote-write-receiver'
     ports:
       - "9090:9090"
     networks:
       - monitoring-net
     restart: unless-stopped
 
+  influxdb:
+    image: influxdb:2.7
+    container_name: influxdb
+    ports:
+      - "8086:8086"
+    volumes:
+      - influxdb_data:/var/lib/influxdb2
+    environment:
+      - DOCKER_INFLUXDB_INIT_MODE=setup
+      - DOCKER_INFLUXDB_INIT_USERNAME=k6-user        # 임의의 사용자/비밀번호
+      - DOCKER_INFLUXDB_INIT_PASSWORD=k6-password
+      - DOCKER_INFLUXDB_INIT_ORG=k6-org
+      - DOCKER_INFLUXDB_INIT_BUCKET=k6-bucket
+      - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=vJvTx5b8vjgH7mu-M-BsEvdy5_COovexAjyniVhMF1yPzvsp2g8kp62opqXVMq6ICAq2tLJxxD6ifXPBZ9YVmA==
+    networks:
+      - monitoring-net
+    restart: unless-stopped
+
   grafana:
     image: grafana/grafana:11.0.0
     container_name: grafana
@@ -80,22 +101,53 @@ services:
     depends_on:
       - prometheus
       - jaeger
+      - influxdb
 
   jaeger:
     image: jaegertracing/all-in-one:latest
     container_name: jaeger
+    user: "${UID}:${GID}"
+    environment:
+      - SPAN_STORAGE_TYPE=badger
+      - BADGER_EPHEMERAL=false
+      - BADGER_DIRECTORY_VALUE=/tmp/jaeger/data
+      - BADGER_DIRECTORY_KEY=/tmp/jaeger/keys
+      - COLLECTOR_OTLP_ENABLED=true
+      - COLLECTOR_OTLP_GRPC_HOST_PORT=0.0.0.0:4317
+      - COLLECTOR_OTLP_HTTP_HOST_PORT=0.0.0.0:4318
+    volumes:
+      - jaeger_data:/tmp/jaeger
     ports:
-      - "16686:16686"
+      - "16686:16686" # UI
+      - "4319:4317"
+      - "4320:4318"
+    networks:
+      - monitoring-net
+
+
+  otel-collector:
+    image: otel/opentelemetry-collector-contrib:latest
+    command: ["--config=/etc/otel-collector-config.yml"]
+    volumes:
+      - ./otel/otel-collector-config.yml:/etc/otel-collector-config.yml
+    ports:
+      - "8889:8889"
       - "4317:4317"
       - "4318:4318"
+      - "13133:13133"
     networks:
       - monitoring-net
+    depends_on:
+      jaeger:
+        condition: service_started
 
 volumes:
   prometheus_data: {}
   grafana_data: {}
   mariadb_data:
     driver: local
+  influxdb_data: {}
+  jaeger_data: {}
 
 networks:
   app-network:
@@ -104,3 +156,8 @@ networks:
   monitoring-net:
     name: monitoring-net
     driver: bridge
+
+
+    #  export K6_INFLUXDB_ORGANIZATION=k6-org
+    #  - export K6_INFLUXDB_BUCKET=k6-bucket
+    #  ./k6 run --out xk6-influxdb=http://localhost:8086 /Users/jangbongjun/coin/src/test/resources/k6/chart-stomp-test.js

…a/provisioning/datsources/datasource.yml …/provisioning/datasources/datasource.ymlmonitoring/grafana/provisioning/datsources/datasource.yml renamed to monitoring/grafana/provisioning/datasources/datasource.yml monitoring/grafana/provisioning/datsources/datasource.yml renamed to monitoring/grafana/provisioning/datasources/datasource.yml

@@ -0,0 +1,47 @@
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: 0.0.0.0:4317
+      http:
+        endpoint: 0.0.0.0:4318
+
+processors:
+  batch:
+    timeout: 500ms
+    send_batch_size: 8192
+    send_batch_max_size: 16384
+  probabilistic_sampler:
+    sampling_percentage: 1
+
+connectors:
+  spanmetrics:
+    histogram:
+      explicit:
+        buckets: [100us, 1ms, 2ms, 6ms, 10ms, 100ms, 250ms, 500ms, 1s]
+
+exporters:
+  otlp/jaeger:
+    endpoint: jaeger:4317
+    tls:
+      insecure: true
+
+  prometheus:
+    endpoint: "0.0.0.0:8889"
+
+service:
+  pipelines:
+    traces/metrics:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [spanmetrics]
+
+    traces/jaeger:
+      receivers: [otlp]
+      processors: [probabilistic_sampler,batch]
+      exporters: [otlp/jaeger]
+
+    metrics:
+      receivers: [spanmetrics]
+      processors: [batch]
+      exporters: [prometheus]

monitoring/otel/otel-collector-config.yml

@@ -8,4 +8,8 @@ scrape_configs:
   - job_name: 'my-app'
     static_configs:
       - targets: [ 'app:8080' ]
-    metrics_path: /actuator/prometheus
+    metrics_path: /actuator/prometheus
+  - job_name: 'otel-collector'
+    scrape_interval: 15s
+    static_configs:
+      - targets: [ 'otel-collector:8889' ]

monitoring/prometheus/prometheus.yml

@@ -37,51 +37,35 @@ public void publishRealTimeOhlc() {
         try {
             log.debug("△ 실시간 OHLC 데이터 스케줄러 실행");
 
-            // 구독된 티커가 없으면 조기 종료
             if (subscriptionService.getAllRealTimeOhlcSubscribedTickers().isEmpty()) {
                 log.debug("실시간 OHLC 구독된 티커 없음, 전송 생략");
                 return;
             }
+            final LocalDateTime now = LocalDateTime.now();
 
-            // 모든 구독된 티커에 대해 데이터 전송
             for (String ticker : subscriptionService.getAllRealTimeOhlcSubscribedTickers()) {
                 try {
                     log.debug("티커 {} 실시간 OHLC 데이터 전송 중...", ticker);
 
-                    // 티커별 최신 OHLC 데이터 조회 및 전송
-                    RealTimeOhlcDto ohlcData = realTimeOhlcService.getRealTimeOhlc(ticker);
+                    RealTimeOhlcDto ohlcData = realTimeOhlcService.getAndUpdateCumulative1mOhlc(ticker, now);
 
                     if (ohlcData == null) {
-                        // 이전에 전송한 데이터가 있는지 확인
                         RealTimeOhlcDto lastSentData = lastSentOhlcDataMap.get(ticker);
-
                         if (lastSentData != null) {
-                            // 이전 데이터가 있으면 타임스탬프만 업데이트하여 재사용
                             log.debug("티커 {}의 실시간 OHLC 데이터가 없습니다. 이전 데이터 재사용", ticker);
-                            RealTimeOhlcDto updatedData = new RealTimeOhlcDto(lastSentData.getTicker(), LocalDateTime.now(),  // 현재 시간으로 업데이트
+                            RealTimeOhlcDto updatedData = new RealTimeOhlcDto(lastSentData.getTicker(), now,
                                     lastSentData.getOpen(), lastSentData.getHigh(), lastSentData.getLow(), lastSentData.getClose(), lastSentData.getVolume());
-
                             messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, updatedData);
-                            lastSentOhlcDataMap.put(ticker, updatedData);  // 캐시 업데이트
+                            lastSentOhlcDataMap.put(ticker, updatedData);
                         } else {
-                            // 이전 데이터도 없는 경우 빈 데이터 전송 (첫 구독 시)
                             log.debug("티커 {}의 이전 OHLC 데이터도 없습니다. 빈 데이터 전송", ticker);
-                            RealTimeOhlcDto emptyData = new RealTimeOhlcDto();
-                            emptyData.setTicker(ticker);
-                            emptyData.setTimestamp(LocalDateTime.now());
-                            emptyData.setOpen(0.0);
-                            emptyData.setHigh(0.0);
-                            emptyData.setLow(0.0);
-                            emptyData.setClose(0.0);
-                            emptyData.setVolume(0.0);
-
+                            RealTimeOhlcDto emptyData = new RealTimeOhlcDto(ticker, now, 0.0, 0.0, 0.0, 0.0, 0.0);
                             messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, emptyData);
-                            lastSentOhlcDataMap.put(ticker, emptyData);  // 캐시 업데이트
+                            lastSentOhlcDataMap.put(ticker, emptyData);
                         }
                     } else {
-                        // 조회된 실시간 OHLC 데이터 전송
                         messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, ohlcData);
-                        lastSentOhlcDataMap.put(ticker, ohlcData);  // 캐시 업데이트
+                        lastSentOhlcDataMap.put(ticker, ohlcData);
                         log.debug("실시간 OHLC 데이터 전송: {}", ohlcData);
                     }
                 } catch (Exception e) {
@@ -91,8 +75,5 @@ public void publishRealTimeOhlc() {
         } catch (Exception e) {
             log.error("△ 실시간 OHLC 데이터 발행 중 오류: {}", e.getMessage(), e);
         }
-
     }
-
-
 }

src/main/java/com/cleanengine/coin/chart/controller/ChartDataController.java

@@ -1,29 +1,38 @@
 package com.cleanengine.coin.chart.controller;
 
 import com.cleanengine.coin.chart.dto.RealTimeOhlcDto;
-import com.cleanengine.coin.chart.service.minute.MinuteOhlcDataService;
+import com.cleanengine.coin.chart.service.minute.PagingMinuteOhlcDataService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @RestController
 @RequestMapping("/api/minute-ohlc")
 @RequiredArgsConstructor
 public class MinuteOhlcDataController {
 
-    private final MinuteOhlcDataService service;
+    private final PagingMinuteOhlcDataService service;
 
     /**
-     * GET /api/minute-ohlc?ticker=BTC
-     * DB에 있는 과거 거래를 1분 단위로 묶어 OHLC+volume을 계산한 리스트 반환
+     * GET /api/minute-ohlc?ticker=BTC&count=100&interval=1&from=2025-06-19T10:30
+     * DB에 있는 과거 거래를 interval 단위로 묶어 OHLC+volume을 계산한 리스트 반환
      */
     @GetMapping
     public ResponseEntity<List<RealTimeOhlcDto>> getMinuteOhlc(
-            @RequestParam("ticker") String ticker
+            @RequestParam("ticker") String ticker,
+            @RequestParam(value = "count", defaultValue = "100") int count,
+            @RequestParam(value = "interval", defaultValue = "1") int interval,
+            @RequestParam(value = "from", required = false) LocalDateTime from
     ) {
-        List<RealTimeOhlcDto> data = service.getMinuteOhlcData(ticker);
+        if (from == null) {
+            from = LocalDateTime.now();
+        }
+
+        List<RealTimeOhlcDto> data = service.getMinuteOhlcData(ticker, count, interval, from.minusMinutes(1));
         return ResponseEntity.ok(data);
     }
+
 }

src/main/java/com/cleanengine/coin/chart/controller/MinuteOhlcDataController.java

@@ -2,7 +2,7 @@
 
 import com.cleanengine.coin.chart.dto.RealTimeOhlcDto;
 import com.cleanengine.coin.chart.service.ChartSubscriptionService;
-import com.cleanengine.coin.chart.service.RealTimeOhlcService;
+import com.cleanengine.coin.chart.service.RealTimeOhlcService; // RealTimeOhlcService 의존성은 이제 불필요
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -19,9 +19,8 @@
 public class WebSocketMessageController {
 
     private final ChartSubscriptionService subscriptionService;
-    private final RealTimeOhlcService realTimeOhlcService;
     private final SimpMessagingTemplate messagingTemplate;
-    private final ChartDataController chartDataController;
+    private final ChartDataController chartDataController; // 이미 계산된 데이터를 가진 컨트롤러를 활용
 
     /**
      * 실시간 OHLC 데이터 구독 처리
@@ -34,30 +33,16 @@ public void subscribeRealTimeOhlc(RealTimeTradeMappingDto request) {
         // 구독 목록에 추가
         subscriptionService.subscribeRealTimeOhlc(ticker);
 
-        // 구독 즉시 최근 실시간 OHLC 데이터 전송
-        RealTimeOhlcDto latestOhlcData = realTimeOhlcService.getRealTimeOhlc(ticker);
-
         RealTimeOhlcDto lastSentData = chartDataController.getLastSentOhlcDataMap().get(ticker);
 
-        if (latestOhlcData == null) {
-            if (lastSentData != null) {
-                // 이전에 전송한 데이터가 있으면 재사용
-                log.debug("티커 {}의 실시간 OHLC 데이터가 없습니다. 이전 데이터 재사용", ticker);
-                messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, lastSentData);
-            } else {
-                // 이전 데이터도 없는 경우 빈 데이터 전송
-                log.debug("티커 {}의 실시간 OHLC 데이터가 없습니다. 빈 데이터 전송", ticker);
-                RealTimeOhlcDto emptyData = createEmptyRealTimeOhlcDto(ticker);
-                messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, emptyData);
-                // 빈 데이터도 캐시에 저장
-                chartDataController.getLastSentOhlcDataMap().put(ticker, emptyData);
-            }
+        if (lastSentData == null) {
+            log.debug("티커 {}의 캐시된 OHLC 데이터가 없습니다. 빈 데이터 전송", ticker);
+            RealTimeOhlcDto emptyData = createEmptyRealTimeOhlcDto(ticker);
+            messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, emptyData);
         } else {
-            log.debug("티커 {}의 실시간 OHLC 데이터 전송: {}", ticker, latestOhlcData);
-            messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, latestOhlcData);
-            // 데이터 캐시에 저장
-            chartDataController.getLastSentOhlcDataMap().put(ticker, latestOhlcData);
-
+            // 캐시된 데이터가 있으면 즉시 전송
+            log.debug("티커 {}의 캐시된 OHLC 데이터 즉시 전송: {}", ticker, lastSentData);
+            messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, lastSentData);
         }
     }
 
@@ -80,6 +65,5 @@ private RealTimeOhlcDto createEmptyRealTimeOhlcDto(String ticker) {
     @Getter
     public static class RealTimeTradeMappingDto {
         private String ticker;
-
     }
 }