Refactor metric tagging in object reporting and request tracing (#511)

Author: clostao

apps/backend/src/app/controllers/object.ts

@@ -11,6 +11,7 @@ import {
 } from '../../shared/utils/neverthrow.js'
 import { handleError } from '../../errors/index.js'
 import { sendMetricToVictoria } from '../../infrastructure/drivers/vmetrics.js'
+import { config } from '../../config.js'
 
 const logger = createLogger('http:controllers:object')
 
@@ -448,9 +449,13 @@ objectController.post(
     const { cid } = req.params
 
     logger.info('Reporting object', { cid })
+    const tags = {
+      chain: config.monitoring.metricEnvironmentTag,
+      ip: req.ip?.toString() ?? 'unknown',
+    }
     sendMetricToVictoria({
       measurement: 'object_report',
-      tag: req.ip?.toString() ?? 'unknown',
+      tags,
       fields: {
         cid,
         ip: req.ip?.toString() ?? 'unknown',

apps/backend/src/app/middlewares/requestTrace.ts

@@ -23,13 +23,9 @@ export const requestTrace: RequestHandler = (req, res) => {
     provider,
   }
 
-  const tag = Object.entries(tags)
-    .map(([key, value]) => `${key}=${value}`)
-    .join(',')
-
   const metric: Metric = {
     measurement: 'auto_drive_api_request',
-    tag,
+    tags,
     fields: {
       status: res.statusCode,
       method,

apps/backend/src/core/objects/interactions.ts

@@ -17,13 +17,9 @@ const createMetric = (type: InteractionType, size: bigint): Metric => {
     type,
   }
 
-  const tag = Object.entries(tags)
-    .map(([key, value]) => `${key}=${value}`)
-    .join(',')
-
   return {
     measurement: 'auto_drive_interactions',
-    tag,
+    tags,
     fields: {
       size,
     },
@@ -47,7 +43,7 @@ const createInteraction = async (
     logger.trace(
       'Sending metric to Victoria (measurement=%s, tag=%s)',
       metric.measurement,
-      metric.tag,
+      JSON.stringify(metric.tags),
     )
     sendMetricToVictoria(metric)
 

apps/backend/src/infrastructure/drivers/vmetrics.ts

@@ -5,17 +5,21 @@ const logger = createLogger('drivers:metrics')
 
 export interface Metric {
   measurement: string
-  tag: string
+  tags: Record<string, string>
   fields: Record<string, string | number | bigint>
   timestamp?: number
 }
 
 export const sendMetricToVictoria = async (metric: Metric): Promise<void> => {
   try {
+    const tag = Object.entries(metric.tags)
+      .map(([key, value]) => `${key}=${value}`)
+      .join(',')
+
     const values = Object.entries(metric.fields).map(
       ([key, value]) => `${key}=${value}`,
     )
-    const data = `${metric.measurement},${metric.tag} ${values.join(',')}`
+    const data = `${metric.measurement},${tag} ${values.join(',')}`
 
     const basicAuthToken = Buffer.from(
       `${config.monitoring.auth.username}:${config.monitoring.auth.password}`,
@@ -37,7 +41,7 @@ export const sendMetricToVictoria = async (metric: Metric): Promise<void> => {
     })
     if (!response.ok) {
       throw new Error(
-        `Failed to send metric to Victoria: ${response.statusText}`,
+        `Failed to send metric to Victoria: ${response.statusText}: ${await response.text()}`,
       )
     } else {
       logger.debug('Metric %s sent to Victoria', metric.measurement)