Merge k6 branch into main

docker-compose.yml

@@ -91,7 +91,11 @@ services:
       - backend
 
   prometheus:
+    container_name: prometheus
     image: prom/prometheus:latest
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--web.enable-remote-write-receiver'
     volumes:
       - ./monitoring/prometheus.yml:/etc/prometheus/prometheus.yml
     ports:
@@ -100,6 +104,7 @@ services:
       - backend
 
   grafana:
+    container_name: grafana
     image: grafana/grafana:latest
     environment:
       GF_SECURITY_ADMIN_USER: admin
@@ -113,6 +118,12 @@ services:
     volumes:
       - grafana-data:/var/lib/grafana
 
+  pushgateway:
+    container_name: pushgateway
+    image: prom/pushgateway:latest
+    ports:
+      - "9091:9091"
+
 volumes:
   pgdata:
   kafka-data:

monitoring/prometheus.yml

@@ -1,8 +1,15 @@
 global:
   scrape_interval: 5s
 
+remote_write:
+  - url: http://prometheus:9090/api/v1/write
+
 scrape_configs:
   - job_name: 'springboot-app'
     metrics_path: '/actuator/prometheus'
     static_configs:
-      - targets: ['backend:8080']
+      - targets: ['backend:8080']
+
+  - job_name: 'k6'
+    static_configs:
+      - targets: ['pushgateway:9091']

tests/performance/controllers/course_controller/delete_course_by_id/load_delete_course_by_id.js

@@ -16,3 +16,10 @@ export default function () {
     check(res, { 'DELETE load': (r) => [200, 204, 404].includes(r.status) });
     sleep(Math.random() * 5 + 2)
 }
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_load_delete_course_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
+}

tests/performance/controllers/course_controller/delete_course_by_id/spike_delete_course_by_id.js

@@ -17,4 +17,11 @@ export default function () {
     const res = http.del(`${BASE_URL}/${courseId}`, null, { headers: defaultHeaders });
     check(res, { 'DELETE spike': (r) => [200, 204, 404].includes(r.status) });
     sleep(Math.random() * 5 + 2)
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_spike_delete_course_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/delete_course_by_id/stress_delete_course_by_id.js

@@ -12,4 +12,11 @@ export default function () {
     const res = http.del(`${BASE_URL}/${courseId}`, null, { headers: defaultHeaders });
     check(res, { 'DELETE stress': (r) => [200, 204, 404].includes(r.status) });
     sleep(Math.random() * 5 + 2);
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_stress_delete_course_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/get_all_courses/load_get_all_courses.js

@@ -19,3 +19,10 @@ export default function () {
     check(res, { 'GET /api/courses status 200': (r) => checkResponse(r, 200, 'GET /api/courses') });
     sleep(Math.random() * 2 + 1);
 }
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_load_get_all_courses_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
+}

tests/performance/controllers/course_controller/get_all_courses/spike_get_all_courses.js

@@ -19,3 +19,10 @@ export default function () {
     const res = http.get(BASE_URL, { headers: defaultHeaders });
     check(res, { 'GET /api/courses status 200': (r) => checkResponse(r, 200, 'GET /api/courses') });
 }
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_spike_get_all_courses_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
+}

tests/performance/controllers/course_controller/get_all_courses/stress_get_all_courses.js

@@ -22,3 +22,10 @@ export default function () {
     const res = http.get(BASE_URL, { headers: defaultHeaders });
     check(res, { 'GET /api/courses status 200': (r) => checkResponse(r, 200, 'GET /api/courses') });
 }
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_stress_get_all_courses_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
+}

tests/performance/controllers/course_controller/get_course_by_id/load_get_course_by_id.js

