feat: harmonize log and metrics

apps/scandic-web/server/routers/contentstack/loyaltyPage/query.ts

@@ -1,11 +1,10 @@
-import { metrics } from "@opentelemetry/api"
-
 import {
   GetLoyaltyPage,
   GetLoyaltyPageRefs,
 } from "@/lib/graphql/Query/LoyaltyPage/LoyaltyPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
+import { createCounter } from "@/server/telemetry"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 
 import {
@@ -26,39 +25,22 @@ import type {
   GetLoyaltyPageSchema,
 } from "@/types/trpc/routers/contentstack/loyaltyPage"
 
-const meter = metrics.getMeter("trpc.loyaltyPage")
-// OpenTelemetry metrics: LoyaltyPage
-const getLoyaltyPageRefsCounter = meter.createCounter(
-  "trpc.contentstack.loyaltyPage.get"
-)
-const getLoyaltyPageRefsSuccessCounter = meter.createCounter(
-  "trpc.contentstack.loyaltyPage.get-success"
-)
-const getLoyaltyPageRefsFailCounter = meter.createCounter(
-  "trpc.contentstack.loyaltyPage.get-fail"
-)
-const getLoyaltyPageCounter = meter.createCounter(
-  "trpc.contentstack.loyaltyPage.get"
-)
-const getLoyaltyPageSuccessCounter = meter.createCounter(
-  "trpc.contentstack.loyaltyPage.get-success"
-)
-const getLoyaltyPageFailCounter = meter.createCounter(
-  "trpc.contentstack.loyaltyPage.get-fail"
-)
-
 export const loyaltyPageQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
     const { lang, uid } = ctx
-    const metricsVariables = { lang, uid }
-    const variables = { locale: lang, uid }
-    getLoyaltyPageRefsCounter.add(1, metricsVariables)
-    console.info(
-      "contentstack.loyaltyPage.refs start",
-      JSON.stringify({
-        query: metricsVariables,
-      })
+
+    const getLoyaltyPageRefsCounter = createCounter(
+      "trpc.contentstack",
+      "loyaltyPage.get.refs"
     )
+    const metricsGetLoyaltyPageRefs = getLoyaltyPageRefsCounter.init({
+      lang,
+      uid,
+    })
+
+    metricsGetLoyaltyPageRefs.start()
+
+    const variables = { locale: lang, uid }
     const refsResponse = await request<GetLoyaltyPageRefsSchema>(
       GetLoyaltyPageRefs,
       variables,
@@ -70,20 +52,7 @@ export const loyaltyPageQueryRouter = router({
 
     if (!refsResponse.data) {
       const notFoundError = notFound(refsResponse)
-      getLoyaltyPageRefsFailCounter.add(1, {
-        ...metricsVariables,
-        error_type: "http_error",
-        error: JSON.stringify({
-          code: notFoundError.code,
-        }),
-      })
-      console.error(
-        "contentstack.loyaltyPage.refs not found error",
-        JSON.stringify({
-          query: metricsVariables,
-          error: { code: notFoundError.code },
-        })
-      )
+      metricsGetLoyaltyPageRefs.noDataError()
       throw notFoundError
     }
 
@@ -91,27 +60,11 @@ export const loyaltyPageQueryRouter = router({
       refsResponse.data
     )
     if (!validatedLoyaltyPageRefs.success) {
-      getLoyaltyPageRefsFailCounter.add(1, {
-        ...metricsVariables,
-        error_type: "validation_error",
-        error: JSON.stringify(validatedLoyaltyPageRefs.error),
-      })
-      console.error(
-        "contentstack.loyaltyPage.refs validation error",
-        JSON.stringify({
-          query: metricsVariables,
-          error: validatedLoyaltyPageRefs.error,
-        })
-      )
+      metricsGetLoyaltyPageRefs.validationError(validatedLoyaltyPageRefs.error)
       return null
     }
-    getLoyaltyPageRefsSuccessCounter.add(1, metricsVariables)
-    console.info(
-      "contentstack.loyaltyPage.refs success",
-      JSON.stringify({
-        query: metricsVariables,
-      })
-    )
+
+    metricsGetLoyaltyPageRefs.success()
 
     const connections = getConnections(validatedLoyaltyPageRefs.data)
 
@@ -119,13 +72,15 @@ export const loyaltyPageQueryRouter = router({
       generateTagsFromSystem(lang, connections),
       generateTag(lang, validatedLoyaltyPageRefs.data.loyalty_page.system.uid),
     ].flat()
-    getLoyaltyPageCounter.add(1, metricsVariables)
-    console.info(
-      "contentstack.loyaltyPage start",
-      JSON.stringify({
-        query: metricsVariables,
-      })
+
+    const getLoyaltyPageCounter = createCounter(
+      "trpc.contentstack",
+      "loyaltyPage.get"
     )
+    const metricsGetLoyaltyPage = getLoyaltyPageCounter.init({ lang, uid })
+
+    metricsGetLoyaltyPage.start()
+
     const response = await request<GetLoyaltyPageSchema>(
       GetLoyaltyPage,
       variables,
@@ -137,35 +92,13 @@ export const loyaltyPageQueryRouter = router({
 
     if (!response.data) {
       const notFoundError = notFound(response)
-      getLoyaltyPageFailCounter.add(1, {
-        ...metricsVariables,
-        error_type: "http_error",
-        error: JSON.stringify({ code: notFoundError.code }),
-      })
-      console.error(
-        "contentstack.loyaltyPage not found error",
-        JSON.stringify({
-          query: metricsVariables,
-          error: { code: notFoundError.code },
-        })
-      )
-      throw notFound(response)
+      metricsGetLoyaltyPage.noDataError()
+      throw notFoundError
     }
 
     const validatedLoyaltyPage = loyaltyPageSchema.safeParse(response.data)
     if (!validatedLoyaltyPage.success) {
-      getLoyaltyPageFailCounter.add(1, {
-        ...metricsVariables,
-        error_type: "validation_error",
-        error: JSON.stringify(validatedLoyaltyPage.error),
-      })
-      console.error(
-        "contentstack.loyaltyPage validation error",
-        JSON.stringify({
-          query: metricsVariables,
-          error: validatedLoyaltyPage.error,
-        })
-      )
+      metricsGetLoyaltyPage.validationError(validatedLoyaltyPage.error)
       return null
     }
 
@@ -182,11 +115,8 @@ export const loyaltyPageQueryRouter = router({
       siteSections: validatedLoyaltyPage.data.trackingProps.url,
       siteVersion: "new-web",
     }
-    getLoyaltyPageSuccessCounter.add(1, metricsVariables)
-    console.info(
-      "contentstack.loyaltyPage success",
-      JSON.stringify({ query: metricsVariables })
-    )
+
+    metricsGetLoyaltyPage.success()
 
     // Assert LoyaltyPage type to get correct typings for RTE fields
     return {