From 839c64c12a77ad2dc94589a06c4d5bc6a3e2e87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoni=20Nu=C3=B1ez=20Romeu?= Date: Mon, 13 Jul 2026 15:57:52 +0200 Subject: [PATCH 1/6] feat: add end-to-end observability (metrics, health, mobile RUM, dashboards, alerts) - Backend: OTel metrics via OTLP -> Alloy -> Prometheus (OTEL_METRICS_EXPORTER=otlp) - New business metrics (src/metrics.js): searches, CIMA latency/errors, cache hits/misses, logins, rate-limits, pharmacy writes/links, push sent/failed, DB + Redis timings/errors, HTTP req count/duration, heartbeat - Backend health endpoints /healthz and /readyz - Mobile (Expo): Grafana Faro RUM via @grafana/faro-react-native - redis/postgres exporters in docker-compose + Prometheus scrape jobs - Grafana dashboards (backend, datastores, mobile RUM, overview) - Prometheus alert rules (farmafinder_*) -> existing Alertmanager (Telegram) - Design/spec saved to docs/superpowers/specs/ --- apps/backend/cima-service.js | 43 +++- apps/backend/package.json | 2 + apps/backend/redis-client.js | 23 ++ apps/backend/server.js | 118 ++++++++-- apps/backend/src/metrics.js | 108 +++++++++ apps/backend/src/tracing.js | 11 + apps/frontend-mobile/.env.example | 5 + apps/frontend-mobile/app/_layout.tsx | 4 + apps/frontend-mobile/package.json | 1 + apps/frontend-mobile/services/faro.ts | 36 +++ docker-compose.yml | 23 ++ .../specs/2026-07-13-observability-design.md | 208 ++++++++++++++++++ .../dashboards/farmafinder-backend.json | 145 ++++++++++++ .../dashboards/farmafinder-datastores.json | 85 +++++++ .../dashboards/farmafinder-mobile-rum.json | 58 +++++ .../dashboards/farmafinder-overview.json | 64 ++++++ 16 files changed, 907 insertions(+), 27 deletions(-) create mode 100644 apps/backend/src/metrics.js create mode 100644 apps/frontend-mobile/services/faro.ts create mode 100644 docs/superpowers/specs/2026-07-13-observability-design.md create mode 100644 monitoring/dashboards/farmafinder-backend.json create mode 100644 monitoring/dashboards/farmafinder-datastores.json create mode 100644 monitoring/dashboards/farmafinder-mobile-rum.json create mode 100644 monitoring/dashboards/farmafinder-overview.json diff --git a/apps/backend/cima-service.js b/apps/backend/cima-service.js index ad185fd..0564c49 100644 --- a/apps/backend/cima-service.js +++ b/apps/backend/cima-service.js @@ -1,9 +1,27 @@ import axios from 'axios'; import redisClient from './redis-client.js'; +import * as appMetrics from './src/metrics.js'; const CIMA_API_BASE_URL = 'https://cima.aemps.es/cima/rest'; const CACHE_TTL = 3600; +/** + * Wraps a CIMA API GET with duration + success/error metrics. + */ +async function trackedCimaGet(url, params) { + const start = Date.now(); + try { + const response = await axios.get(url, { params, timeout: 5000 }); + appMetrics.cimaRequestDuration.record(Date.now() - start); + appMetrics.cimaRequestsTotal.add(1, { status: 'ok' }); + return response; + } catch (err) { + appMetrics.cimaRequestDuration.record(Date.now() - start); + appMetrics.cimaRequestsTotal.add(1, { status: 'error' }); + throw err; + } +} + /** * Separa los términos de dosis (ej: "1g", "1000 mg") del nombre del * medicamento, para poder buscar en CIMA solo con el nombre y luego @@ -69,23 +87,24 @@ export async function searchMedicines(query) { const cacheKey = `medicines:search:v3:${searchTerm}`; try { + appMetrics.medicineSearchesTotal.add(1); + // Intentar obtener del caché const cachedData = await redisClient.get(cacheKey); if (cachedData) { console.log(`📦 Cache hit for: ${searchTerm}`); + appMetrics.cacheHitsTotal.add(1); return JSON.parse(cachedData); } + appMetrics.cacheMissesTotal.add(1); const parsed = parseSearchQuery(searchTerm); const apiSearchTerm = parsed.nameQuery || searchTerm; console.log(`🌐 Fetching from CIMA API: ${apiSearchTerm}`); - const response = await axios.get(`${CIMA_API_BASE_URL}/medicamentos`, { - params: { - nombre: apiSearchTerm - }, - timeout: 5000 + const response = await trackedCimaGet(`${CIMA_API_BASE_URL}/medicamentos`, { + nombre: apiSearchTerm, }); if (response.data && response.data.resultados) { @@ -143,20 +162,23 @@ export async function getMedicineDetails(nregistro) { const cacheKey = `medicine:${nregistro}`; try { + appMetrics.medicineSearchesTotal.add(1); + // Intentar obtener del caché const cachedData = await redisClient.get(cacheKey); if (cachedData) { console.log(`📦 Cache hit for medicine: ${nregistro}`); + appMetrics.cacheHitsTotal.add(1); return JSON.parse(cachedData); } + appMetrics.cacheMissesTotal.add(1); + // Intentar obtener de la API de CIMA (endpoint individual puede no existir) console.log(`🌐 Fetching medicine details from CIMA: ${nregistro}`); try { - const response = await axios.get(`${CIMA_API_BASE_URL}/medicamento/${nregistro}`, { - timeout: 5000 - }); + const response = await trackedCimaGet(`${CIMA_API_BASE_URL}/medicamento/${nregistro}`); if (response.data) { const med = response.data; @@ -185,9 +207,8 @@ export async function getMedicineDetails(nregistro) { } // Fallback: buscar por nregistro usando el endpoint de búsqueda - const searchResponse = await axios.get(`${CIMA_API_BASE_URL}/medicamentos`, { + const searchResponse = await trackedCimaGet(`${CIMA_API_BASE_URL}/medicamentos`, { params: { nregistro }, - timeout: 5000 }); if (searchResponse.data?.resultados?.length > 0) { @@ -233,7 +254,7 @@ export async function getMedicineDetails(nregistro) { /** * Limpia el caché de búsquedas (útil para testing o mantenimiento) - * @param {string} pattern - Patrón de claves a eliminar (ej: 'medicines:search:*') + * @param {string} pattern - Patrón de claves a eliminar (ej: 'medicines:*') * @returns {Promise} - Número de claves eliminadas */ export async function clearCache(pattern = 'medicines:*') { diff --git a/apps/backend/package.json b/apps/backend/package.json index 924e3c8..6134673 100644 --- a/apps/backend/package.json +++ b/apps/backend/package.json @@ -21,10 +21,12 @@ "@opentelemetry/api": "^1.9.0", "@opentelemetry/auto-instrumentations-node": "^0.52.0", "@opentelemetry/exporter-logs-otlp-grpc": "^0.55.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "^0.55.0", "@opentelemetry/exporter-trace-otlp-grpc": "^0.55.0", "@opentelemetry/instrumentation-pino": "^0.45.0", "@opentelemetry/resources": "^1.28.0", "@opentelemetry/sdk-logs": "^0.55.0", + "@opentelemetry/sdk-metrics": "^1.28.0", "@opentelemetry/sdk-node": "^0.55.0", "@opentelemetry/sdk-trace-base": "^1.28.0", "@opentelemetry/semantic-conventions": "^1.28.0", diff --git a/apps/backend/redis-client.js b/apps/backend/redis-client.js index 7e82d52..ef236a4 100644 --- a/apps/backend/redis-client.js +++ b/apps/backend/redis-client.js @@ -1,4 +1,5 @@ import { createClient } from 'redis'; +import * as appMetrics from './src/metrics.js'; // Create Redis client const redisClient = createClient({ @@ -11,6 +12,7 @@ const redisClient = createClient({ // Error handler redisClient.on('error', (err) => { + appMetrics.redisErrorsTotal.add(1); console.error('Redis Client Error:', err); }); @@ -19,6 +21,27 @@ redisClient.on('connect', () => { console.log('✅ Connected to Redis'); }); +// Instrument get/setEx with command duration (used by the CIMA cache path). +const origGet = redisClient.get.bind(redisClient); +redisClient.get = async (...args) => { + const start = performance.now(); + try { + return await origGet(...args); + } finally { + appMetrics.redisCmdDuration.record(performance.now() - start); + } +}; + +const origSetEx = redisClient.setEx.bind(redisClient); +redisClient.setEx = async (...args) => { + const start = performance.now(); + try { + return await origSetEx(...args); + } finally { + appMetrics.redisCmdDuration.record(performance.now() - start); + } +}; + // Connect to Redis await redisClient.connect(); diff --git a/apps/backend/server.js b/apps/backend/server.js index 19d4270..ded732c 100644 --- a/apps/backend/server.js +++ b/apps/backend/server.js @@ -2,6 +2,8 @@ import './src/tracing.js'; import express from 'express'; +import redisClient from './redis-client.js'; +import * as appMetrics from './src/metrics.js'; import cors from 'cors'; import sqlite3 from 'sqlite3'; import { promisify } from 'util'; @@ -56,6 +58,19 @@ app.use(cors({ app.use(express.json({ limit: '10mb' })); app.use(pinoHttp({ logger })); +// Explicit HTTP request metrics (count by route + status class, duration). +// Auto-instrumentation gives duration histograms but no discrete error count. +app.use((req, res, next) => { + const start = performance.now(); + res.on('finish', () => { + const route = req.route?.path || req.path; + const statusClass = `${Math.floor(res.statusCode / 100)}xx`; + appMetrics.httpRequestsTotal.add(1, { route, status_class: statusClass }); + appMetrics.httpRequestDuration.record(performance.now() - start, { route }); + }); + next(); +}); + const PG_URL = process.env.PG_URL; let pgPool = null; if (PG_URL) { @@ -88,10 +103,16 @@ if (process.env.NODE_ENV !== 'test') { // Configure session app.use(session(sessionConfig)); -const searchLimiter = rateLimit({ windowMs: 60_000, max: 30, standardHeaders: true, legacyHeaders: false }); -const loginLimiter = rateLimit({ windowMs: 60_000, max: 5, standardHeaders: true, legacyHeaders: false }); -const registerLimiter = rateLimit({ windowMs: 60 * 60_000, max: 10, standardHeaders: true, legacyHeaders: false }); -const geocodeLimiter = rateLimit({ windowMs: 60_000, max: 10, standardHeaders: true, legacyHeaders: false }); +// Shared handler so every limiter emits a counter (route label) on rejection. +const limitHandler = (route) => (req, res, next) => { + appMetrics.rateLimitRejectedTotal.add(1, { route }); + res.status(429).json({ error: 'Too many requests, please try again later.' }); +}; + +const searchLimiter = rateLimit({ windowMs: 60_000, max: 30, standardHeaders: true, legacyHeaders: false, handler: limitHandler('search') }); +const loginLimiter = rateLimit({ windowMs: 60_000, max: 5, standardHeaders: true, legacyHeaders: false, handler: limitHandler('login') }); +const registerLimiter = rateLimit({ windowMs: 60 * 60_000, max: 10, standardHeaders: true, legacyHeaders: false, handler: limitHandler('register') }); +const geocodeLimiter = rateLimit({ windowMs: 60_000, max: 10, standardHeaders: true, legacyHeaders: false, handler: limitHandler('geocode') }); const VAPID_PUBLIC_KEY = process.env.VAPID_PUBLIC_KEY || ''; const VAPID_PRIVATE_KEY = process.env.VAPID_PRIVATE_KEY || ''; @@ -128,27 +149,54 @@ function toPositional(sql) { } async function userDbGet(sql, params = []) { - if (pgPool) { - const res = await pgPool.query(toPositional(sql), params); - return res.rows[0] ?? null; + const engine = pgPool ? 'pg' : 'sqlite'; + const start = performance.now(); + try { + if (pgPool) { + const res = await pgPool.query(toPositional(sql), params); + return res.rows[0] ?? null; + } + return await dbGet(sql, params); + } catch (err) { + appMetrics.dbErrorsTotal.add(1, { engine }); + throw err; + } finally { + appMetrics.dbQueryDuration.record(performance.now() - start, { engine }); } - return dbGet(sql, params); } async function userDbRun(sql, params = []) { - if (pgPool) { - const res = await pgPool.query(toPositional(sql), params); - return { lastID: res.rows[0]?.id, changes: res.rowCount }; + const engine = pgPool ? 'pg' : 'sqlite'; + const start = performance.now(); + try { + if (pgPool) { + const res = await pgPool.query(toPositional(sql), params); + return { lastID: res.rows[0]?.id, changes: res.rowCount }; + } + return await dbRun(sql.replace(/\s+RETURNING\s+\w+\s*$/i, ''), params); + } catch (err) { + appMetrics.dbErrorsTotal.add(1, { engine }); + throw err; + } finally { + appMetrics.dbQueryDuration.record(performance.now() - start, { engine }); } - return dbRun(sql.replace(/\s+RETURNING\s+\w+\s*$/i, ''), params); } async function userDbAll(sql, params = []) { - if (pgPool) { - const res = await pgPool.query(toPositional(sql), params); - return res.rows; + const engine = pgPool ? 'pg' : 'sqlite'; + const start = performance.now(); + try { + if (pgPool) { + const res = await pgPool.query(toPositional(sql), params); + return res.rows; + } + return await dbAll(sql, params); + } catch (err) { + appMetrics.dbErrorsTotal.add(1, { engine }); + throw err; + } finally { + appMetrics.dbQueryDuration.record(performance.now() - start, { engine }); } - return dbAll(sql, params); } // Accept opening_hours as either an object or a JSON string from the client @@ -861,6 +909,7 @@ app.post('/api/auth/login', loginLimiter, async (req, res) => { ); if (!user) { + appMetrics.loginFailureTotal.add(1); return res.status(401).json({ error: 'Invalid username or password' }); } @@ -868,6 +917,7 @@ app.post('/api/auth/login', loginLimiter, async (req, res) => { const isValidPassword = await bcrypt.compare(password, user.password_hash); if (!isValidPassword) { + appMetrics.loginFailureTotal.add(1); return res.status(401).json({ error: 'Invalid username or password' }); } @@ -876,6 +926,7 @@ app.post('/api/auth/login', loginLimiter, async (req, res) => { req.session.username = user.username; req.session.isAdmin = Boolean(user.is_admin); + appMetrics.loginSuccessTotal.add(1); res.json({ message: 'Login successful', user: { @@ -1583,6 +1634,7 @@ app.post('/api/admin/pharmacies', requireAdmin, async (req, res) => { } res.status(201).json(newPharmacy); + appMetrics.pharmacyWriteTotal.add(1, { op: 'create' }); } catch (error) { console.error('Error adding pharmacy:', error); if (error.message.includes('UNIQUE constraint')) { @@ -1620,6 +1672,7 @@ app.put('/api/admin/pharmacies/:id', requireAdmin, async (req, res) => { } res.json(updatedPharmacy); + appMetrics.pharmacyWriteTotal.add(1, { op: 'update' }); } catch (error) { console.error('Error updating pharmacy:', error); res.status(500).json({ error: 'Internal server error' }); @@ -1638,6 +1691,7 @@ app.delete('/api/admin/pharmacies/:id', requireAdmin, async (req, res) => { await userDbRun('DELETE FROM pharmacies WHERE id = ?', [pharmacyId]); res.json({ message: 'Pharmacy deleted successfully' }); + appMetrics.pharmacyWriteTotal.add(1, { op: 'delete' }); } catch (error) { console.error('Error deleting pharmacy:', error); res.status(500).json({ error: 'Internal server error' }); @@ -1807,6 +1861,7 @@ app.post('/api/admin/pharmacy-medicines', requireAdmin, async (req, res) => { } res.status(201).json(relationship); + appMetrics.pharmacyMedicineLinkTotal.add(1, { op: 'create' }); } catch (error) { console.error('Error adding medicine to pharmacy:', error); res.status(500).json({ error: 'Internal server error' }); @@ -1834,6 +1889,7 @@ app.put('/api/admin/pharmacy-medicines/:id', requireAdmin, async (req, res) => { } res.json(updated); + appMetrics.pharmacyMedicineLinkTotal.add(1, { op: 'update' }); } catch (error) { console.error('Error updating pharmacy-medicine:', error); res.status(500).json({ error: 'Internal server error' }); @@ -1846,6 +1902,7 @@ app.delete('/api/admin/pharmacy-medicines/:id', requireAdmin, async (req, res) = const id = parseInt(req.params.id); await userDbRun('DELETE FROM pharmacy_medicines WHERE id = ?', [id]); res.json({ message: 'Medicine removed from pharmacy successfully' }); + appMetrics.pharmacyMedicineLinkTotal.add(1, { op: 'delete' }); } catch (error) { console.error('Error deleting pharmacy-medicine:', error); res.status(500).json({ error: 'Internal server error' }); @@ -2157,8 +2214,10 @@ async function sendPushForMedicine({ medicine_nregistro, medicine_name, pharmacy payload ); sent++; + appMetrics.pushSentTotal.add(1, { channel: 'web' }); } catch (err) { failed++; + appMetrics.pushFailedTotal.add(1, { channel: 'web' }); const status = err?.statusCode; if (status === 404 || status === 410) { try { @@ -2214,8 +2273,10 @@ async function sendPushForMedicine({ medicine_nregistro, medicine_name, pharmacy for (const ticket of result.data) { if (ticket.status === 'ok') { sent++; + appMetrics.pushSentTotal.add(1, { channel: 'expo' }); } else { failed++; + appMetrics.pushFailedTotal.add(1, { channel: 'expo' }); // Prune invalid tokens if (ticket.message?.includes('InvalidCredentials') || ticket.message?.includes('DeviceNotRegistered')) { const expoEndpoint = `expo://${ticket.id || ''}`; @@ -2230,13 +2291,16 @@ async function sendPushForMedicine({ medicine_nregistro, medicine_name, pharmacy } } else { sent += chunk.length; + appMetrics.pushSentTotal.add(chunk.length, { channel: 'expo' }); } } else { failed += chunk.length; + appMetrics.pushFailedTotal.add(chunk.length, { channel: 'expo' }); console.error('[push] expo send failed:', response.status); } } catch (err) { failed += chunk.length; + appMetrics.pushFailedTotal.add(chunk.length, { channel: 'expo' }); console.error('[push] expo send error:', err.message); } } @@ -2245,6 +2309,28 @@ async function sendPushForMedicine({ medicine_nregistro, medicine_name, pharmacy return { sent, failed, pruned }; } +// --- Health & readiness probes -------------------------------------------- +// /healthz: liveness (process is up). /readyz: dependencies reachable. +app.get('/healthz', (_req, res) => { + res.json({ status: 'ok', uptime: process.uptime() }); +}); + +app.get('/readyz', async (_req, res) => { + const checks = { redis: 'ok', db: 'ok' }; + try { + await redisClient.ping(); + } catch { + checks.redis = 'fail'; + } + try { + await userDbGet('SELECT 1'); + } catch { + checks.db = 'fail'; + } + const ready = checks.redis === 'ok' && checks.db === 'ok'; + res.status(ready ? 200 : 503).json({ status: ready ? 'ok' : 'degraded', checks }); +}); + export { app, initDatabase, db }; if (process.env.NODE_ENV !== 'test') { diff --git a/apps/backend/src/metrics.js b/apps/backend/src/metrics.js new file mode 100644 index 0000000..1d052c3 --- /dev/null +++ b/apps/backend/src/metrics.js @@ -0,0 +1,108 @@ +// OpenTelemetry metrics for the FarmaFinder backend. +// +// Uses the global MeterProvider configured in `tracing.js` (imported first in +// server.js). Metrics flow OTLP → Alloy → Prometheus remote_write, exactly like +// the tracing pipeline, so no extra Prometheus scrape job is required. +import { metrics } from '@opentelemetry/api'; + +const meter = metrics.getMeter('farmafinder-backend', '1.0.0'); + +// --- Heartbeat ------------------------------------------------------------- +// Emitted continuously so we can alert on "backend not sending telemetry" +// (remote_write has no `up` metric). +export const heartbeatTotal = meter.createCounter('app_heartbeat_total', { + description: 'Heartbeat ticks from the backend process (liveness signal).', +}); + +// --- Medicine search / CIMA upstream -------------------------------------- +export const medicineSearchesTotal = meter.createCounter('medicine_searches_total', { + description: 'Total medicine searches handled (cache or upstream).', +}); + +export const cimaRequestsTotal = meter.createCounter('cima_requests_total', { + description: 'Total upstream CIMA API requests.', +}); + +export const cimaRequestDuration = meter.createHistogram('cima_request_duration_ms', { + description: 'Duration of upstream CIMA API requests.', + unit: 'ms', +}); + +export const cacheHitsTotal = meter.createCounter('cache_hits_total', { + description: 'Total Redis cache hits.', +}); + +export const cacheMissesTotal = meter.createCounter('cache_misses_total', { + description: 'Total Redis cache misses (fell through to upstream).', +}); + +// --- Auth ------------------------------------------------------------------ +export const loginSuccessTotal = meter.createCounter('login_success_total', { + description: 'Successful login attempts.', +}); + +export const loginFailureTotal = meter.createCounter('login_failure_total', { + description: 'Failed login attempts.', +}); + +export const rateLimitRejectedTotal = meter.createCounter('rate_limit_rejected_total', { + description: 'Requests rejected by a rate limiter.', +}); + +// --- Admin operations ------------------------------------------------------ +export const pharmacyWriteTotal = meter.createCounter('pharmacy_write_total', { + description: 'Admin pharmacy write operations.', +}); + +export const pharmacyMedicineLinkTotal = meter.createCounter('pharmacy_medicine_link_total', { + description: 'Pharmacy-medicine link operations.', +}); + +// --- Push notifications ---------------------------------------------------- +export const pushSentTotal = meter.createCounter('push_sent_total', { + description: 'Push notifications successfully sent.', +}); + +export const pushFailedTotal = meter.createCounter('push_failed_total', { + description: 'Push notifications that failed to send.', +}); + +// --- Datastores ------------------------------------------------------------ +export const dbQueryDuration = meter.createHistogram('db_query_duration_ms', { + description: 'Duration of user DB queries.', + unit: 'ms', +}); + +export const dbErrorsTotal = meter.createCounter('db_errors_total', { + description: 'User DB query errors.', +}); + +export const redisErrorsTotal = meter.createCounter('redis_errors_total', { + description: 'Redis client errors.', +}); + +export const redisCmdDuration = meter.createHistogram('redis_cmd_duration_ms', { + description: 'Duration of Redis commands.', + unit: 'ms', +}); + +// --- HTTP (explicit, so we get status class + per-route breakdowns) -------- +// OTel's http auto-instrumentation records duration but not a discrete +// error count, so we track requests explicitly for error-rate alerting. +export const httpRequestsTotal = meter.createCounter('http_requests_total', { + description: 'Total HTTP requests, labelled by route and status class.', +}); + +export const httpRequestDuration = meter.createHistogram('http_request_duration_ms', { + description: 'HTTP request duration.', + unit: 'ms', +}); + +// --- Heartbeat loop (guarded against --watch duplicate intervals) ---------- +const HEARTBEAT_INTERVAL_MS = 30_000; +if (process.env.NODE_ENV !== 'test' && !globalThis.__farmafinderHeartbeat) { + globalThis.__farmafinderHeartbeat = setInterval(() => { + heartbeatTotal.add(1); + }, HEARTBEAT_INTERVAL_MS); + globalThis.__farmafinderHeartbeat?.unref?.(); +} diff --git a/apps/backend/src/tracing.js b/apps/backend/src/tracing.js index f07a24e..c88059e 100644 --- a/apps/backend/src/tracing.js +++ b/apps/backend/src/tracing.js @@ -9,8 +9,10 @@ // routed to Tempo. import { NodeSDK } from '@opentelemetry/sdk-node'; +import { PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics'; import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'; import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'; +import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc'; import * as resources from '@opentelemetry/resources'; import { ATTR_SERVICE_NAME, ATTR_SERVICE_NAMESPACE } from '@opentelemetry/semantic-conventions'; import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino'; @@ -28,9 +30,18 @@ const resource = typeof resources.resourceFromAttributes === 'function' [ATTR_SERVICE_NAMESPACE]: 'farmaclic', }); +// Metrics → OTLP → Alloy → Prometheus remote_write. The PeriodicExportingMetricReader +// makes the auto-instrumentations (http/express/redis) emit request duration/error +// metrics with no extra code, on top of the custom business metrics in src/metrics.js. +const metricReader = new PeriodicExportingMetricReader({ + exportIntervalMillis: 15_000, + exporter: new OTLPMetricExporter({ url: otlpEndpoint }), +}); + const sdk = new NodeSDK({ resource, traceExporter: new OTLPTraceExporter({ url: otlpEndpoint }), + metricReader, instrumentations: [ getNodeAutoInstrumentations({ // Disable fs by default — it is noisy and rarely useful. diff --git a/apps/frontend-mobile/.env.example b/apps/frontend-mobile/.env.example index b544ae9..0668dde 100644 --- a/apps/frontend-mobile/.env.example +++ b/apps/frontend-mobile/.env.example @@ -6,3 +6,8 @@ EXPO_PUBLIC_API_URL=http://localhost:3001/api # For production builds, update this to: # EXPO_PUBLIC_API_URL=https://api.yourdomain.com/api + +# Grafana Alloy OTLP/HTTP endpoint for Faro RUM (must be reachable from the +# device — use a LAN IP / public hostname, NOT localhost). +# Open router :4318 → srv84-macos:4318, or proxy /faro via Nginx Proxy Manager. +EXPO_PUBLIC_FARO_URL=http://grafana.hacecalor.net:4318 diff --git a/apps/frontend-mobile/app/_layout.tsx b/apps/frontend-mobile/app/_layout.tsx index 4394e4a..c7eb0de 100644 --- a/apps/frontend-mobile/app/_layout.tsx +++ b/apps/frontend-mobile/app/_layout.tsx @@ -8,6 +8,10 @@ import { SafeAreaProvider } from 'react-native-safe-area-context'; import { useAuthStore } from '../store/authStore'; import { registerForPushNotifications, addNotificationListener, addNotificationResponseListener } from '../services/notifications'; import { ThemeProvider, useThemeContext } from '../components/ThemeProvider'; +import { initFaro } from '../services/faro'; + +// Boot Faro RUM once, as early as possible. +initFaro(); const queryClient = new QueryClient(); diff --git a/apps/frontend-mobile/package.json b/apps/frontend-mobile/package.json index 29d4827..e5c8805 100644 --- a/apps/frontend-mobile/package.json +++ b/apps/frontend-mobile/package.json @@ -13,6 +13,7 @@ "expo-constants": "~57.0.3", "expo-dev-client": "~57.0.5", "expo-device": "~7.0.2", + "@grafana/faro-react-native": "^1.2.1", "expo-image-picker": "~57.0.2", "expo-linking": "~57.0.1", "expo-local-authentication": "~57.0.0", diff --git a/apps/frontend-mobile/services/faro.ts b/apps/frontend-mobile/services/faro.ts new file mode 100644 index 0000000..6c9565f --- /dev/null +++ b/apps/frontend-mobile/services/faro.ts @@ -0,0 +1,36 @@ +import { initializeFaro } from '@grafana/faro-react-native'; + +let initialized = false; + +/** + * Initializes Grafana Faro RUM for the React Native app. + * + * Telemetry (crashes, JS errors, console, app-start, memory/ANR vitals, + * session + screen tracking) is sent OTLP/HTTP to the Alloy collector. + * + * NOTE: `@grafana/faro-react-native` ships a native module, so it requires a + * custom dev build / EAS build (not Expo Go). Initialization is wrapped in a + * try/catch so a collector outage never crashes the app. + */ +export function initFaro(): void { + if (initialized) return; + initialized = true; + + try { + const url = + process.env.EXPO_PUBLIC_FARO_URL || 'http://grafana.hacecalor.net:4318'; + + initializeFaro({ + app: { + name: 'farmafinder-mobile', + version: '1.0.0', + environment: __DEV__ ? 'development' : 'production', + }, + url, + sessionTracking: { enabled: true }, + // Crash/JS error/console capture are on by default. + }); + } catch (err) { + console.warn('[faro] initialization failed:', err); + } +} diff --git a/docker-compose.yml b/docker-compose.yml index d3bb602..380331e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,6 +38,7 @@ services: OTEL_SERVICE_NAME: farmafinder-backend OTEL_EXPORTER_OTLP_ENDPOINT: http://host.docker.internal:4317 OTEL_TRACES_EXPORTER: otlp + OTEL_METRICS_EXPORTER: otlp OTEL_LOGS_EXPORTER: otlp OTEL_RESOURCE_ATTRIBUTES: service.namespace=farmafinder volumes: @@ -61,6 +62,28 @@ services: depends_on: - backend + # --- Observability exporters (scraped by the shared Prometheus on srv84-macos) --- + redis-exporter: + image: oliver006/redis_exporter:latest + restart: unless-stopped + ports: + - "9121:9121" + environment: + REDIS_ADDR: redis://redis:6379 + REDIS_PASSWORD: ${REDIS_PASSWORD:-} + depends_on: + - redis + + postgres-exporter: + image: prometheuscommunity/postgres-exporter:latest + restart: unless-stopped + ports: + - "9187:9187" + environment: + DATA_SOURCE_NAME: postgresql://farmafinder:${PG_PASSWORD:-change-me-in-production}@postgres:5432/farmafinder?sslmode=disable + depends_on: + - postgres + volumes: backend_data: postgres_data: diff --git a/docs/superpowers/specs/2026-07-13-observability-design.md b/docs/superpowers/specs/2026-07-13-observability-design.md new file mode 100644 index 0000000..ea85d3c --- /dev/null +++ b/docs/superpowers/specs/2026-07-13-observability-design.md @@ -0,0 +1,208 @@ +# FarmaFinder — End-to-End Observability Plan & Progress + +> **Purpose:** Single source of truth for adding metrics + monitoring across the +> FarmaFinder stack. If the session runs out of tokens, a fresh session can read +> this file and continue from the **Status** section. +> +> Created: 2026-07-13 + +--- + +## 1. Current State (verified) + +### 1.1 Monitoring stack — `srv84-macos:/root/Monitoring` (Docker Compose) +Running services (verified live): + +| Service | Port | Role | +|---|---|---| +| Prometheus `v2.55.1` | 9090 | metrics + alerting (config `/etc/prometheus/`) | +| Grafana `grafana/grafana` | 3000 | dashboards (admin `foobar`) | +| Alertmanager `v0.27.0` | 9093 | **Telegram** notifications (already configured) | +| Loki `latest` | 3100 | logs (`/otlp` receiver enabled) | +| Tempo `latest` | 3200 | traces | +| cAdvisor | 8080 | container metrics | +| node-exporter | 9100 | host metrics (srv84-macos + srv102-hosting + srv104-omv) | +| **Alloy `v1.6.1`** | 4317 gRPC / 4318 HTTP / 12345 self | unified OTel collector | + +**Alloy pipeline (`alloy-config.alloy`):** +`otelcol.receiver.otlp` (gRPC+HTTP) → `batch` → +- traces → `otelp.tempo` (Tempo:4317) +- logs → `otlphttp.loki` (Loki:3100/otlp) +- metrics → `exporter.prometheus` → `prometheus.remote_write` → `http://prometheus:9090/api/v1/write` + +So **any OTLP metrics sent to Alloy land in Prometheus automatically** — no new scrape job needed for app services. + +### 1.2 Grafana datasources (provisioned, sufficient) +Prometheus (default), Tempo, Loki, PostgreSQL, Alertmanager. + +### 1.3 Grafana plugins (installed, sufficient) +Built-in panels + **Drilldown apps**: `grafana-lokiexplore-app`, `grafana-metricsdrilldown-app`, `grafana-exploretraces-app`, `grafana-pyroscope-app`. +**No extra plugins required.** + +### 1.4 Existing app instrumentation +| App | Traces | Metrics | Logs | Health | Notes | +|---|---|---|---|---|---| +| backend (Express) | ✅ OTel→Alloy | ❌ **none** | ✅ pino→Alloy | ❌ none | `src/tracing.js` boots NodeSDK; only traces+logs exported | +| frontend (React/Vite PWA) | ✅ Faro→Alloy:4318 | ❌ | ✅ Faro→Loki | — | `src/utils/faro.js`; dashboards `faro-overview/-web-vitals/-js-errors` exist | +| frontend-mobile (Expo RN) | ❌ | ❌ | console only | — | **no observability at all** | +| pip-platform (FastAPI) | ✅ OTel | ✅ `/metrics` (prometheus_client) | ✅ structlog | ✅ /system/health,/ready,/status | **not scraped by Prometheus yet** | +| scraper (Puppeteer) | ✅ OTel | ❌ | console | — | | + +### 1.5 Prometheus scrape jobs (today) +`prometheus`, `cadvisor`, `node-exporter` (x3 hosts). **No farmafinder/pip/redis/postgres jobs.** +Comment in `prometheus.yml`: app metrics are expected via OTLP→Alloy→remote_write. + +### 1.6 Existing Prometheus alerts (`alert.rules`) +`service_down`, `high_load`, `high_memory`, `disk_almost_full`, `pm2_process_down`, `container_down`. All infra-level. + +--- + +## 2. Decisions (confirmed with user) + +- **Metrics transport = OTLP** for backend + mobile (aligns with stack design; no new app scrape jobs). Infra exporters (Redis/Postgres/pip) stay as scrape jobs. +- **Mobile Faro endpoint:** env-configurable `EXPO_PUBLIC_FARO_URL`, default + `http://grafana.hacecalor.net:4318`. User will **open router port 4318 → srv84-macos:4318** + (and/or fix Nginx Proxy Manager `/faro` proxy to Alloy:4318). Devices are NOT on the docker + host, so `localhost` will NOT work. +- **Alertmanager:** Telegram already configured — **no contact-point change**. New rules just route to it. + +--- + +## 3. Design / Tasks + +### Task A — Backend metrics (OTel → Alloy → Prometheus) +**Files:** `apps/backend/src/tracing.js`, `apps/backend/src/metrics.js` (new), `apps/backend/package.json`, `docker-compose.yml`. + +1. Add metrics SDK to `tracing.js`: + - `MeterProvider` + `OTLPMetricExporter` + `PeriodicExportingMetricReader` (interval 15s). + - Reuse existing `resource` + `getNodeAutoInstrumentations` (already includes http/express/redis → gives `http.server.request.duration`, `http.client.request.duration`, `redis.client.commands.duration`, etc.). + - Keep `PinoInstrumentation`. Gate on `NODE_ENV !== 'test'`. +2. New `src/metrics.js` using `@opentelemetry/api` `metrics`: + - `medicine_searches_total` (counter) + - `cima_request_duration_ms` (histogram), `cima_errors_total` (counter) + - `cache_hits_total` / `cache_misses_total` (counters) + - `login_success_total` / `login_failure_total` (counters) + - `rate_limit_rejected_total` (counter, label `route`) + - `pharmacy_write_total` (counter, label `op`) + - `pharmacy_medicine_link_total` (counter) + - `push_sent_total` / `push_failed_total` (counters, label `channel=expo|web`) + - `db_query_duration_ms` (histogram), `db_errors_total` (counter, label `engine=sqlite|pg`) + - `redis_errors_total` (counter), `redis_cmd_duration_ms` (histogram) + - `heartbeat_total` (counter, incremented every 30s) → drives "backend down" alert + - Node runtime metrics via `views`/runtime instrumentation (event loop lag, heap, gc). +3. Instrument the relevant handlers in `server.js` (search, auth, admin, notifications, db, redis) by importing the meters. +4. `docker-compose.yml`: add `OTEL_METRICS_EXPORTER: otlp` under backend env (alongside existing traces/logs exporters). +5. `package.json`: ensure `@opentelemetry/sdk-metrics` + `@opentelemetry/exporter-metrics-otlp-grpc` are present (add if missing; align versions with existing `^0.55.0`). + +### Task B — Backend health endpoints +**File:** `apps/backend/server.js`. +- `GET /healthz` → `{status:"ok"}` (liveness). +- `GET /readyz` → ping Redis + run a trivial DB query; return 200/503 JSON. +- Used by Docker healthcheck / k8s; not scraped. + +### Task C — Mobile RUM (Expo / React Native) +**Files:** `apps/frontend-mobile/package.json`, `apps/frontend-mobile/app/_layout.tsx` (root), `.env.example`. +- Add dependency `@grafana/faro-react-native` (`^1.2.1`). +- Init in `_layout.tsx` (or `App.tsx`) entry: + ```ts + import { initializeFaro } from '@grafana/faro-react-native'; + initializeFaro({ + app: { name: 'farmafinder-mobile', version: '1.0.0', environment: 'production' }, + url: process.env.EXPO_PUBLIC_FARO_URL || 'http://grafana.hacecalor.net:4318', + sessionTracking: { enabled: true }, + // captures crashes, JS errors, console, ANR(Android), app-start, memory vitals + }); + ``` +- `EXPO_PUBLIC_FARO_URL` in `.env.example` (default the public URL above). +- Optional follow-up: `@grafana/faro-react-native-tracing` for distributed traces + `@grafana/faro-metro-plugin` for source maps (post-MVP). + +### Task D — Infra exporters (scrape jobs on `srv84-macos`) +**Files (remote):** `/root/Monitoring/docker-compose.yml`, `/root/Monitoring/prometheus/prometheus.yml`. +- Add containers `redis-exporter` (→ farmafinder redis) and `postgres-exporter` (→ farmafinder postgres) to the Monitoring compose. Reach farmafinder's redis/postgres via the docker gateway / service DNS on the same host. +- Add scrape jobs in `prometheus.yml`: + - `farmafinder-redis` → redis-exporter + - `farmafinder-postgres` → postgres-exporter + - `pip-platform` → `http://:8000/metrics` (pip already exposes it) +- Reload Prometheus (`POST /-/reload`). + +### Task E — Grafana dashboards (provisioned JSON) +**Files:** `/root/Monitoring/grafana/provisioning/dashboards/*.json` + `dashboard.yml` entry. +1. `farmafinder-backend.json` — req rate, error %, latency p50/p95/p99 by route, CIMA latency/errors, cache hit rate, Redis/DB errors, push counts, auth failures, rate-limit hits, Node runtime. +2. `farmafinder-datastores.json` — Redis + Postgres + (SQLite via app metric) panels. +3. `farmafinder-mobile-rum.json` — Faro RN data from Loki (`app.name="farmafinder-mobile"`). +4. `farmafinder-overview.json` — combined RUM + backend metrics + deep-links to Tempo (traces) & Loki (logs). +(Keep existing `faro-*` PWA dashboards.) + +### Task F — Alerts +**Files (remote):** `/root/Monitoring/prometheus/alert.rules` + Grafana-managed alert. +Prometheus rules (group `farmafinder`): +- `farmafinder_backend_down` — `absent(heartbeat_total{job="farmafinder-backend"}) > 0` for 5m → critical +- `farmafinder_backend_5xx` — `rate(http.server.request.errors ...)` ratio > 5% over 5m → warning +- `farmafinder_cima_errors` — CIMA error rate high → warning +- `farmafinder_high_latency` — p95 `http.server.request.duration` > threshold → warning +- `farmafinder_redis_down` / `farmafinder_postgres_down` / `pip_platform_down` — `up==0` +Grafana-managed alert (Loki): **mobile/PWA JS-error spike** — count of Faro exceptions over 10m > N. +All route to existing Alertmanager (Telegram). + +### Task G — Mobile Faro reachability (user action) +- Open router `TCP 4318 → srv84-macos:4318`, **or** fix Nginx Proxy Manager `grafana.hacecalor.net/faro` → `http://:4318` ensuring OTLP HTTP paths (`/v1/logs`,`/v1/metrics`,`/v1/traces`) are proxied. Verify from a phone / external curl that `POST http://grafana.hacecalor.net:4318/v1/logs` is accepted. + +--- + +## 4. Status (update as you go) + +| Task | Status | Notes | +|---|---|---| +| A. Backend metrics | ✅ done (code) | `src/metrics.js`, `tracing.js` meter provider, instrumented server.js/cima-service.js/redis-client.js. Needs backend rebuild+redeploy to take effect. | +| B. Backend health | ✅ done (code) | `/healthz`, `/readyz` added. | +| C. Mobile Faro | ✅ done (code) | `services/faro.ts` + `_layout.tsx` init + dep `@grafana/faro-react-native`. Requires dev/EAS build (native module). | +| D. Infra exporters | ✅ done | redis/postgres exporters added to farmafinder `docker-compose.yml`; Prometheus scrape jobs + alert rules applied on srv84-macos. Needs farmafinder redeploy. | +| E. Dashboards | ✅ done + LIVE | 4 dashboards pushed to `/root/Monitoring/grafana/provisioning/dashboards/` and provisioned in Grafana. | +| F. Alerts | ✅ done + LIVE | `farmafinder` group applied to `alert.rules`; routes to existing Alertmanager (Telegram). | +| G. Mobile Faro URL | ⏳ user action | open :4318 → srv84-macos:4318, or fix Nginx Proxy Manager `/faro`. | + +## 5. Deployment & Verification + +### Backend (apply on next deploy) +The running `farmafinder-backend-1` still runs old code. To activate metrics: +```bash +# from repo root on srv84-macos (or wherever farmafinder is deployed) +docker compose build backend && docker compose up -d backend +# or push to main and let .gitea deploy +``` +Verify: +```bash +# after ~30s, a heartbeat sample should exist +curl -s "http://srv84-macos:9090/api/v1/query?query=app_heartbeat_total{job=%22farmafinder-backend%22}" +# health probes +curl -s http://localhost:3001/healthz ; curl -s http://localhost:3001/readyz +# dashboards populate: Grafana → FarmaFinder — Backend +``` + +### Mobile (user) +1. `cd apps/frontend-mobile && npm install` (pulls `@grafana/faro-react-native`). +2. Build a **dev/EAS build** (not Expo Go — native module). +3. Set `EXPO_PUBLIC_FARO_URL` (default `http://grafana.hacecalor.net:4318`) reachable from device. +4. Verify in Grafana → FarmaFinder — Mobile RUM (Loki `{app="farmafinder-mobile"}`). + +### Datastore exporters (apply on farmafinder redeploy) +`docker compose up -d` brings up `redis-exporter` (`:9121`) and `postgres-exporter` (`:9187`); +Prometheus already scrapes them. Verify: `up{job="farmafinder-redis"}`, `up{job="farmafinder-postgres"}`. + +## 6. Verification checklist (end) +- [x] 4 Grafana dashboards live (backend, datastores, mobile-rum, overview) +- [x] Prometheus scrape jobs `farmafinder-redis` / `farmafinder-postgres` present +- [x] Alert rules `farmafinder_*` loaded (no config errors) +- [ ] Backend redeployed → `app_heartbeat_total`, `http_requests_total`, `cima_requests_total`, etc. appear +- [ ] `/healthz`, `/readyz` return 200 +- [ ] Mobile build → Faro data in Loki + Mobile RUM dashboard +- [ ] Trigger a test alert (stop backend) → Telegram receives it + +## 7. Key commands / references +- Remote stack: `ssh root@srv84-macos`, configs under `/root/Monitoring`. +- Prometheus reload: `curl -X POST http://srv84-macos:9090/-/reload`. +- Grafana dashboards reload: `curl -u admin:foobar -X POST http://srv84-macos:3000/api/admin/provisioning/dashboards/reload`. +- Grafana API: `curl -u admin:foobar http://srv84-macos:3000/api/...` (admin password `foobar`). +- Backend OTel env (in `docker-compose.yml`): `OTEL_SERVICE_NAME=farmafinder-backend`, `OTEL_EXPORTER_OTLP_ENDPOINT=http://host.docker.internal:4317`, `OTEL_TRACES_EXPORTER=otlp`, **`OTEL_METRICS_EXPORTER=otlp`** (added), `OTEL_LOGS_EXPORTER=otlp`. +- New metrics module: `apps/backend/src/metrics.js`. +- Dashboards source: `monitoring/dashboards/*.json` (mirrored on the host). diff --git a/monitoring/dashboards/farmafinder-backend.json b/monitoring/dashboards/farmafinder-backend.json new file mode 100644 index 0000000..ce8e731 --- /dev/null +++ b/monitoring/dashboards/farmafinder-backend.json @@ -0,0 +1,145 @@ +{ + "annotations": { "list": [] }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 1, + "id": null, + "links": [], + "liveNow": false, + "panels": [ + { + "id": 1, "title": "Request rate (req/s)", "type": "timeseries", + "gridPos": { "h": 6, "w": 8, "x": 0, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum(rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "req/s" } + ] + }, + { + "id": 2, "title": "Requests by status class", "type": "timeseries", + "gridPos": { "h": 6, "w": 8, "x": 8, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum by (status_class) (rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "{{status_class}}" } + ] + }, + { + "id": 3, "title": "5xx error rate", "type": "stat", + "gridPos": { "h": 6, "w": 8, "x": 16, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum(rate(http_requests_total{status_class=\"5xx\",job=\"farmafinder-backend\"}[5m])) / sum(rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "5xx ratio" } + ], + "fieldConfig": { "defaults": { "unit": "percentunit", "thresholds": { "steps": [ { "color": "green", "value": 0 }, { "color": "yellow", "value": 0.01 }, { "color": "red", "value": 0.05 } ] } } } + }, + { + "id": 4, "title": "HTTP p95 latency (route)", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 0, "y": 6 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "histogram_quantile(0.95, sum by (le, route) (rate(http_request_duration_ms_bucket{job=\"farmafinder-backend\"}[5m])))", "legendFormat": "{{route}} p95" } + ], + "fieldConfig": { "defaults": { "unit": "ms" } } + }, + { + "id": 5, "title": "Medicine searches / CIMA requests", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 12, "y": 6 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum(rate(medicine_searches_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "searches/s" }, + { "expr": "sum(rate(cima_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "cima req/s" } + ] + }, + { + "id": 6, "title": "Cache hit ratio", "type": "timeseries", + "gridPos": { "h": 6, "w": 8, "x": 0, "y": 12 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum(rate(cache_hits_total{job=\"farmafinder-backend\"}[5m])) / (sum(rate(cache_hits_total{job=\"farmafinder-backend\"}[5m])) + sum(rate(cache_misses_total{job=\"farmafinder-backend\"}[5m])))", "legendFormat": "hit ratio" } + ], + "fieldConfig": { "defaults": { "unit": "percentunit" } } + }, + { + "id": 7, "title": "CIMA API errors", "type": "timeseries", + "gridPos": { "h": 6, "w": 8, "x": 8, "y": 12 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum(rate(cima_requests_total{status=\"error\",job=\"farmafinder-backend\"}[5m]))", "legendFormat": "errors/s" } + ] + }, + { + "id": 8, "title": "Logins (success / failure)", "type": "timeseries", + "gridPos": { "h": 6, "w": 8, "x": 16, "y": 12 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum(rate(login_success_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "success/s" }, + { "expr": "sum(rate(login_failure_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "failure/s" } + ] + }, + { + "id": 9, "title": "Rate-limit rejections (by route)", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 0, "y": 18 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum by (route) (rate(rate_limit_rejected_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "{{route}}" } + ] + }, + { + "id": 10, "title": "Push notifications (sent / failed)", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 12, "y": 18 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum by (channel) (rate(push_sent_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "sent {{channel}}" }, + { "expr": "sum by (channel) (rate(push_failed_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "failed {{channel}}" } + ] + }, + { + "id": 11, "title": "DB query p95 latency & errors", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 0, "y": 24 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "histogram_quantile(0.95, sum by (le, engine) (rate(db_query_duration_ms_bucket{job=\"farmafinder-backend\"}[5m])))", "legendFormat": "p95 {{engine}}" }, + { "expr": "sum by (engine) (rate(db_errors_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "errors {{engine}}" } + ], + "fieldConfig": { "defaults": { "unit": "ms" } } + }, + { + "id": 12, "title": "Redis cmd p95 & errors", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 12, "y": 24 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "histogram_quantile(0.95, sum by (le) (rate(redis_cmd_duration_ms_bucket{job=\"farmafinder-backend\"}[5m])))", "legendFormat": "p95 redis" }, + { "expr": "sum(rate(redis_errors_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "redis errors/s" } + ], + "fieldConfig": { "defaults": { "unit": "ms" } } + }, + { + "id": 13, "title": "Admin ops (pharmacy writes / links)", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 0, "y": 30 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "sum by (op) (rate(pharmacy_write_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "pharmacy {{op}}" }, + { "expr": "sum by (op) (rate(pharmacy_medicine_link_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "link {{op}}" } + ] + }, + { + "id": 14, "title": "Liveness (heartbeat)", "type": "stat", + "gridPos": { "h": 6, "w": 12, "x": 12, "y": 30 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "max(app_heartbeat_total{job=\"farmafinder-backend\"})", "legendFormat": "heartbeat total" } + ] + } + ], + "schemaVersion": 39, + "style": "dark", + "tags": ["farmafinder", "backend"], + "templating": { "list": [] }, + "time": { "from": "now-6h", "to": "now" }, + "timepicker": {}, + "timezone": "browser", + "title": "FarmaFinder — Backend", + "uid": "farmafinder-backend", + "version": 1, + "weekStart": "" +} diff --git a/monitoring/dashboards/farmafinder-datastores.json b/monitoring/dashboards/farmafinder-datastores.json new file mode 100644 index 0000000..da68d63 --- /dev/null +++ b/monitoring/dashboards/farmafinder-datastores.json @@ -0,0 +1,85 @@ +{ + "annotations": { "list": [] }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 1, + "id": null, + "links": [], + "liveNow": false, + "panels": [ + { + "id": 1, "title": "Redis up", "type": "stat", + "gridPos": { "h": 5, "w": 6, "x": 0, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "redis_up{job=\"farmafinder-redis\"}", "legendFormat": "redis" } ] + }, + { + "id": 2, "title": "Connected clients", "type": "timeseries", + "gridPos": { "h": 5, "w": 9, "x": 6, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "redis_connected_clients{job=\"farmafinder-redis\"}", "legendFormat": "clients" } ] + }, + { + "id": 3, "title": "Memory used", "type": "timeseries", + "gridPos": { "h": 5, "w": 9, "x": 15, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "redis_memory_used_bytes{job=\"farmafinder-redis\"}", "legendFormat": "bytes" } ], + "fieldConfig": { "defaults": { "unit": "bytes" } } + }, + { + "id": 4, "title": "Commands/sec", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 0, "y": 5 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "rate(redis_commands_processed_total{job=\"farmafinder-redis\"}[5m])", "legendFormat": "cmd/s" } ] + }, + { + "id": 5, "title": "Keyspace hit ratio", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 12, "y": 5 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "sum(rate(redis_keyspace_hits_total{job=\"farmafinder-redis\"}[5m])) / (sum(rate(redis_keyspace_hits_total{job=\"farmafinder-redis\"}[5m])) + sum(rate(redis_keyspace_misses_total{job=\"farmafinder-redis\"}[5m])))", "legendFormat": "hit ratio" } ], + "fieldConfig": { "defaults": { "unit": "percentunit" } } + }, + { + "id": 6, "title": "Postgres up", "type": "stat", + "gridPos": { "h": 5, "w": 6, "x": 0, "y": 11 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "pg_up{job=\"farmafinder-postgres\"}", "legendFormat": "pg" } ] + }, + { + "id": 7, "title": "Active connections", "type": "timeseries", + "gridPos": { "h": 5, "w": 9, "x": 6, "y": 11 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "pg_stat_activity_count{job=\"farmafinder-postgres\"}", "legendFormat": "connections" } ] + }, + { + "id": 8, "title": "Tuples returned / fetched", "type": "timeseries", + "gridPos": { "h": 5, "w": 9, "x": 15, "y": 11 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "rate(pg_stat_database_tup_returned{job=\"farmafinder-postgres\"}[5m])", "legendFormat": "returned/s" }, { "expr": "rate(pg_stat_database_tup_fetched{job=\"farmafinder-postgres\"}[5m])", "legendFormat": "fetched/s" } ] + }, + { + "id": 9, "title": "Deadlocks / conflicts", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 0, "y": 16 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "rate(pg_stat_database_deadlocks{job=\"farmafinder-postgres\"}[5m])", "legendFormat": "deadlocks/s" }, { "expr": "rate(pg_stat_database_conflicts{job=\"farmafinder-postgres\"}[5m])", "legendFormat": "conflicts/s" } ] + }, + { + "id": 10, "title": "Cache hit ratio (blocks)", "type": "timeseries", + "gridPos": { "h": 6, "w": 12, "x": 12, "y": 16 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "pg_stat_database_blk_hit{job=\"farmafinder-postgres\"} / (pg_stat_database_blk_hit{job=\"farmafinder-postgres\"} + pg_stat_database_blk_read{job=\"farmafinder-postgres\"})", "legendFormat": "block hit ratio" } ], + "fieldConfig": { "defaults": { "unit": "percentunit" } } + } + ], + "schemaVersion": 39, + "style": "dark", + "tags": ["farmafinder", "datastores"], + "templating": { "list": [] }, + "time": { "from": "now-6h", "to": "now" }, + "timepicker": {}, + "timezone": "browser", + "title": "FarmaFinder — Datastores", + "uid": "farmafinder-datastores", + "version": 1, + "weekStart": "" +} diff --git a/monitoring/dashboards/farmafinder-mobile-rum.json b/monitoring/dashboards/farmafinder-mobile-rum.json new file mode 100644 index 0000000..14e0e7c --- /dev/null +++ b/monitoring/dashboards/farmafinder-mobile-rum.json @@ -0,0 +1,58 @@ +{ + "annotations": { "list": [] }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 1, + "id": null, + "links": [], + "liveNow": false, + "panels": [ + { + "id": 1, "title": "Events/sec", "type": "timeseries", + "gridPos": { "h": 6, "w": 8, "x": 0, "y": 0 }, + "datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" }, + "targets": [ { "expr": "sum(count_over_time({app=\"farmafinder-mobile\"}[5m]))", "legendFormat": "events/s" } ] + }, + { + "id": 2, "title": "Active sessions", "type": "timeseries", + "gridPos": { "h": 6, "w": 8, "x": 8, "y": 0 }, + "datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" }, + "targets": [ { "expr": "count(count by (session_id) (count_over_time({app=\"farmafinder-mobile\"}[5m])))", "legendFormat": "sessions" } ] + }, + { + "id": 3, "title": "Errors/sec", "type": "timeseries", + "gridPos": { "h": 6, "w": 8, "x": 16, "y": 0 }, + "datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" }, + "targets": [ { "expr": "sum(count_over_time({app=\"farmafinder-mobile\"} |~ \"(?i)error|exception|crash\"[5m]))", "legendFormat": "errors/s" } ] + }, + { + "id": 4, "title": "Events by type", "type": "timeseries", + "gridPos": { "h": 7, "w": 12, "x": 0, "y": 6 }, + "datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" }, + "targets": [ { "expr": "sum by (type) (count_over_time({app=\"farmafinder-mobile\"}[5m]))", "legendFormat": "{{type}}" } ] + }, + { + "id": 5, "title": "Top error messages", "type": "timeseries", + "gridPos": { "h": 7, "w": 12, "x": 12, "y": 6 }, + "datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" }, + "targets": [ { "expr": "sum by (message) (count_over_time({app=\"farmafinder-mobile\"} |~ \"(?i)error|exception|crash\"[5m]))", "legendFormat": "{{message}}" } ] + }, + { + "id": 6, "title": "Recent logs", "type": "logs", + "gridPos": { "h": 10, "w": 24, "x": 0, "y": 13 }, + "datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" }, + "targets": [ { "expr": "{app=\"farmafinder-mobile\"}", "legendFormat": "" } ] + } + ], + "schemaVersion": 39, + "style": "dark", + "tags": ["farmafinder", "mobile", "rum"], + "templating": { "list": [] }, + "time": { "from": "now-6h", "to": "now" }, + "timepicker": {}, + "timezone": "browser", + "title": "FarmaFinder — Mobile RUM", + "uid": "farmafinder-mobile-rum", + "version": 1, + "weekStart": "" +} diff --git a/monitoring/dashboards/farmafinder-overview.json b/monitoring/dashboards/farmafinder-overview.json new file mode 100644 index 0000000..32838ac --- /dev/null +++ b/monitoring/dashboards/farmafinder-overview.json @@ -0,0 +1,64 @@ +{ + "annotations": { "list": [] }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 1, + "id": null, + "links": [], + "liveNow": false, + "panels": [ + { + "id": 1, "title": "Backend req/s", "type": "stat", + "gridPos": { "h": 5, "w": 6, "x": 0, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "sum(rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "req/s" } ] + }, + { + "id": 2, "title": "Backend 5xx ratio", "type": "stat", + "gridPos": { "h": 5, "w": 6, "x": 6, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "sum(rate(http_requests_total{status_class=\"5xx\",job=\"farmafinder-backend\"}[5m])) / sum(rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "5xx" } ], + "fieldConfig": { "defaults": { "unit": "percentunit", "thresholds": { "steps": [ { "color": "green", "value": 0 }, { "color": "yellow", "value": 0.01 }, { "color": "red", "value": 0.05 } ] } } } + }, + { + "id": 3, "title": "CIMA errors/s", "type": "stat", + "gridPos": { "h": 5, "w": 6, "x": 12, "y": 0 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ { "expr": "sum(rate(cima_requests_total{status=\"error\",job=\"farmafinder-backend\"}[5m]))", "legendFormat": "cima err/s" } ] + }, + { + "id": 4, "title": "Mobile events/s", "type": "stat", + "gridPos": { "h": 5, "w": 6, "x": 18, "y": 0 }, + "datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" }, + "targets": [ { "expr": "sum(count_over_time({app=\"farmafinder-mobile\"}[5m]))", "legendFormat": "mobile/s" } ] + }, + { + "id": 5, "title": "Datastore health", "type": "stat", + "gridPos": { "h": 5, "w": 12, "x": 0, "y": 5 }, + "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, + "targets": [ + { "expr": "redis_up{job=\"farmafinder-redis\"}", "legendFormat": "redis" }, + { "expr": "pg_up{job=\"farmafinder-postgres\"}", "legendFormat": "postgres" } + ] + }, + { + "id": 6, "title": "Navigation", "type": "text", + "gridPos": { "h": 5, "w": 12, "x": 12, "y": 5 }, + "options": { + "mode": "markdown", + "content": "**Dashboards**\n- [Backend](/d/farmafinder-backend/farmafinder-backend)\n- [Datastores](/d/farmafinder-datastores/farmafinder-datastores)\n- [Mobile RUM](/d/farmafinder-mobile-rum/farmafinder-mobile-rum)\n- [Faro Web RUM](/d/faro-overview/faro-farmafinder-rum-overview)\n\n**Explore**\n- [Tempo (traces)](/explore?orgId=1&left=%5B%22now-6h%22,%22now%22,%22tempo%22,%7B%7D%5D)\n- [Loki (logs)](/explore?orgId=1&left=%5B%22now-6h%22,%22now%22,%22loki%22,%7B%7D%5D)\n- [Prometheus (metrics)](/explore?orgId=1&left=%5B%22now-6h%22,%22now%22,%22PBFA97CFB590B2093%22,%7B%7D%5D)" + } + } + ], + "schemaVersion": 39, + "style": "dark", + "tags": ["farmafinder", "overview"], + "templating": { "list": [] }, + "time": { "from": "now-6h", "to": "now" }, + "timepicker": {}, + "timezone": "browser", + "title": "FarmaFinder — Overview", + "uid": "farmafinder-overview", + "version": 1, + "weekStart": "" +} From b8b8655634079a0b2631433d3eafbed7fba7a2d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoni=20Nu=C3=B1ez=20Romeu?= Date: Mon, 13 Jul 2026 16:23:20 +0200 Subject: [PATCH 2/6] Package json outdated --- package-lock.json | 466 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) diff --git a/package-lock.json b/package-lock.json index 87160c0..aa999ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,10 +35,12 @@ "@opentelemetry/api": "^1.9.0", "@opentelemetry/auto-instrumentations-node": "^0.52.0", "@opentelemetry/exporter-logs-otlp-grpc": "^0.55.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "^0.55.0", "@opentelemetry/exporter-trace-otlp-grpc": "^0.55.0", "@opentelemetry/instrumentation-pino": "^0.45.0", "@opentelemetry/resources": "^1.28.0", "@opentelemetry/sdk-logs": "^0.55.0", + "@opentelemetry/sdk-metrics": "^1.28.0", "@opentelemetry/sdk-node": "^0.55.0", "@opentelemetry/sdk-trace-base": "^1.28.0", "@opentelemetry/semantic-conventions": "^1.28.0", @@ -65,6 +67,43 @@ "supertest": "^7.2.2" } }, + "apps/backend/node_modules/@opentelemetry/core": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.30.1.tgz", + "integrity": "sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.28.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "apps/backend/node_modules/@opentelemetry/sdk-metrics": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.30.1.tgz", + "integrity": "sha512-q9zcZ0Okl8jRgmy7eNW3Ku1XSgg3sDLa5evHZpCwjspw7E8Is4K/haRPDJrBcX3YSn/Y7gUvFnByNYEKQNbNog==", + "dependencies": { + "@opentelemetry/core": "1.30.1", + "@opentelemetry/resources": "1.30.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "apps/backend/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz", + "integrity": "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==", + "engines": { + "node": ">=14" + } + }, "apps/frontend": { "name": "farma-clic-frontend", "version": "1.0.0", @@ -99,6 +138,7 @@ "version": "1.0.0", "dependencies": { "@expo/vector-icons": "^15.0.2", + "@grafana/faro-react-native": "^1.2.1", "@react-native-async-storage/async-storage": "2.2.0", "@tanstack/react-query": "^5.101.2", "axios": "^1.18.1", @@ -363,6 +403,157 @@ "react-native": "*" } }, + "apps/frontend-mobile/node_modules/@grafana/faro-core": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/@grafana/faro-core/-/faro-core-2.8.2.tgz", + "integrity": "sha512-63C6+N/P9/ySUMaGut8yVb1DkPuHS5I/lfRm97+aDXFj3+8pxRT/QzyXNe0r6KMU5O95wC9FLVGxG9ZvkwEhJQ==", + "dependencies": { + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/otlp-transformer": "^0.219.0" + } + }, + "apps/frontend-mobile/node_modules/@grafana/faro-react-native": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@grafana/faro-react-native/-/faro-react-native-1.3.0.tgz", + "integrity": "sha512-KeohD3S2xmiukL5YW3mOGDqvFiwpD9IzJ2EtZ50ktEsnA+6EMt2AtJ8RzJfAamGTYqemBpDiw51rqB4ID+C2xg==", + "dependencies": { + "@grafana/faro-core": "^2.7.0", + "@react-native-async-storage/async-storage": "^1.21.0", + "react-native-device-info": "^11.1.0" + }, + "peerDependencies": { + "@react-navigation/native": ">=6.0.0", + "react": ">=18.0.0", + "react-native": ">=0.70.0", + "react-native-mmkv": ">=2.0.0" + }, + "peerDependenciesMeta": { + "@react-navigation/native": { + "optional": true + }, + "react-native-mmkv": { + "optional": true + } + } + }, + "apps/frontend-mobile/node_modules/@grafana/faro-react-native/node_modules/@react-native-async-storage/async-storage": { + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.24.0.tgz", + "integrity": "sha512-W4/vbwUOYOjco0x3toB8QCr7EjIP6nE9G7o8PMguvvjYT5Awg09lyV4enACRx4s++PPulBiBSjL0KTFx2u0Z/g==", + "dependencies": { + "merge-options": "^3.0.4" + }, + "peerDependencies": { + "react-native": "^0.0.0-0 || >=0.60 <1.0" + } + }, + "apps/frontend-mobile/node_modules/@opentelemetry/api-logs": { + "version": "0.219.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.219.0.tgz", + "integrity": "sha512-FFx7YnaYJlIjqWW/AG/yAZ0L/NEY724PipXXXQLdtZPbLwBGbUMTGL1i/esI56TWfTUXxhLfpgrnWJCG8aUJyg==", + "dependencies": { + "@opentelemetry/api": "^1.3.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "apps/frontend-mobile/node_modules/@opentelemetry/core": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.8.0.tgz", + "integrity": "sha512-hd1Lfh8p545nNz+jq1Ejfz+Mn1hyLuxYn1YzTfFNrxr8urEWMNQLPf1Th8kjOH+HxwawCrtgBp8JpBUR4ZSgww==", + "dependencies": { + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "apps/frontend-mobile/node_modules/@opentelemetry/otlp-transformer": { + "version": "0.219.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.219.0.tgz", + "integrity": "sha512-aaYKAyXhw9VchKZVGOopD3Gw/kPsyrX2c6IQ0AW32mTjqmZOh5Y6Gf5OYqTNqVktAeBjmFinhyFaCwW6GYK9YQ==", + "dependencies": { + "@opentelemetry/api-logs": "0.219.0", + "@opentelemetry/core": "2.8.0", + "@opentelemetry/resources": "2.8.0", + "@opentelemetry/sdk-logs": "0.219.0", + "@opentelemetry/sdk-metrics": "2.8.0", + "@opentelemetry/sdk-trace-base": "2.8.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "apps/frontend-mobile/node_modules/@opentelemetry/resources": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.8.0.tgz", + "integrity": "sha512-qmXQ27ilDbUK/vGMqwL8D4/rhn76C+sherM4wTbjlfknR8Nvfc/hCxjRJPhkzZzUsPiNg16SA31NxMabwttRjg==", + "dependencies": { + "@opentelemetry/core": "2.8.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "apps/frontend-mobile/node_modules/@opentelemetry/sdk-logs": { + "version": "0.219.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.219.0.tgz", + "integrity": "sha512-s6lTKRakaPClvKoWHRChxnXjDMkM/TQ30ff78jN6EBGf7MI7VzANE5PU3f4z9qDUudWjvZjOLHG0rBnBKYvoXA==", + "dependencies": { + "@opentelemetry/api-logs": "0.219.0", + "@opentelemetry/core": "2.8.0", + "@opentelemetry/resources": "2.8.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.4.0 <1.10.0" + } + }, + "apps/frontend-mobile/node_modules/@opentelemetry/sdk-metrics": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.8.0.tgz", + "integrity": "sha512-UDBGaj6W0Rgy5rTTaoxs8gVGF/aGkAKyjurJv7se6wjRxJu7FoquTLT/vt54DZfo4crbprYfhX/SOK9+BPw1qg==", + "dependencies": { + "@opentelemetry/core": "2.8.0", + "@opentelemetry/resources": "2.8.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.9.0 <1.10.0" + } + }, + "apps/frontend-mobile/node_modules/@opentelemetry/sdk-trace-base": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.8.0.tgz", + "integrity": "sha512-mhU4jp+vW0mGbFRd+GeXHvmfA4aDqWjBjLC3pE5XMpLs0IE2ryYb019Ts2AQrOq67gaTF25D91+fgvEHDZEnuQ==", + "dependencies": { + "@opentelemetry/core": "2.8.0", + "@opentelemetry/resources": "2.8.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, "apps/frontend-mobile/node_modules/@react-native-async-storage/async-storage": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-2.2.0.tgz", @@ -1085,6 +1276,14 @@ } } }, + "apps/frontend-mobile/node_modules/react-native-device-info": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-11.1.0.tgz", + "integrity": "sha512-hzXJSObJdezEz0hF7MAJ3tGeoesuQWenXXt9mrQR9Mjb8kXpZ09rqSsZ/quNpJdZpQ3rYiFa3/0GFG5KNn9PBg==", + "peerDependencies": { + "react-native": "*" + } + }, "apps/frontend-mobile/node_modules/react-native-drawer-layout": { "version": "4.2.7", "resolved": "https://registry.npmjs.org/react-native-drawer-layout/-/react-native-drawer-layout-4.2.7.tgz", @@ -7141,6 +7340,273 @@ "node": ">=14" } }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-grpc/-/exporter-metrics-otlp-grpc-0.55.0.tgz", + "integrity": "sha512-9V6t3Tz1yFmXKXDjphgPSAsfQuG0bz9PlAVRY28D+wuG7Ut/Fv43XuccktdAcdrXx1MvCHdCcVmINLyYXLqTIg==", + "dependencies": { + "@grpc/grpc-js": "^1.7.1", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/api-logs": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.55.0.tgz", + "integrity": "sha512-3cpa+qI45VHYcA5c0bHM6VHo9gicv3p5mlLHNG3rLyjQU8b7e0st1rWtrUn3JbZ3DwwCfhKop4eQ9UuYlC6Pkg==", + "dependencies": { + "@opentelemetry/api": "^1.3.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/core": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.28.0.tgz", + "integrity": "sha512-ZLwRMV+fNDpVmF2WYUdBHlq0eOWtEaUJSusrzjGnBt7iSRvfjFE3RXYUZJrqou/wIDWV0DwQ5KIfYe9WXg9Xqw==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/otlp-exporter-base": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.55.0.tgz", + "integrity": "sha512-iHQI0Zzq3h1T6xUJTVFwmFl5Dt5y1es+fl4kM+k5T/3YvmVyeYkSiF+wHCg6oKrlUAJfk+t55kaAu3sYmt7ZYA==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-transformer": "0.55.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/otlp-transformer": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.55.0.tgz", + "integrity": "sha512-kVqEfxtp6mSN2Dhpy0REo1ghP4PYhC1kMHQJ2qVlO99Pc+aigELjZDfg7/YKmL71gR6wVGIeJfiql/eXL7sQPA==", + "dependencies": { + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "protobufjs": "^7.3.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/resources": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.28.0.tgz", + "integrity": "sha512-cIyXSVJjGeTICENN40YSvLDAq4Y2502hGK3iN7tfdynQLKWb3XWZQEkPc+eSx47kiy11YeFAlYkEfXwR1w8kfw==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/sdk-metrics": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.28.0.tgz", + "integrity": "sha512-43tqMK/0BcKTyOvm15/WQ3HLr0Vu/ucAl/D84NO7iSlv6O4eOprxSHa3sUtmYkaZWHqdDJV0AHVz/R6u4JALVQ==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.28.0.tgz", + "integrity": "sha512-ceUVWuCpIao7Y5xE02Xs3nQi0tOGmMea17ecBdwtCvdo9ekmO+ijc9RFDgfifMl7XCBf41zne/1POM3LqSTZDA==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz", + "integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==", + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.55.0.tgz", + "integrity": "sha512-3MqDNZzgXmLaiVo9gs9kCw/zPEaZYKIT0+jeMWscWHL/jrA9BNArTOYWUHEPabAQmWQ2BbvgNC7yzlqjoynQwA==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/api-logs": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.55.0.tgz", + "integrity": "sha512-3cpa+qI45VHYcA5c0bHM6VHo9gicv3p5mlLHNG3rLyjQU8b7e0st1rWtrUn3JbZ3DwwCfhKop4eQ9UuYlC6Pkg==", + "dependencies": { + "@opentelemetry/api": "^1.3.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/core": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.28.0.tgz", + "integrity": "sha512-ZLwRMV+fNDpVmF2WYUdBHlq0eOWtEaUJSusrzjGnBt7iSRvfjFE3RXYUZJrqou/wIDWV0DwQ5KIfYe9WXg9Xqw==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/otlp-exporter-base": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.55.0.tgz", + "integrity": "sha512-iHQI0Zzq3h1T6xUJTVFwmFl5Dt5y1es+fl4kM+k5T/3YvmVyeYkSiF+wHCg6oKrlUAJfk+t55kaAu3sYmt7ZYA==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-transformer": "0.55.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/otlp-transformer": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.55.0.tgz", + "integrity": "sha512-kVqEfxtp6mSN2Dhpy0REo1ghP4PYhC1kMHQJ2qVlO99Pc+aigELjZDfg7/YKmL71gR6wVGIeJfiql/eXL7sQPA==", + "dependencies": { + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "protobufjs": "^7.3.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/resources": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.28.0.tgz", + "integrity": "sha512-cIyXSVJjGeTICENN40YSvLDAq4Y2502hGK3iN7tfdynQLKWb3XWZQEkPc+eSx47kiy11YeFAlYkEfXwR1w8kfw==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/sdk-metrics": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.28.0.tgz", + "integrity": "sha512-43tqMK/0BcKTyOvm15/WQ3HLr0Vu/ucAl/D84NO7iSlv6O4eOprxSHa3sUtmYkaZWHqdDJV0AHVz/R6u4JALVQ==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.28.0.tgz", + "integrity": "sha512-ceUVWuCpIao7Y5xE02Xs3nQi0tOGmMea17ecBdwtCvdo9ekmO+ijc9RFDgfifMl7XCBf41zne/1POM3LqSTZDA==", + "dependencies": { + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz", + "integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==", + "engines": { + "node": ">=14" + } + }, "node_modules/@opentelemetry/exporter-trace-otlp-grpc": { "version": "0.55.0", "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.55.0.tgz", From 13182438410f7b816ea2fb5260a5e7ca0924c7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoni=20Nu=C3=B1ez=20Romeu?= Date: Mon, 13 Jul 2026 16:35:45 +0200 Subject: [PATCH 3/6] fix(backend): use string resource attribute keys instead of semantic-conventions named exports The resolved @opentelemetry/semantic-conventions version in CI does not export ATTR_SERVICE_NAMESPACE/ATTR_SERVICE_NAME as named exports, breaking the backend test import. Use plain 'service.name'/'service.namespace' string keys so the code is independent of the semantic-conventions version. --- apps/backend/src/tracing.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/backend/src/tracing.js b/apps/backend/src/tracing.js index c88059e..4c01bdd 100644 --- a/apps/backend/src/tracing.js +++ b/apps/backend/src/tracing.js @@ -14,20 +14,21 @@ import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentation import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'; import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc'; import * as resources from '@opentelemetry/resources'; -import { ATTR_SERVICE_NAME, ATTR_SERVICE_NAMESPACE } from '@opentelemetry/semantic-conventions'; import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino'; const serviceName = process.env.OTEL_SERVICE_NAME || 'farmaclic-backend'; const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT || 'http://localhost:4317'; +// Use plain string attribute keys (not the semantic-conventions named exports) +// so we don't depend on a specific @opentelemetry/semantic-conventions version. const resource = typeof resources.resourceFromAttributes === 'function' ? resources.resourceFromAttributes({ - [ATTR_SERVICE_NAME]: serviceName, - [ATTR_SERVICE_NAMESPACE]: 'farmaclic', + 'service.name': serviceName, + 'service.namespace': 'farmaclic', }) : new resources.Resource({ - [ATTR_SERVICE_NAME]: serviceName, - [ATTR_SERVICE_NAMESPACE]: 'farmaclic', + 'service.name': serviceName, + 'service.namespace': 'farmaclic', }); // Metrics → OTLP → Alloy → Prometheus remote_write. The PeriodicExportingMetricReader From 52b5b72cfb50e68f7ec00a6b321c2887f85e77a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoni=20Nu=C3=B1ez=20Romeu?= Date: Tue, 14 Jul 2026 12:42:02 +0200 Subject: [PATCH 4/6] =?UTF-8?q?ci:=20optimize=20test=20performance=20?= =?UTF-8?q?=E2=80=94=20from=20~3h=20to=203.5s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Lazy-load tesseract.js only in OCR route (skips 30MB WASM download) - Conditional tracing.js import (skip OTel gRPC in test mode) - Remove unused barcode-detector import - Add testTimeout/openHandlesTimeout to jest.config.js - Add --forceExitTimeout=30000 to test script - Split CI test jobs into parallel workflows (backend/frontend/mobile) - Add timeout-minutes: 15 to all test jobs - Use npm ci --ignore-scripts + selective native rebuild --- .gitea/workflows/docker.yaml | 10 ++-- .gitea/workflows/test-branches.yaml | 84 +++++++++++++++++++++-------- apps/backend/jest.config.js | 4 ++ apps/backend/package.json | 2 +- apps/backend/server.js | 8 +-- 5 files changed, 79 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index 92670ae..b1e224d 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -31,6 +31,7 @@ jobs: needs: detect-changes if: needs.detect-changes.outputs.backend == 'true' runs-on: ubuntu-latest + timeout-minutes: 15 steps: - uses: actions/checkout@v4 - name: Setup Node.js @@ -39,15 +40,18 @@ jobs: node-version: '22' cache: 'npm' - name: Install dependencies - run: npm ci + run: npm ci --ignore-scripts + - name: Install backend native deps + run: npm rebuild sqlite3 bcrypt --workspace=farma-clic-backend - name: Run tests - run: npm test --workspace=farma-clic-backend -- --ci + run: npm test --workspace=farma-clic-backend test-frontend: name: Frontend Tests needs: detect-changes if: needs.detect-changes.outputs.frontend == 'true' runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 - name: Setup Node.js @@ -56,7 +60,7 @@ jobs: node-version: '22' cache: 'npm' - name: Install dependencies - run: npm ci + run: npm ci --ignore-scripts - name: Run tests run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic diff --git a/.gitea/workflows/test-branches.yaml b/.gitea/workflows/test-branches.yaml index 9bfbf3f..877a4d4 100644 --- a/.gitea/workflows/test-branches.yaml +++ b/.gitea/workflows/test-branches.yaml @@ -6,42 +6,82 @@ on: - 'main' jobs: - test: - name: Run Tests + detect-changes: + name: Detect Changes runs-on: ubuntu-latest + outputs: + backend: ${{ steps.filter.outputs.backend }} + frontend: ${{ steps.filter.outputs.frontend }} + frontend-mobile: ${{ steps.filter.outputs.frontend-mobile }} steps: - - name: Checkout Code - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 + id: filter with: - fetch-depth: 2 - - - name: Detect Changes - id: changes - run: | - BASE=${{ github.event.before }} - [ -z "$BASE" ] || [ "$BASE" = "0000000000000000000000000000000000000000" ] && BASE=$(git rev-parse HEAD~1) - echo "backend=$(git diff --name-only "$BASE"...HEAD | grep -qE '^(apps/backend/|packages/)' && echo true || echo false)" >> "$GITHUB_OUTPUT" - echo "frontend=$(git diff --name-only "$BASE"...HEAD | grep -qE '^(apps/frontend/|packages/)' && echo true || echo false)" >> "$GITHUB_OUTPUT" - echo "frontend-mobile=$(git diff --name-only "$BASE"...HEAD | grep -qE '^(apps/frontend-mobile/|packages/)' && echo true || echo false)" >> "$GITHUB_OUTPUT" + filters: | + backend: + - 'apps/backend/**' + - 'packages/**' + frontend: + - 'apps/frontend/**' + - 'packages/**' + frontend-mobile: + - 'apps/frontend-mobile/**' + - 'packages/**' + test-backend: + name: Backend Tests + needs: detect-changes + if: needs.detect-changes.outputs.backend == 'true' + runs-on: ubuntu-latest + timeout-minutes: 15 + steps: + - uses: actions/checkout@v4 - name: Setup Node.js uses: actions/setup-node@v4 with: node-version: '22' cache: 'npm' - - - name: Install Dependencies - run: npm ci - + - name: Install dependencies + run: npm ci --ignore-scripts + - name: Install backend native deps + run: npm rebuild sqlite3 bcrypt --workspace=farma-clic-backend - name: Run Backend Tests - if: steps.changes.outputs.backend == 'true' - run: npm test --workspace=farma-clic-backend -- --ci + run: npm test --workspace=farma-clic-backend + test-frontend: + name: Frontend Tests + needs: detect-changes + if: needs.detect-changes.outputs.frontend == 'true' + runs-on: ubuntu-latest + timeout-minutes: 10 + steps: + - uses: actions/checkout@v4 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '22' + cache: 'npm' + - name: Install dependencies + run: npm ci --ignore-scripts - name: Run Frontend Tests - if: steps.changes.outputs.frontend == 'true' run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic + test-frontend-mobile: + name: Frontend Mobile Tests + needs: detect-changes + if: needs.detect-changes.outputs.frontend-mobile == 'true' + runs-on: ubuntu-latest + timeout-minutes: 10 + steps: + - uses: actions/checkout@v4 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '22' + cache: 'npm' + - name: Install dependencies + run: npm ci --ignore-scripts - name: Run Frontend Mobile Tests - if: steps.changes.outputs.frontend-mobile == 'true' run: npm test --workspace=frontend-mobile -- --ci continue-on-error: true diff --git a/apps/backend/jest.config.js b/apps/backend/jest.config.js index 99c960b..d3766c0 100644 --- a/apps/backend/jest.config.js +++ b/apps/backend/jest.config.js @@ -3,4 +3,8 @@ export default { transform: {}, moduleFileExtensions: ['js', 'json'], testMatch: ['**/__tests__/**/*.test.js'], + testTimeout: 15000, + openHandlesTimeout: 5000, + // Run test files in parallel (not individual tests within a file) + // workerIdleMemoryLimit: '512MB', } diff --git a/apps/backend/package.json b/apps/backend/package.json index 6134673..e7cd4c7 100644 --- a/apps/backend/package.json +++ b/apps/backend/package.json @@ -12,7 +12,7 @@ "migrate": "node migrate.js", "reset-db": "bash reset-db.sh", "import-farmacias": "node import-farmacias.js", - "test": "NODE_OPTIONS='--experimental-vm-modules' npx jest --forceExit" + "test": "NODE_OPTIONS='--experimental-vm-modules' npx jest --ci --forceExit --forceExitTimeout=30000" }, "keywords": [], "author": "", diff --git a/apps/backend/server.js b/apps/backend/server.js index be001cd..4da5bf3 100644 --- a/apps/backend/server.js +++ b/apps/backend/server.js @@ -1,5 +1,8 @@ // OpenTelemetry SDK — must be imported first to instrument http, express, pg, etc. -import './src/tracing.js'; +// Skipped in test to avoid gRPC connection attempts to a non-existent collector. +if (process.env.NODE_ENV !== 'test') { + await import('./src/tracing.js'); +} import express from 'express'; import redisClient from './redis-client.js'; @@ -19,8 +22,6 @@ import webpush from 'web-push'; import pino from 'pino'; import pinoHttp from 'pino-http'; import multer from 'multer'; -import { createWorker } from 'tesseract.js'; -import { BarcodeDetector } from 'barcode-detector'; import { searchMedicines, getMedicineDetails, searchOTC } from './cima-service.js'; import { searchBabyProducts, getBabyProductDetails } from './off-service.js'; import { runFarmaciaWebhookImport, DEFAULT_FARMACIAS_WEBHOOK, importPharmaciesFromRows } from './farmacias-webhook-import.js'; @@ -914,6 +915,7 @@ app.post('/api/tsi/ocr', upload.single('photo'), async (req, res) => { console.log('[OCR] Processing image, size:', req.file.size, 'bytes'); + const { createWorker } = await import('tesseract.js'); const worker = await createWorker('spa+eng'); const { data } = await worker.recognize(req.file.buffer); await worker.terminate(); From e281bd4fa8ed25ca2d6dfb9cf17b5b2ccbbd23a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoni=20Nu=C3=B1ez=20Romeu?= Date: Tue, 14 Jul 2026 13:03:46 +0200 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20skip=20Redis=20connection=20in=20tes?= =?UTF-8?q?t=20mode=20=E2=80=94=20prevents=20CI=20hang?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The top-level await redisClient.connect() in redis-client.js was blocking module import when no Redis server is available (CI env). Add NODE_ENV guard + reconnect strategy with max retries. --- apps/backend/redis-client.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/backend/redis-client.js b/apps/backend/redis-client.js index ef236a4..83bc16c 100644 --- a/apps/backend/redis-client.js +++ b/apps/backend/redis-client.js @@ -5,7 +5,11 @@ import * as appMetrics from './src/metrics.js'; const redisClient = createClient({ socket: { host: process.env.REDIS_HOST || 'localhost', - port: process.env.REDIS_PORT || 6379 + port: process.env.REDIS_PORT || 6379, + reconnectStrategy: (retries) => { + if (retries > 10) return new Error('Redis max retries reached'); + return Math.min(retries * 100, 3000); + } }, password: process.env.REDIS_PASSWORD || undefined }); @@ -44,5 +48,9 @@ redisClient.setEx = async (...args) => { // Connect to Redis await redisClient.connect(); +// Connect to Redis — skip in test (services are mocked) or when REDIS_URL is unset +if (process.env.NODE_ENV !== 'test') { + await redisClient.connect(); +} export default redisClient; From 809d4b8a7f195de18c8a138705fba07b75ac72cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoni=20Nu=C3=B1ez=20Romeu?= Date: Tue, 14 Jul 2026 13:38:16 +0200 Subject: [PATCH 6/6] Fixed backend test --- apps/backend/redis-client.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/backend/redis-client.js b/apps/backend/redis-client.js index 83bc16c..498a127 100644 --- a/apps/backend/redis-client.js +++ b/apps/backend/redis-client.js @@ -46,8 +46,6 @@ redisClient.setEx = async (...args) => { } }; -// Connect to Redis -await redisClient.connect(); // Connect to Redis — skip in test (services are mocked) or when REDIS_URL is unset if (process.env.NODE_ENV !== 'test') { await redisClient.connect();