Merged in chore/redirect-counter (pull request #3302)

Counter name is now searchable and add counter for redirects

* refactor: createCounter() only takes one argument, the name of the counter. Makes it easier to search for

* feat: add counter when we do a redirect from redirect-service


Approved-by: Linus Flood

packages/trpc/lib/routers/contentstack/base/query.ts

@@ -60,8 +60,7 @@ import type {
 
 const getContactConfig = cache(async (lang: Lang) => {
   const getContactConfigCounter = createCounter(
-    "trpc.contentstack",
-    "contactConfig.get"
+    "trpc.contentstack.contactConfig.get"
   )
   const metricsGetContactConfig = getContactConfigCounter.init({ lang })
 
@@ -104,8 +103,7 @@ export const baseQueryRouter = router({
     const { lang } = ctx
 
     const getHeaderRefsCounter = createCounter(
-      "trpc.contentstack",
-      "header.get.refs"
+      "trpc.contentstack.header.get.refs"
     )
     const metricsGetHeaderRefs = getHeaderRefsCounter.init({ lang })
 
@@ -139,7 +137,7 @@ export const baseQueryRouter = router({
 
     const connections = getConnections(validatedHeaderRefs.data)
 
-    const getHeaderCounter = createCounter("trpc.contentstack", "header.get")
+    const getHeaderCounter = createCounter("trpc.contentstack.header.get")
     const metricsGetHeader = getHeaderCounter.init({ lang })
 
     metricsGetHeader.start()
@@ -178,8 +176,7 @@ export const baseQueryRouter = router({
     const { lang } = ctx
 
     const getFooterRefsCounter = createCounter(
-      "trpc.contentstack",
-      "footer.get.refs"
+      "trpc.contentstack.footer.get.refs"
     )
     const metricsGetFooterRefs = getFooterRefsCounter.init({ lang })
 
@@ -216,7 +213,7 @@ export const baseQueryRouter = router({
     const connections = getFooterConnections(validatedFooterRefs.data)
     const footerUID = responseRef.data.all_footer.items[0].system.uid
 
-    const getFooterCounter = createCounter("trpc.contentstack", "footer.get")
+    const getFooterCounter = createCounter("trpc.contentstack.footer.get")
     const metricsGetFooter = getFooterCounter.init({ lang })
 
     metricsGetFooter.start()
@@ -263,8 +260,7 @@ export const baseQueryRouter = router({
         const lang = input.lang ?? ctx.lang
 
         const getSitewideCampaignBannerRefsCounter = createCounter(
-          "trpc.contentstack",
-          "sitewideCampaignBanner.get.refs"
+          "trpc.contentstack.sitewideCampaignBanner.get.refs"
         )
         const metricsGetSitewideCampaignBannerRefs =
           getSitewideCampaignBannerRefsCounter.init({
@@ -307,8 +303,7 @@ export const baseQueryRouter = router({
         metricsGetSitewideCampaignBannerRefs.success()
 
         const getSitewideCampaignBannerCounter = createCounter(
-          "trpc.contentstack",
-          "sitewideCampaignBanner.get"
+          "trpc.contentstack.sitewideCampaignBanner.get"
         )
         const metricsGetSitewideCampaignBanner =
           getSitewideCampaignBannerCounter.init({
@@ -353,8 +348,7 @@ export const baseQueryRouter = router({
       const lang = input.lang ?? ctx.lang
 
       const getSiteConfigRefsCounter = createCounter(
-        "trpc.contentstack",
-        "siteConfig.get.refs"
+        "trpc.contentstack.siteConfig.get.refs"
       )
       const metricsGetSiteConfigRefs = getSiteConfigRefsCounter.init({ lang })
 
@@ -397,8 +391,7 @@ export const baseQueryRouter = router({
       metricsGetSiteConfigRefs.success()
 
       const getSiteConfigCounter = createCounter(
-        "trpc.contentstack",
-        "siteConfig.get"
+        "trpc.contentstack.siteConfig.get"
       )
       const metricsGetSiteConfig = getSiteConfigCounter.init({ lang })