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/reward/query.ts

@@ -33,8 +33,7 @@ export const rewardQueryRouter = router({
     .input(rewardsAllInput)
     .query(async function ({ input, ctx }) {
       const getContentstackRewardAllCounter = createCounter(
-        "trpc.contentstack",
-        "reward.all"
+        "trpc.contentstack.reward.all"
       )
       const metricsGetContentstackRewardAll =
         getContentstackRewardAllCounter.init()
@@ -113,8 +112,7 @@ export const rewardQueryRouter = router({
       const { level_id } = input
 
       const getRewardByLevelCounter = createCounter(
-        "trpc.contentstack",
-        "reward.byLevel"
+        "trpc.contentstack.reward.byLevel"
       )
       const metricsGetRewardByLevel = getRewardByLevelCounter.init({
         level_id,
@@ -180,8 +178,7 @@ export const rewardQueryRouter = router({
     .input(langInput.optional()) // lang is required for client, but not for server
     .query(async function ({ ctx }) {
       const getCurrentRewardCounter = createCounter(
-        "trpc.contentstack",
-        "reward.current"
+        "trpc.contentstack.reward.current"
       )
       const metricsGetCurrentReward = getCurrentRewardCounter.init()
 
@@ -238,10 +235,7 @@ export const rewardQueryRouter = router({
   surprises: contentStackBaseWithProtectedProcedure
     .input(langInput.optional()) // lang is required for client, but not for server
     .query(async ({ ctx }) => {
-      const getSurprisesCounter = createCounter(
-        "trpc.contentstack",
-        "surprises"
-      )
+      const getSurprisesCounter = createCounter("trpc.contentstack.surprises")
       const metricsGetSurprises = getSurprisesCounter.init()
 
       metricsGetSurprises.start()
@@ -304,8 +298,7 @@ export const rewardQueryRouter = router({
         input.map(({ rewardId, couponCode }) => {
           async function handleUnwrap() {
             const getUnwrapSurpriseCounter = createCounter(
-              "trpc.contentstack",
-              "reward.unwrap"
+              "trpc.contentstack.reward.unwrap"
             )
 
             const metricsGetUnwrapSurprise = getUnwrapSurpriseCounter.init({
@@ -357,10 +350,7 @@ export const rewardQueryRouter = router({
     .mutation(async ({ input, ctx }) => {
       const { rewardId, couponCode } = input
 
-      const getRedeemCounter = createCounter(
-        "trpc.contentstack",
-        "reward.redeem"
-      )
+      const getRedeemCounter = createCounter("trpc.contentstack.reward.redeem")
 
       const metricGetRedeem = getRedeemCounter.init({ rewardId, couponCode })
 

packages/trpc/lib/routers/contentstack/reward/utils.ts

@@ -40,8 +40,7 @@ export async function getCachedAllTierRewards(token: string) {
     "getAllTierRewards",
     async () => {
       const getApiRewardAllTiersCounter = createCounter(
-        "trpc.api",
-        "reward.allTiers"
+        "trpc.api.reward.allTiers"
       )
       const metricsGetApiRewardAllTiers = getApiRewardAllTiersCounter.init()
 
@@ -90,8 +89,7 @@ export async function getCmsRewards(lang: Lang, rewardIds: string[]) {
   )
 
   const getContentstackRewardAllRefsCounter = createCounter(
-    "trpc.contentstack",
-    "reward.all.refs"
+    "trpc.contentstack.reward.all.refs"
   )
   const metricsGetContentstackRewardAllRefs =
     getContentstackRewardAllRefsCounter.init({ lang, rewardIds })
@@ -126,8 +124,7 @@ export async function getCmsRewards(lang: Lang, rewardIds: string[]) {
   metricsGetContentstackRewardAllRefs.success()
 
   const getContentstackRewardAllCounter = createCounter(
-    "trpc.contentstack",
-    "reward.all"
+    "trpc.contentstack.reward.all"
   )
   const metricsGetContentstackRewardAll = getContentstackRewardAllCounter.init({
     lang,