pass in logger to trackEvent

charleslien · charleslien · commit e1342f6b2432 · 2025-10-07T14:37:38.000-07:00
diff --git a/backend/src/__tests__/agent-run.test.ts b/backend/src/__tests__/agent-run.test.ts
@@ -18,7 +18,7 @@ import {
 
 import { startAgentRun, finishAgentRun, addAgentStep } from '../agent-run'
 
-import type { Logger } from '@codebuff/agent-runtime'
+import type { Logger } from '@codebuff/types/logger'
 
 describe('Agent Run Database Functions', () => {
   let logger: Logger
diff --git a/backend/src/llm-apis/message-cost-tracker.ts b/backend/src/llm-apis/message-cost-tracker.ts
@@ -521,10 +521,15 @@ async function updateUserCycleUsage(
       )
     }
 
-    trackEvent(AnalyticsEvent.CREDIT_CONSUMED, userId, {
-      creditsUsed,
-      fromPurchased: result.fromPurchased,
-      organizationId: orgId,
+    trackEvent({
+      event: AnalyticsEvent.CREDIT_CONSUMED,
+      userId,
+      properties: {
+        creditsUsed,
+        fromPurchased: result.fromPurchased,
+        organizationId: orgId,
+      },
+      logger,
     })
 
     return result
@@ -539,9 +544,14 @@ async function updateUserCycleUsage(
       )
     }
 
-    trackEvent(AnalyticsEvent.CREDIT_CONSUMED, userId, {
-      creditsUsed,
-      fromPurchased: result.fromPurchased,
+    trackEvent({
+      event: AnalyticsEvent.CREDIT_CONSUMED,
+      userId,
+      properties: {
+        creditsUsed,
+        fromPurchased: result.fromPurchased,
+      },
+      logger,
     })
 
     return result
diff --git a/backend/src/run-agent-step.ts b/backend/src/run-agent-step.ts
@@ -1,9 +1,7 @@
 import { insertTrace } from '@codebuff/bigquery'
 import { trackEvent } from '@codebuff/common/analytics'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
-import {
-  supportsCacheControl,
-} from '@codebuff/common/old-constants'
+import { supportsCacheControl } from '@codebuff/common/old-constants'
 import { TOOLS_WHICH_WONT_FORCE_NEXT_STEP } from '@codebuff/common/tools/constants'
 import { buildArray } from '@codebuff/common/util/array'
 import { getErrorObject } from '@codebuff/common/util/error'
@@ -124,13 +122,18 @@ export const runAgentStep = async (
   // Generates a unique ID for each main prompt run (ie: a step of the agent loop)
   // This is used to link logs within a single agent loop
   const agentStepId = crypto.randomUUID()
-  trackEvent(AnalyticsEvent.AGENT_STEP, userId ?? '', {
-    agentStepId,
-    clientSessionId,
-    fingerprintId,
-    userInputId,
-    userId,
-    repoName: repoId,
+  trackEvent({
+    event: AnalyticsEvent.AGENT_STEP,
+    userId: userId ?? '',
+    properties: {
+      agentStepId,
+      clientSessionId,
+      fingerprintId,
+      userInputId,
+      userId,
+      repoName: repoId,
+    },
+    logger,
   })
 
   let messageHistory = agentState.messageHistory
diff --git a/backend/src/tools/handlers/tool/create-plan.ts b/backend/src/tools/handlers/tool/create-plan.ts
@@ -66,13 +66,18 @@ export const handleCreatePlan = ((params: {
   if (!fileProcessingState.promisesByPath[path]) {
     fileProcessingState.promisesByPath[path] = []
     if (path.endsWith('knowledge.md')) {
-      trackEvent(AnalyticsEvent.KNOWLEDGE_FILE_UPDATED, userId ?? '', {
-        agentStepId,
-        clientSessionId,
-        fingerprintId,
-        userInputId,
-        userId,
-        repoName: repoId,
+      trackEvent({
+        event: AnalyticsEvent.KNOWLEDGE_FILE_UPDATED,
+        userId: userId ?? '',
+        properties: {
+          agentStepId,
+          clientSessionId,
+          fingerprintId,
+          userInputId,
+          userId,
+          repoName: repoId,
+        },
+        logger,
       })
     }
   }
diff --git a/backend/src/websockets/websocket-action.ts b/backend/src/websockets/websocket-action.ts
@@ -145,9 +145,14 @@ const onPrompt = async (
 
       if (prompt) {
         logger.info({ prompt }, `USER INPUT: ${prompt.slice(0, 100)}`)
-        trackEvent(AnalyticsEvent.USER_INPUT, userId, {
-          prompt,
-          promptId,
+        trackEvent({
+          event: AnalyticsEvent.USER_INPUT,
+          userId,
+          properties: {
+            prompt,
+            promptId,
+          },
+          logger,
         })
       }
 
diff --git a/backend/src/xml-stream-parser.ts b/backend/src/xml-stream-parser.ts
@@ -7,6 +7,8 @@ import {
   toolNameParam,
 } from '@codebuff/common/tools/constants'
 
+import { logger } from './util/logger'
+
 import type { StreamChunk } from './llm-apis/vercel-ai-sdk/ai-sdk'
 import type { Model } from '@codebuff/common/old-constants'
 import type {
@@ -72,10 +74,10 @@ export async function* processStreamWithTags(
     try {
       parsedParams = JSON.parse(contents)
     } catch (error: any) {
-      trackEvent(
-        AnalyticsEvent.MALFORMED_TOOL_CALL_JSON,
-        loggerOptions?.userId ?? '',
-        {
+      trackEvent({
+        event: AnalyticsEvent.MALFORMED_TOOL_CALL_JSON,
+        userId: loggerOptions?.userId ?? '',
+        properties: {
           contents: JSON.stringify(contents),
           model: loggerOptions?.model,
           agent: loggerOptions?.agentName,
@@ -86,7 +88,8 @@ export async function* processStreamWithTags(
           },
           autocompleted,
         },
-      )
+        logger,
+      })
       const shortenedContents =
         contents.length < 200
           ? contents
@@ -106,31 +109,37 @@ export async function* processStreamWithTags(
         ? processors[toolName] ?? defaultProcessor(toolName)
         : undefined
     if (!processor) {
-      trackEvent(
-        AnalyticsEvent.UNKNOWN_TOOL_CALL,
-        loggerOptions?.userId ?? '',
-        {
+      trackEvent({
+        event: AnalyticsEvent.UNKNOWN_TOOL_CALL,
+        userId: loggerOptions?.userId ?? '',
+        properties: {
           contents,
           toolName,
           model: loggerOptions?.model,
           agent: loggerOptions?.agentName,
           autocompleted,
         },
-      )
+        logger,
+      })
       onError(
         'parse_error',
         `Unknown tool ${JSON.stringify(toolName)} for tool call: ${contents}`,
       )
       return
     }
 
-    trackEvent(AnalyticsEvent.TOOL_USE, loggerOptions?.userId ?? '', {
-      toolName,
-      contents,
-      parsedParams,
-      autocompleted,
-      model: loggerOptions?.model,
-      agent: loggerOptions?.agentName,
+    trackEvent({
+      event: AnalyticsEvent.TOOL_USE,
+      userId: loggerOptions?.userId ?? '',
+      properties: {
+        toolName,
+        contents,
+        parsedParams,
+        autocompleted,
+        model: loggerOptions?.model,
+        agent: loggerOptions?.agentName,
+      },
+      logger,
     })
     delete parsedParams[toolNameParam]
 
diff --git a/common/src/analytics.ts b/common/src/analytics.ts
@@ -36,11 +36,17 @@ export async function flushAnalytics() {
   } catch (error) {}
 }
 
-export function trackEvent(
-  event: AnalyticsEvent,
-  userId: string,
-  properties?: Record<string, any>,
-) {
+export function trackEvent({
+  event,
+  userId,
+  properties,
+  logger,
+}: {
+  event: AnalyticsEvent
+  userId: string
+  properties?: Record<string, any>
+  logger: Logger
+}) {
   if (env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'prod') {
     logger.info({ payload: { event, properties } }, 'Analytics event tracked')
     return
diff --git a/packages/billing/src/grant-credits.ts b/packages/billing/src/grant-credits.ts
@@ -1,9 +1,9 @@
 import { trackEvent } from '@codebuff/common/analytics'
-import { DEFAULT_FREE_CREDITS_GRANT } from '@codebuff/common/old-constants'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
 import { GRANT_PRIORITIES } from '@codebuff/common/constants/grant-priorities'
 import db from '@codebuff/common/db'
 import * as schema from '@codebuff/common/db/schema'
+import { DEFAULT_FREE_CREDITS_GRANT } from '@codebuff/common/old-constants'
 import { getNextQuotaReset } from '@codebuff/common/util/dates'
 import { logger } from '@codebuff/common/util/logger'
 import { withRetry } from '@codebuff/common/util/promise'
@@ -205,12 +205,17 @@ export async function grantCreditOperation(
     }
   }
 
-  trackEvent(AnalyticsEvent.CREDIT_GRANT, userId, {
-    operationId,
-    type,
-    description,
-    amount,
-    expiresAt,
+  trackEvent({
+    event: AnalyticsEvent.CREDIT_GRANT,
+    userId,
+    properties: {
+      operationId,
+      type,
+      description,
+      amount,
+      expiresAt,
+    },
+    logger,
   })
 
   logger.info(
diff --git a/packages/billing/src/org-monitoring.ts b/packages/billing/src/org-monitoring.ts
@@ -150,10 +150,15 @@ export async function sendOrganizationAlert(
     )
 
     // Track analytics event
-    trackEvent(AnalyticsEvent.CREDIT_GRANT, alert.organizationId, {
-      alertType: alert.alertType,
-      currentBalance: alert.currentBalance,
-      threshold: alert.threshold,
+    trackEvent({
+      event: AnalyticsEvent.CREDIT_GRANT,
+      userId: alert.organizationId,
+      properties: {
+        alertType: alert.alertType,
+        currentBalance: alert.currentBalance,
+        threshold: alert.threshold,
+      },
+      logger,
     })
 
     // TODO: Implement actual alerting mechanisms:
@@ -299,12 +304,17 @@ export async function trackOrganizationUsageMetrics(
     )
 
     // Track analytics event
-    trackEvent(AnalyticsEvent.CREDIT_GRANT, metrics.organizationId, {
-      type: 'usage_metrics',
-      timeframe: metrics.timeframe,
-      totalCreditsConsumed: metrics.totalCreditsConsumed,
-      uniqueUsers: metrics.uniqueUsers,
-      repositoryCount: metrics.repositoryCount,
+    trackEvent({
+      event: AnalyticsEvent.CREDIT_GRANT,
+      userId: metrics.organizationId,
+      properties: {
+        type: 'usage_metrics',
+        timeframe: metrics.timeframe,
+        totalCreditsConsumed: metrics.totalCreditsConsumed,
+        uniqueUsers: metrics.uniqueUsers,
+        repositoryCount: metrics.repositoryCount,
+      },
+      logger,
     })
 
     // TODO: Store metrics in time-series database for dashboards
diff --git a/web/src/app/api/auth/[...nextauth]/auth-options.ts b/web/src/app/api/auth/[...nextauth]/auth-options.ts
@@ -231,7 +231,11 @@ export const authOptions: NextAuthOptions = {
         userData.name
       )
 
-      trackEvent(AnalyticsEvent.SIGNUP, userData.id)
+      trackEvent({
+        event: AnalyticsEvent.SIGNUP,
+        userId: userData.id,
+        logger,
+      })
 
       logger.info({ user }, 'createUser event processing finished.')
     },
diff --git a/web/src/lib/server-init.ts b/web/src/lib/server-init.ts
@@ -2,15 +2,19 @@ import { initAnalytics } from '@codebuff/common/analytics'
 // Errors if this file is included in client bundles
 import 'server-only'
 
+import type { Logger } from '@codebuff/types/logger'
+
 import { logger } from '@/util/logger'
 
 let initialized = false
 
-export function initializeServer() {
+export function initializeServer({ logger }: { logger: Logger }) {
   if (initialized) return
 
   try {
-    initAnalytics()
+    initAnalytics({
+      logger,
+    })
     // Initialize other services as needed
     initialized = true
   } catch (error) {
@@ -23,4 +27,4 @@ export function initializeServer() {
   }
 }
 
-initializeServer()
+initializeServer({ logger })
