Merge pull request #8 from Delphington/feat-docker-hub

Feat docker hub

Author: Delphington

bot/bot.Dockerfile

@@ -0,0 +1,5 @@
+FROM eclipse-temurin:23-jdk-alpine
+WORKDIR /app
+COPY target/bot-1.0.jar /app/bot-1.0.jar
+EXPOSE 8080
+CMD ["java", "-jar", "bot-1.0.jar"]

bot/src/main/java/backend/academy/bot/api/controller/UpdateController.java

@@ -2,6 +2,7 @@
 
 import backend.academy.bot.api.dto.request.LinkUpdate;
 import backend.academy.bot.notification.NotificationService;
+import io.micrometer.core.annotation.Timed;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
@@ -31,6 +32,8 @@ public void update(@RequestBody @Valid LinkUpdate linkUpdate) {
     }
 
     @PostMapping("/public")
+    @ResponseStatus(HttpStatus.OK)
+    @Timed(value = "update.timer", histogram = true) // Явное включение гистограммы
     public void update() {
         log.info("Пришло обновление по ссылке");
     }

bot/src/main/java/backend/academy/bot/command/Command.java

@@ -2,13 +2,15 @@
 
 import com.pengrad.telegrambot.model.Update;
 import com.pengrad.telegrambot.request.SendMessage;
