Observability for Java-Swing-Tutor

posadskiy · posadskiy · commit 552562ff1ad7 · 2026-04-15T22:57:28.000+02:00
diff --git a/deployment/ingress/traefik-ingressroute.yaml b/deployment/ingress/traefik-ingressroute.yaml
@@ -31,7 +31,7 @@ spec:
       priority: 10
 
     # Health check
-    - match: Host(`api.java-swing.com`) && Path(`/actuator/health`)
+    - match: Host(`api.java-swing.com`) && Path(`/health`)
       kind: Rule
       services:
         - name: java-swing-tutor-service
diff --git a/desktop-client/pom.xml b/desktop-client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.posadskiy</groupId>
         <artifactId>java-swing-tutor</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.4</version>
     </parent>
 
     <artifactId>desktop-client</artifactId>
diff --git a/domain/pom.xml b/domain/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.posadskiy</groupId>
         <artifactId>java-swing-tutor</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.4</version>
     </parent>
 
     <artifactId>domain</artifactId>
diff --git a/flyway/pom.xml b/flyway/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.posadskiy</groupId>
         <artifactId>java-swing-tutor</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.4</version>
     </parent>
 
     <artifactId>flyway</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.posadskiy</groupId>
     <artifactId>java-swing-tutor</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.4</version>
     <packaging>pom</packaging>
     <name>java-swing-tutor</name>
 
@@ -79,7 +79,35 @@
                         <failsOnError>false</failsOnError>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>3.6.0</version>
+                </plugin>
             </plugins>
         </pluginManagement>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>${exec.mainClass}</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/service/deployment/deployment.yaml b/service/deployment/deployment.yaml
@@ -14,6 +14,10 @@ spec:
     metadata:
       labels:
         app: java-swing-tutor-service
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "/prometheus"
+        prometheus.io/port: "8400"
     spec:
       imagePullSecrets:
         - name: dockerhub-registry-secret
@@ -49,6 +53,22 @@ spec:
               value: "http://auth-service.microservices.svc.cluster.local:8100"
             - name: USER_SERVICE_BASE_URL
               value: "http://user-service.microservices.svc.cluster.local:8095"
+            - name: OTEL_SERVICE_NAME
+              value: "java-swing-tutor-service"
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: "http://grafana-alloy.observability.svc.cluster.local:4317"
+            - name: OTEL_TRACES_SAMPLER
+              value: parentbased_traceidratio
+            - name: OTEL_TRACES_SAMPLER_ARG
+              value: "1.0"
+            - name: DB_MAX_POOL_SIZE
+              value: "2"
+            - name: DB_MIN_IDLE
+              value: "0"
+            - name: DB_IDLE_TIMEOUT
+              value: "60000"
+            - name: DB_MAX_LIFETIME
+              value: "600000"
           resources:
             requests:
               memory: "512Mi"
@@ -58,15 +78,15 @@ spec:
               cpu: "500m"
           livenessProbe:
             httpGet:
-              path: /actuator/health
+              path: /health
               port: 8400
             initialDelaySeconds: 60
             periodSeconds: 10
             timeoutSeconds: 5
             failureThreshold: 3
           readinessProbe:
             httpGet:
-              path: /actuator/health
+              path: /health
               port: 8400
             initialDelaySeconds: 30
             periodSeconds: 5
diff --git a/service/deployment/network-policy.yaml b/service/deployment/network-policy.yaml
diff --git a/service/deployment/scripts/deploy.sh b/service/deployment/scripts/deploy.sh
@@ -44,7 +44,6 @@ export IMAGE_VERSION="$DOCKERHUB_USERNAME/java-swing-tutor-service:$VERSION"
 echo "🚀 Applying backend manifest (version: $VERSION)..."
 envsubst < "$DEPLOYMENT_DIR/deployment.yaml" | kubectl apply -f -
 kubectl apply -f "$DEPLOYMENT_DIR/service.yaml"
-kubectl apply -f "$DEPLOYMENT_DIR/network-policy.yaml"
 
 echo ""
 echo "⏳ Waiting for deployment..."
