feat: harmonize log and metrics

apps/scandic-web/server/routers/contentstack/destinationCountryPage/utils.ts

@@ -1,20 +1,13 @@
 import { GetDestinationCityListData } from "@/lib/graphql/Query/DestinationCityPage/DestinationCityListData.graphql"
 import { GetCountryPageUrls } from "@/lib/graphql/Query/DestinationCountryPage/DestinationCountryPageUrl.graphql"
 import { request } from "@/lib/graphql/request"
+import { createCounter } from "@/server/telemetry"
 
 import { generateTag, generateTagsFromSystem } from "@/utils/generateTag"
 
 import { getCitiesByCountry } from "../../hotels/utils"
 import { destinationCityListDataSchema } from "../destinationCityPage/output"
 import { countryPageUrlsSchema } from "./output"
-import {
-  getCityListDataCounter,
-  getCityListDataFailCounter,
-  getCityListDataSuccessCounter,
-  getCountryPageUrlsCounter,
-  getCountryPageUrlsFailCounter,
-  getCountryPageUrlsSuccessCounter,
-} from "./telemetry"
 
 import { ApiCountry, type Country } from "@/types/enums/country"
 import { DestinationCountryPageEnum } from "@/types/enums/destinationCountryPage"
@@ -77,11 +70,16 @@ export async function getCityListDataByCityIdentifier(
   lang: Lang,
   cityIdentifier: string
 ) {
-  getCityListDataCounter.add(1, { lang, cityIdentifier })
-  console.info(
-    "contentstack.cityListData start",
-    JSON.stringify({ query: { lang, cityIdentifier } })
+  const getCityListDataCounter = createCounter(
+    "trpc.contentstack",
+    "cityListData.get"
   )
+  const metricsGetCityListData = getCityListDataCounter.init({
+    lang,
+    cityIdentifier,
+  })
+
+  metricsGetCityListData.start()
 
   const response = await request<GetDestinationCityListDataResponse>(
     GetDestinationCityListData,
@@ -96,15 +94,8 @@ export async function getCityListDataByCityIdentifier(
   )
 
   if (!response.data) {
-    getCityListDataFailCounter.add(1, {
-      lang,
-      cityIdentifier,
-      error_type: "not_found",
-      error: `Destination city page not found for cityIdentifier: ${cityIdentifier}`,
-    })
-    console.error(
-      "contentstack.cityListData not found error",
-      JSON.stringify({ query: { lang, cityIdentifier } })
+    metricsGetCityListData.dataError(
+      `Failed to get destination city page for cityIdentifier: ${cityIdentifier}`
     )
     return null
   }
@@ -114,26 +105,11 @@ export async function getCityListDataByCityIdentifier(
   )
 
   if (!validatedResponse.success) {
-    getCityListDataFailCounter.add(1, {
-      lang,
-      cityIdentifier,
-      error_type: "validation_error",
-      error: JSON.stringify(validatedResponse.error),
-    })
-    console.error(
-      "contentstack.cityListData validation error",
-      JSON.stringify({
-        query: { lang, cityIdentifier },
-        error: validatedResponse.error,
-      })
-    )
+    metricsGetCityListData.validationError(validatedResponse.error)
     return null
   }
-  getCityListDataSuccessCounter.add(1, { lang, cityIdentifier })
-  console.info(
-    "contentstack.cityListData success",
-    JSON.stringify({ query: { lang, cityIdentifier } })
-  )
+
+  metricsGetCityListData.success()
 
   return validatedResponse.data
 }
@@ -172,11 +148,13 @@ export async function getCityPages(
 }
 
 export async function getCountryPageUrls(lang: Lang) {
-  getCountryPageUrlsCounter.add(1, { lang })
-  console.info(
-    "contentstack.countryPageUrls start",
-    JSON.stringify({ query: { lang } })
+  const getCountryPageUrlsCounter = createCounter(
+    "trpc.contentstack",
+    "getCountryPageUrls"
   )
+  const metricsGetCountryPageUrls = getCountryPageUrlsCounter.init({ lang })
+
+  metricsGetCountryPageUrls.start()
 
   const tag = `${lang}:country_page_urls`
   const response = await request<GetCountryPageUrlsData>(
@@ -191,14 +169,8 @@ export async function getCountryPageUrls(lang: Lang) {
   )
 
   if (!response.data) {
-    getCountryPageUrlsFailCounter.add(1, {
-      lang,
-      error_type: "not_found",
-      error: `Country pages not found for lang: ${lang}`,
-    })
-    console.error(
-      "contentstack.countryPageUrls not found error",
-      JSON.stringify({ query: { lang } })
+    metricsGetCountryPageUrls.dataError(
+      `Failed to get country pages for lang: ${lang}`
     )
     return []
   }
@@ -208,26 +180,11 @@ export async function getCountryPageUrls(lang: Lang) {
   )
 
   if (!validatedCountryPageUrls.success) {
-    getCountryPageUrlsFailCounter.add(1, {
-      lang,
-      error_type: "validation_error",
-      error: JSON.stringify(validatedCountryPageUrls.error),
-    })
-    console.error(
-      "contentstack.countryPageUrls validation error",
-      JSON.stringify({
-        query: { lang },
-        error: validatedCountryPageUrls.error,
-      })
-    )
+    metricsGetCountryPageUrls.validationError(validatedCountryPageUrls.error)
     return []
   }
 
-  getCountryPageUrlsSuccessCounter.add(1, { lang })
-  console.info(
-    "contentstack.countryPageUrls success",
-    JSON.stringify({ query: { lang } })
-  )
+  metricsGetCountryPageUrls.success()
 
   return validatedCountryPageUrls.data
 }