fix: address Code Reviewer findings for Datadog/Sentry integration FRE-4806
P1: Load dd-trace before other modules via datadog-init.ts entry point P1: Batch all CloudWatch metrics into single PutMetricDataCommand per request P2: Deduplicate warning logs with else-if for high latency vs error P3: Add response.ok check to Datadog log forwarding fetch P3: Update getSentryHub() to use getCurrentScope() for Sentry SDK 8.x Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
|
||||
import { emitLatency, emitRequestCount, emitError } from '@shieldai/monitoring';
|
||||
import { emitBatchMetrics, emitError } from '@shieldai/monitoring';
|
||||
|
||||
const SERVICE_NAME = process.env.DD_SERVICE || 'shieldai-api';
|
||||
|
||||
@@ -10,15 +10,38 @@ export async function monitoringMiddleware(fastify: FastifyInstance) {
|
||||
const method = request.method;
|
||||
const url = request.url;
|
||||
|
||||
// Emit request count
|
||||
await emitRequestCount(SERVICE_NAME, statusCode);
|
||||
// Batch all metrics into a single PutMetricDataCommand to avoid rate limits
|
||||
await emitBatchMetrics({
|
||||
serviceName: SERVICE_NAME,
|
||||
data: [
|
||||
{
|
||||
metricName: 'api_requests',
|
||||
value: 1,
|
||||
unit: 'Count',
|
||||
dimensions: { status_class: String(Math.floor(statusCode / 100)) + 'xx' },
|
||||
},
|
||||
{
|
||||
metricName: 'api_latency',
|
||||
value: responseTime,
|
||||
unit: 'Milliseconds',
|
||||
dimensions: { percentile: 'p50' },
|
||||
},
|
||||
{
|
||||
metricName: 'api_latency',
|
||||
value: responseTime,
|
||||
unit: 'Milliseconds',
|
||||
dimensions: { percentile: 'p95' },
|
||||
},
|
||||
{
|
||||
metricName: 'api_latency',
|
||||
value: responseTime,
|
||||
unit: 'Milliseconds',
|
||||
dimensions: { percentile: 'p99' },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
// Emit latency metrics
|
||||
await emitLatency(SERVICE_NAME, responseTime, 'p50');
|
||||
await emitLatency(SERVICE_NAME, responseTime, 'p95');
|
||||
await emitLatency(SERVICE_NAME, responseTime, 'p99');
|
||||
|
||||
// Emit error metric for 5xx
|
||||
// Emit error metric for 5xx (separate call since it has different dimensions)
|
||||
if (statusCode >= 500) {
|
||||
await emitError(SERVICE_NAME, 'server_error');
|
||||
fastify.log.warn({
|
||||
@@ -31,8 +54,8 @@ export async function monitoringMiddleware(fastify: FastifyInstance) {
|
||||
});
|
||||
}
|
||||
|
||||
// Log high latency requests (>2s)
|
||||
if (responseTime > 2000) {
|
||||
// Log high latency requests (>2s) — only when not already logged as error
|
||||
else if (responseTime > 2000) {
|
||||
fastify.log.warn({
|
||||
event: 'high_latency',
|
||||
method,
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
// dd-trace must be initialized before any other module is loaded for auto-instrumentation
|
||||
import '@shieldai/monitoring/datadog-init';
|
||||
import Fastify from "fastify";
|
||||
import cors from "@fastify/cors";
|
||||
import helmet from "@fastify/helmet";
|
||||
@@ -11,13 +13,9 @@ import { darkwatchRoutes } from "./routes/darkwatch.routes";
|
||||
import { voiceprintRoutes } from "./routes/voiceprint.routes";
|
||||
import { correlationRoutes } from "./routes/correlation.routes";
|
||||
import { extensionRoutes } from "./routes/extension.routes";
|
||||
import { initDatadog, initSentry, initDatadogLogs, captureSentryError } from "@shieldai/monitoring";
|
||||
import { captureSentryError } from "@shieldai/monitoring";
|
||||
import { getCorsOrigins } from "./config/api.config";
|
||||
|
||||
initDatadog();
|
||||
initSentry();
|
||||
initDatadogLogs();
|
||||
|
||||
const app = Fastify({
|
||||
logger: {
|
||||
level: process.env.LOG_LEVEL || "info",
|
||||
|
||||
Reference in New Issue
Block a user