diff --git a/service/pom.xml b/service/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.posadskiy</groupId>
         <artifactId>java-swing-tutor</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.4</version>
     </parent>
 
     <artifactId>service</artifactId>
@@ -74,6 +74,10 @@
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-management</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micronaut.micrometer</groupId>
+            <artifactId>micronaut-micrometer-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.micronaut.micrometer</groupId>
             <artifactId>micronaut-micrometer-registry-prometheus</artifactId>
@@ -188,37 +192,19 @@
             <plugin>
                 <groupId>io.micronaut.maven</groupId>
                 <artifactId>micronaut-maven-plugin</artifactId>
-                <version>4.11.6</version>
                 <configuration>
                     <mainClass>${exec.mainClass}</mainClass>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
                     <annotationProcessorPaths combine.children="append">
-                        <path>
-                            <groupId>io.micronaut</groupId>
-                            <artifactId>micronaut-inject-java</artifactId>
-                            <version>${micronaut.version}</version>
-                        </path>
                         <path>
                             <groupId>io.micronaut.data</groupId>
                             <artifactId>micronaut-data-processor</artifactId>
                         </path>
-                        <path>
-                            <groupId>io.micronaut.validation</groupId>
-                            <artifactId>micronaut-validation-processor</artifactId>
-                        </path>
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
diff --git a/service/src/main/resources/application-prod.yml b/service/src/main/resources/application-prod.yml
@@ -9,3 +9,8 @@ service:
     # If user-service is in 'user' namespace: http://user-service.user.svc.cluster.local:8095
     # If user-service is in 'default' namespace: http://user-service.default.svc.cluster.local:8095
     user: ${USER_SERVICE_BASE_URL:http://user-service.default.svc.cluster.local:8095}
+
+otel:
+  traces:
+    sampler:
+      arg: ${OTEL_TRACES_SAMPLER_ARG:1.0}
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
@@ -1,6 +1,18 @@
 micronaut:
   application:
     name: java-swing-tutor-service
+  metrics:
+    enabled: true
+    export:
+      prometheus:
+        enabled: true
+        descriptions: true
+  tracing:
+    opentelemetry:
+      enabled: true
+  health:
+    monitor:
+      enabled: false
   server:
     port: ${JAVA_SWING_TUTOR_SERVICE_PORT:8400}
     cors:
@@ -30,14 +42,34 @@ micronaut:
         access: isAnonymous()
       - pattern: /api/code-checking/**
         access: isAnonymous()
+      - pattern: /prometheus
+        access: isAnonymous()
       - pattern: /api/**
         access: isAuthenticated()
+  endpoints:
+    health:
+      enabled: true
+      sensitive: false
+      details:
+        enabled: true
+      jdbc:
+        enabled: false
+
+endpoints:
+  prometheus:
+    enabled: true
+    sensitive: false
 
 datasources:
   default:
     url: ${JAVA_SWING_TUTOR_DATABASE_URL:jdbc:postgresql://localhost:5450/java_swing_tutor}
     username: ${JAVA_SWING_TUTOR_DATABASE_USER:java_swing_tutor}
     password: ${JAVA_SWING_TUTOR_DATABASE_PASSWORD:java_swing_tutor}
+    maximum-pool-size: ${DB_MAX_POOL_SIZE:2}
+    minimum-idle: ${DB_MIN_IDLE:0}
+    connection-timeout: ${DB_CONNECTION_TIMEOUT:10000}
+    idle-timeout: ${DB_IDLE_TIMEOUT:60000}
+    max-lifetime: ${DB_MAX_LIFETIME:600000}
     driverClassName: org.postgresql.Driver
     schema-generate: NONE
     dialect: POSTGRES
@@ -47,6 +79,16 @@ service:
     auth: ${AUTH_SERVICE_BASE_URL:http://localhost:8100}
     user: ${USER_SERVICE_BASE_URL:http://localhost:8095}
 
+otel:
+  exporter:
+    otlp:
+      endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT:http://localhost:4317}
+      protocol: grpc
+  traces:
+    exporter: otlp
+    sampler:
+      arg: ${OTEL_TRACES_SAMPLER_ARG:1.0}
+
 logging:
   level:
     root: ${LOG_LEVEL_ROOT:INFO}