@@ -19,4 +19,11 @@ const COURSE_ID = __ENV.COURSE_ID || '1';
 export default function () {
     const res = http.get(`${BASE_URL}/${COURSE_ID}`, { headers: defaultHeaders });
     check(res, { 'GET /api/courses/{id} status 200': (r) => checkResponse(r, 200, 'GET /api/courses/{id}') });
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_load_get_courses_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/get_course_by_id/spike_get_course_by_id.js

@@ -15,4 +15,11 @@ const COURSE_ID = __ENV.COURSE_ID || '1';
 export default function () {
     const res = http.get(`${BASE_URL}/${COURSE_ID}`, { headers: defaultHeaders });
     check(res, { 'GET /api/courses/{id} status 200': (r) => checkResponse(r, 200, 'GET /api/courses/{id}') });
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_spike_get_courses_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/get_course_by_id/stress_get_course_by_id.js

@@ -23,4 +23,11 @@ const COURSE_ID = __ENV.COURSE_ID || '1';
 export default function () {
     const res = http.get(`${BASE_URL}/${COURSE_ID}`, { headers: defaultHeaders });
     check(res, { 'GET /api/courses/{id} status 200': (r) => checkResponse(r, 200, 'GET /api/courses/{id}') });
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_stress_get_courses_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/get_course_by_name/load_get_course_by_name.js

@@ -17,3 +17,10 @@ export default function () {
    check(res, { 'GET /api/courses/name/{name} returns 200': (r) => checkResponse(r, 200) });
   sleep(0.5);
 }
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_load_get_courses_by_name_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
+}

tests/performance/controllers/course_controller/get_course_by_name/spike_get_course_by_name.js

@@ -20,4 +20,11 @@ export default function () {
 
     const res = http.get(`${BASE_URL}/name/${courseName}`, { headers: defaultHeaders });
     check(res, { 'GET /api/courses/name/{name} returns 200': (r) => checkResponse(r, 200) });
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_spike_get_courses_by_name_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/get_course_by_name/stress_get_course_by_name.js

@@ -23,4 +23,11 @@ export default function () {
 
     const res = http.get(`${BASE_URL}/name/${courseName}`, { headers: defaultHeaders });
     check(res, { 'GET /api/courses/name/{name} returns 200': (r) => checkResponse(r, 200) });
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_stress_get_courses_by_name_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/get_course_lessons_by_id/load_get_course_lessons_by_id.js

@@ -15,4 +15,11 @@ export default function () {
    const res = http.get(`${BASE_URL}/1/lessons`, { headers: defaultHeaders });
    check(res, { 'GET /api/courses/1/lessons returns 200': (r) => checkResponse(r, 200) });
   sleep(0.5);
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_load_get_course_lessons_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/get_course_lessons_by_id/spike_get_course_lessons_by_id.js

@@ -18,4 +18,11 @@ export let options = {
 export default function () {
     const res = http.get(`${BASE_URL}/1/lessons`, { headers: defaultHeaders });
     check(res, { 'GET /api/courses/1/lessons returns 200': (r) => checkResponse(r, 200) });
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_spike_get_course_lessons_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/get_course_lessons_by_id/stress_get_course_lessons_by_id.js

@@ -22,4 +22,11 @@ export default function () {
 
     const res = http.get(`${BASE_URL}/1/lessons`, { headers: defaultHeaders });
     check(res, { 'GET /api/courses/1/lessons returns 200': (r) => checkResponse(r, 200) });
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_stress_get_course_lessons_by_id_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/post_all_courses/load_post_all_courses.js

@@ -18,4 +18,11 @@ export default function () {
     const res = http.post(BASE_URL, { headers: defaultHeaders });
     check(res, { 'POST /api/courses status 200': (r) => checkResponse(r, 200, 'POST /api/courses') });
     sleep(Math.random() * 2 + 1);
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_load_post_all_courses_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/post_all_courses/spike_post_all_courses.js

@@ -31,4 +31,11 @@ export default function () {
     'POST /api/courses → status 201': (r) =>
       checkResponse(r, 201, 'POST /api/courses'),
   });
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_spike_post_all_courses_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }

tests/performance/controllers/course_controller/post_all_courses/stress_post_all_courses.js

@@ -39,4 +39,11 @@ export default function () {
       checkResponse(r, [200, 201], 'POST /api/courses'),
   });
   sleep(Math.random() * 5 + 2);
+}
+
+export function handleSummary(data) {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  return {
+    [`./tests/performance/results/summary_stress_post_all_courses_${timestamp}.json`]: JSON.stringify(data, null, 2),
+  };
 }