+import io.micrometer.core.annotation.Timed;
 
 public interface Command {
 
     String command();
 
     String description();
 
+    @Timed("helpCommandMetric")
     SendMessage handle(Update update);
 
     default boolean matchesCommand(Update update) {

bot/src/main/java/backend/academy/bot/config/MetricsConfig.java

@@ -0,0 +1,19 @@
+package backend.academy.bot.config;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.binder.MeterBinder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MetricsConfig {
+
+    @Bean
+    public MeterBinder meterBinder() {
+        return registry -> {
+            Counter.builder("msg_count")
+                    .description("Количество сообщений от пользователей")
+                    .register(registry);
+        };
+    }
+}

bot/src/main/java/backend/academy/bot/processor/UserMessageProcessor.java

@@ -10,6 +10,7 @@
 import com.pengrad.telegrambot.request.SendMessage;
 import com.pengrad.telegrambot.request.SetMyCommands;
 import com.pengrad.telegrambot.response.BaseResponse;
+import io.micrometer.core.instrument.MeterRegistry;
 import java.util.List;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -25,6 +26,7 @@ public class UserMessageProcessor {
     private final TelegramBot telegramBot;
     private final List<Command> commandList;
     private final UserStateManager userStateManager;
+    private final MeterRegistry meterRegistry;
 
     public void registerCommands() {
         List<BotCommand> commands = commandList.stream()
@@ -42,6 +44,7 @@ public void registerCommands() {
     }
 
     public SendMessage process(Update update) {
+        meterRegistry.counter("msg_count").increment();
         Long id = update.message().chat().id();
         userStateManager.createUserIfNotExist(id);
 

bot/src/main/resources/Metrics.md

@@ -0,0 +1,22 @@
+# RED
+
+Rate
+```
+sum by(uri, method) (
+  rate(http_server_requests_seconds_count{job="Bot"}[1m])
+)
+```
+Errors
+```
+sum by(uri, status) (
+  rate(http_server_requests_seconds_count{job="Bot", status=~"4..|5.."}[1m])
+)
+```
+Duration
+```
+sum by(uri) (
+rate(http_server_requests_seconds_sum{job="Bot"}[1m])
+)
+```
+
+# Custom

bot/src/main/resources/application.yaml

@@ -1,7 +1,7 @@
 app:
   telegram-token: ${TELEGRAM_TOKEN}  # env variable
   link:
-    scrapper-uri: "http://localhost:8081"
+    scrapper-uri: "http://scrapper:8081"
   webclient:
     timeouts:
       connect-timeout: 10s    # 10 секунд на установку соединения
@@ -30,11 +30,11 @@ spring:
     type: redis
     data:
       redis:
-        host: localhost
+        host: redis
         port: 6379
 
   kafka:
-    bootstrap-servers: "localhost:29092"
+    bootstrap-servers: broker:9092
     consumer:
       auto-offset-reset: earliest
       group-id: "consumer-group"
@@ -131,13 +131,38 @@ bucket4j:
       refill-amount: 50 # Количество токенов для пополнения
       refill-seconds: 60 # Интервал пополнения в секундах (например, 60 = 1 минута)
 
-
-
-
-#logging:
-#  structured:
-#    format:
-#      file: ecs
-#      console: ecs
-#  level:
-#    root: INFO
+management:
+  server:
+    port: 8090  # Отдельный порт для метрик
+  endpoints:
+    web:
+      base-path: /
+      path-mapping:
+        prometheus: metrics
+      exposure:
+        include: "*"
+
+    distribution:
+      percentiles-histogram:
+        http.server.requests: true  # Гистограммы для перцентилей
+
+  prometheus:
+    metrics:
+      export:
+        enabled: true  # Включить экспорт метрик для Prometheus
+      web:
+        server:
+          auto-time-requests: true  # Должен быть здесь!
+
+  metrics:
+    tags:
+      application: ${spring.application.name}  # Добавляет тег с именем приложения
+
+
+logging:
+  structured:
+    format:
+      file: ecs
+      console: ecs
+  level:
+    root: INFO

…/processor/UserMessageProcessorTest.java …ot/metrics/UserMessageProcessorTest.javabot/src/test/java/backend/academy/bot/processor/UserMessageProcessorTest.java renamed to bot/src/test/java/backend/academy/bot/metrics/UserMessageProcessorTest.java bot/src/test/java/backend/academy/bot/processor/UserMessageProcessorTest.java renamed to bot/src/test/java/backend/academy/bot/metrics/UserMessageProcessorTest.java

@@ -1,17 +1,20 @@
-package backend.academy.bot.processor;
+package backend.academy.bot.metrics;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import backend.academy.bot.command.Command;
 import backend.academy.bot.command.link.TrackCommand;
-import backend.academy.bot.state.UserState;
+import backend.academy.bot.processor.UserMessageProcessor;
 import backend.academy.bot.state.UserStateManager;
 import com.pengrad.telegrambot.TelegramBot;
 import com.pengrad.telegrambot.model.Chat;
 import com.pengrad.telegrambot.model.Message;
 import com.pengrad.telegrambot.model.Update;
 import com.pengrad.telegrambot.request.SendMessage;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -34,50 +37,29 @@ public class UserMessageProcessorTest {
     private UserStateManager userStateManager;
 
     private UserMessageProcessor userMessageProcessor;
+    private MeterRegistry meterRegistry;
 
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this);
-        userMessageProcessor = new UserMessageProcessor(telegramBot, List.of(command1, trackCommand), userStateManager);
-    }
-
-    @Test
-    @DisplayName("Обработка сообщения: команда найдена и обработана")
-    void testProcess_CommandFoundAndHandled() {
-        Update update = createUpdateWithText("/mock");
-        when(command1.matchesCommand(update)).thenReturn(true);
-        when(command1.handle(update)).thenReturn(new SendMessage(123L, "Mock message"));
-
-        SendMessage result = userMessageProcessor.process(update);
-        verify(command1, times(1)).matchesCommand(update);
-        verify(command1, times(1)).handle(update);
-        assertEquals("Mock message", result.getParameters().get("text"));
-    }
-
-    @Test
-    @DisplayName("Обработка сообщения: команда не найдена, состояние WAITING_URL")
-    void testProcess_NoCommandFound_WaitingUrlState() {
-        Update update = createUpdateWithText("https://github.com/example");
-        when(command1.matchesCommand(update)).thenReturn(false);
-        when(userStateManager.getUserState(123L)).thenReturn(UserState.WAITING_URL);
-        when(trackCommand.handle(update)).thenReturn(new SendMessage(123L, "Track command handled"));
-
-        SendMessage result = userMessageProcessor.process(update);
-
-        verify(command1, times(1)).matchesCommand(update);
-        verify(trackCommand, times(1)).handle(update);
-        assertEquals("Track command handled", result.getParameters().get("text"));
+        meterRegistry = new SimpleMeterRegistry(); // Используем реальный MeterRegistry
+        userMessageProcessor =
+                new UserMessageProcessor(telegramBot, List.of(command1, trackCommand), userStateManager, meterRegistry);
     }
 
     @Test
     @DisplayName("Обработка сообщения: пользователь создается, если не существует")
     void testProcess_UserCreatedIfNotExist() {
         Update update = createUpdateWithText("/start");
         when(command1.matchesCommand(update)).thenReturn(true);
-        when(command1.handle(update)).thenReturn(new SendMessage(123L, "User created"));
+        when(command1.handle(update)).thenReturn(new SendMessage("123", "User created"));
 
         userMessageProcessor.process(update);
 
+        // Проверяем метрику
+        Counter counter = meterRegistry.counter("msg_count");
+        assertEquals(1, counter.count());
+
         verify(userStateManager, times(1)).createUserIfNotExist(123L);
     }
 
@@ -89,8 +71,6 @@ private Update createUpdateWithText(String text) {
         when(update.message()).thenReturn(message);
         when(message.chat()).thenReturn(chat);
         when(chat.id()).thenReturn(123L);
-        when(message.text()).thenReturn(text);
-
         return update;
     }
 }

docker-compose.yaml

@@ -104,14 +104,83 @@ services:
     networks:
       - kafka-net
 
+
+  prometheus:
+    image: prom/prometheus:latest
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    networks:
+      - monitoring
+
+  grafana:
+    image: grafana/grafana:latest
+    ports:
+      - "3000:3000"
+    environment:
+      - GF_SECURITY_ADMIN_USER=admin
+      - GF_SECURITY_ADMIN_PASSWORD=admin
+    networks:
+      - monitoring
+
+
+  bot:
+    image: delphington/bot:latest
+#    build:
+#      context: ./bot
+#      dockerfile: bot.Dockerfile
+    container_name: bot
+    restart: unless-stopped
+    ports:
+      - "8080:8080"  # Проброс порта для доступа с хоста
+      - "8090:8090"  # Метрики
+    environment:
+      - TELEGRAM_TOKEN=${TELEGRAM_TOKEN}
+    depends_on:
+      - broker
+      - redis
+    networks:
+      - backend
+      - kafka-net  # Чтобы видеть Kafka (broker:9092)
+
+
+  # --- SCRAPPER ---
+  scrapper:
+    image: delphington/scrapper:latest
+#    build:
+#      context: ./scrapper
+#      dockerfile: scrapper.Dockerfile
+    container_name: scrapper
+    restart: unless-stopped
+    ports:
+      - "8081:8081"
+      - "8091:8091"
+    environment:
+      - GITHUB_TOKEN=${GITHUB_TOKEN}       # Переменные из .env
+      - SO_TOKEN_KEY=${SO_TOKEN_KEY}
+      - SO_ACCESS_TOKEN=${SO_ACCESS_TOKEN}
+    depends_on:
+      - postgresql
+      - broker
+      - redis
+    networks:
+      - backend
+      - kafka-net
+
 volumes:
   postgresql:
   redis:
   zookeeper:
   broker:
+  prometheus:
+  grafana:
+
 
 networks:
   backend:
     driver: bridge
   kafka-net:
     driver: bridge
+  monitoring:
+    driver: bridge

prometheus.yml

@@ -0,0 +1,38 @@
+global:
+  scrape_interval: 5s
+  external_labels:
+    monitor: 'codelab-monitor'
+
+scrape_configs:
+  - job_name: 'Bot'
+    scrape_interval: 5s
+    metrics_path: '/metrics'
+    static_configs:
+      - targets: ['host.docker.internal:8090']
+
+  - job_name: 'Scrapper'
+    scrape_interval: 5s
+    metrics_path: '/metrics'
+    static_configs:
+      - targets: ['host.docker.internal:8091']
+
+
+
+
+#scrape_configs:
+#  - job_name: "prometheus"      # Мониторинг самого Prometheus
+#    static_configs:
+#      - targets: ["localhost:9090"]
+#
+#  - job_name: "bot"             # Сервис bot на порту 8081
+#    metrics_path: "/metrics"    # Если используется Spring Boot Actuator
+#    static_configs:
+#      - targets: ["localhost:8081"]
+#        labels:
+#          service: "bot"
+#
+#  - job_name: "scrapper"        # Сервис scrapper на порту 8082 (если 8081 занят)
+#    static_configs:
+#      - targets: ["localhost:8082"]
+#        labels:
+#          service: "scrapper"