feat: harmonize log and metrics

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

@@ -4,6 +4,7 @@ import {
 } from "@/lib/graphql/Query/StartPage/StartPage.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 {
@@ -13,14 +14,6 @@ import {
 } from "@/utils/generateTag"
 
 import { startPageRefsSchema, startPageSchema } from "./output"
-import {
-  getStartPageCounter,
-  getStartPageFailCounter,
-  getStartPageRefsCounter,
-  getStartPageRefsFailCounter,
-  getStartPageRefsSuccessCounter,
-  getStartPageSuccessCounter,
-} from "./telemetry"
 import { getConnections } from "./utils"
 
 import {
@@ -36,13 +29,14 @@ export const startPageQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
     const { lang, uid } = ctx
 
-    getStartPageRefsCounter.add(1, { lang, uid: `${uid}` })
-    console.info(
-      "contentstack.startPage.refs start",
-      JSON.stringify({
-        query: { lang, uid },
-      })
+    const getStartPageRefsCounter = createCounter(
+      "trpc.contentstack",
+      "startPage.get.refs"
     )
+    const metricsGetStartPageRefs = getStartPageRefsCounter.init({ lang, uid })
+
+    metricsGetStartPageRefs.start()
+
     const refsResponse = await request<GetStartPageRefsSchema>(
       GetStartPageRefs,
       {
@@ -56,56 +50,26 @@ export const startPageQueryRouter = router({
     )
     if (!refsResponse.data) {
       const notFoundError = notFound(refsResponse)
-      getStartPageRefsFailCounter.add(1, {
-        lang,
-        uid,
-        error_type: "not_found",
-        error: JSON.stringify({ code: notFoundError.code }),
-      })
-      console.error(
-        "contentstack.startPage.refs not found error",
-        JSON.stringify({
-          query: { lang, uid },
-          error: { code: notFoundError.code },
-        })
-      )
+      metricsGetStartPageRefs.noDataError()
       throw notFoundError
     }
 
     const validatedRefsData = startPageRefsSchema.safeParse(refsResponse.data)
 
     if (!validatedRefsData.success) {
-      getStartPageRefsFailCounter.add(1, {
-        lang,
-        uid,
-        error_type: "validation_error",
-        error: JSON.stringify(validatedRefsData.error),
-      })
-      console.error(
-        "contentstack.startPage.refs validation error",
-        JSON.stringify({
-          query: { lang, uid },
-          error: validatedRefsData.error,
-        })
-      )
+      metricsGetStartPageRefs.validationError(validatedRefsData.error)
       return null
     }
 
-    getStartPageRefsSuccessCounter.add(1, { lang, uid: `${uid}` })
-    console.info(
-      "contentstack.startPage.refs success",
-      JSON.stringify({
-        query: { lang, uid },
-      })
-    )
+    metricsGetStartPageRefs.success()
 
-    getStartPageCounter.add(1, { lang, uid: `${uid}` })
-    console.info(
-      "contentstack.startPage start",
-      JSON.stringify({
-        query: { lang, uid },
-      })
+    const getStartPageCounter = createCounter(
+      "trpc.contentstack",
+      "startPage.get"
     )
+    const metricsGetStartPage = getStartPageCounter.init({ lang, uid })
+
+    metricsGetStartPage.start()
 
     const connections = getConnections(validatedRefsData.data)
 
@@ -113,6 +77,7 @@ export const startPageQueryRouter = router({
       generateTagsFromSystem(lang, connections),
       generateTag(lang, validatedRefsData.data.start_page.system.uid),
     ].flat()
+
     const response = await request<GetStartPageData>(
       GetStartPage,
       {
@@ -127,48 +92,18 @@ export const startPageQueryRouter = router({
 
     if (!response.data) {
       const notFoundError = notFound(response)
-      getStartPageFailCounter.add(1, {
-        lang,
-        uid: `${uid}`,
-        error_type: "not_found",
-        error: JSON.stringify({ code: notFoundError.code }),
-      })
-      console.error(
-        "contentstack.startPage not found error",
-        JSON.stringify({
-          query: { lang, uid },
-          error: { code: notFoundError.code },
-        })
-      )
+      metricsGetStartPage.noDataError()
       throw notFoundError
     }
 
     const startPage = startPageSchema.safeParse(response.data)
 
     if (!startPage.success) {
-      getStartPageFailCounter.add(1, {
-        lang,
-        uid: `${uid}`,
-        error_type: "validation_error",
-        error: JSON.stringify(startPage.error),
-      })
-      console.error(
-        "contentstack.startPage validation error",
-        JSON.stringify({
-          query: { lang, uid },
-          error: startPage.error,
-        })
-      )
+      metricsGetStartPage.validationError(startPage.error)
       return null
     }
 
-    getStartPageSuccessCounter.add(1, { lang, uid: `${uid}` })
-    console.info(
-      "contentstack.startPage success",
-      JSON.stringify({
-        query: { lang, uid },
-      })
-    )
+    metricsGetStartPage.success()
 
     const system = startPage.data.start_page.system
     const tracking: TrackingSDKPageData = {

apps/scandic-web/server/routers/contentstack/startPage/telemetry.ts

@@ -1,23 +0,0 @@
-import { metrics } from "@opentelemetry/api"
-
-const meter = metrics.getMeter("trpc.contentstack.startPage")
-
-export const getStartPageRefsCounter = meter.createCounter(
-  "trpc.contentstack.startPage.get"
-)
-export const getStartPageRefsFailCounter = meter.createCounter(
-  "trpc.contentstack.startPage.get-fail"
-)
-export const getStartPageRefsSuccessCounter = meter.createCounter(
-  "trpc.contentstack.startPage.get-success"
-)
-
-export const getStartPageCounter = meter.createCounter(
-  "trpc.contentstack.startPage.get"
-)
-export const getStartPageSuccessCounter = meter.createCounter(
-  "trpc.contentstack.startPage.get-success"
-)
-export const getStartPageFailCounter = meter.createCounter(
-  "trpc.contentstack.startPage.get-fail"
-)