Add logger, use execution timeout

simstudioai · TheodoreSpeaks · Apr 3, 2026 · Apr 3, 2026 · Apr 3, 2026 · Apr 3, 2026
commit 4e75c4760c3ff863cd34cbc8bf405e883a3e1073
diff --git a/apps/sim/app/api/tools/cloudwatch/describe-alarms/route.ts b/apps/sim/app/api/tools/cloudwatch/describe-alarms/route.ts
@@ -4,10 +4,13 @@ import {
   DescribeAlarmsCommand,
   type StateValue,
 } from '@aws-sdk/client-cloudwatch'
+import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 
+const logger = createLogger('CloudWatchDescribeAlarms')
+
 const DescribeAlarmsSchema = z.object({
   region: z.string().min(1, 'AWS region is required'),
   accessKeyId: z.string().min(1, 'AWS access key ID is required'),
@@ -87,6 +90,7 @@ export async function POST(request: NextRequest) {
   } catch (error) {
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe CloudWatch alarms'
+    logger.error('DescribeAlarms failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }
 }
diff --git a/apps/sim/app/api/tools/cloudwatch/describe-log-groups/route.ts b/apps/sim/app/api/tools/cloudwatch/describe-log-groups/route.ts
@@ -25,13 +25,6 @@ export async function POST(request: NextRequest) {
     }
 
     const body = await request.json()
-    logger.info('Received request', {
-      hasRegion: Boolean(body.region),
-      hasAccessKeyId: Boolean(body.accessKeyId),
-      hasSecretAccessKey: Boolean(body.secretAccessKey),
-      region: body.region,
-      accessKeyIdPrefix: body.accessKeyId?.slice(0, 8),
-    })
     const validatedData = DescribeLogGroupsSchema.parse(body)
 
     const client = new CloudWatchLogsClient({
@@ -42,14 +35,12 @@ export async function POST(request: NextRequest) {
       },
     })
 
-    logger.info('Sending DescribeLogGroupsCommand')
     const command = new DescribeLogGroupsCommand({
       ...(validatedData.prefix && { logGroupNamePrefix: validatedData.prefix }),
       ...(validatedData.limit !== undefined && { limit: validatedData.limit }),
     })
 
     const response = await client.send(command)
-    logger.info('DescribeLogGroupsCommand returned', { count: response.logGroups?.length ?? 0 })
 
     const logGroups = (response.logGroups ?? []).map((lg) => ({
       logGroupName: lg.logGroupName ?? '',
@@ -66,6 +57,7 @@ export async function POST(request: NextRequest) {
   } catch (error) {
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe CloudWatch log groups'
+    logger.error('DescribeLogGroups failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }
 }
diff --git a/apps/sim/app/api/tools/cloudwatch/describe-log-streams/route.ts b/apps/sim/app/api/tools/cloudwatch/describe-log-streams/route.ts
@@ -1,6 +1,10 @@
+import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+
+const logger = createLogger('CloudWatchDescribeLogStreams')
+
 import { createCloudWatchLogsClient, describeLogStreams } from '@/app/api/tools/cloudwatch/utils'
 
 const DescribeLogStreamsSchema = z.object({
@@ -43,6 +47,7 @@ export async function POST(request: NextRequest) {
   } catch (error) {
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe CloudWatch log streams'
+    logger.error('DescribeLogStreams failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }
 }
diff --git a/apps/sim/app/api/tools/cloudwatch/get-log-events/route.ts b/apps/sim/app/api/tools/cloudwatch/get-log-events/route.ts
@@ -1,6 +1,10 @@
+import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+
+const logger = createLogger('CloudWatchGetLogEvents')
+
 import { createCloudWatchLogsClient, getLogEvents } from '@/app/api/tools/cloudwatch/utils'
 
 const GetLogEventsSchema = z.object({
@@ -51,6 +55,7 @@ export async function POST(request: NextRequest) {
   } catch (error) {
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to get CloudWatch log events'
+    logger.error('GetLogEvents failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }
 }
diff --git a/apps/sim/app/api/tools/cloudwatch/get-metric-statistics/route.ts b/apps/sim/app/api/tools/cloudwatch/get-metric-statistics/route.ts
@@ -1,8 +1,11 @@
 import { CloudWatchClient, GetMetricStatisticsCommand } from '@aws-sdk/client-cloudwatch'
+import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 
+const logger = createLogger('CloudWatchGetMetricStatistics')
+
 const GetMetricStatisticsSchema = z.object({
   region: z.string().min(1, 'AWS region is required'),
   accessKeyId: z.string().min(1, 'AWS access key ID is required'),
@@ -88,6 +91,7 @@ export async function POST(request: NextRequest) {
   } catch (error) {
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to get CloudWatch metric statistics'
+    logger.error('GetMetricStatistics failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }
 }
diff --git a/apps/sim/app/api/tools/cloudwatch/list-metrics/route.ts b/apps/sim/app/api/tools/cloudwatch/list-metrics/route.ts
@@ -1,8 +1,11 @@
 import { CloudWatchClient, ListMetricsCommand } from '@aws-sdk/client-cloudwatch'
+import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 
+const logger = createLogger('CloudWatchListMetrics')
+
 const ListMetricsSchema = z.object({
   region: z.string().min(1, 'AWS region is required'),
   accessKeyId: z.string().min(1, 'AWS access key ID is required'),
@@ -58,6 +61,7 @@ export async function POST(request: NextRequest) {
   } catch (error) {
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to list CloudWatch metrics'
+    logger.error('ListMetrics failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }
 }
diff --git a/apps/sim/app/api/tools/cloudwatch/query-logs/route.ts b/apps/sim/app/api/tools/cloudwatch/query-logs/route.ts
@@ -1,7 +1,11 @@
 import { StartQueryCommand } from '@aws-sdk/client-cloudwatch-logs'
+import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+
+const logger = createLogger('CloudWatchQueryLogs')
+
 import { createCloudWatchLogsClient, pollQueryResults } from '@/app/api/tools/cloudwatch/utils'
 
 const QueryLogsSchema = z.object({
@@ -62,6 +66,7 @@ export async function POST(request: NextRequest) {
   } catch (error) {
     const errorMessage =
       error instanceof Error ? error.message : 'CloudWatch Log Insights query failed'
+    logger.error('QueryLogs failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }
 }
diff --git a/apps/sim/app/api/tools/cloudwatch/utils.ts b/apps/sim/app/api/tools/cloudwatch/utils.ts
@@ -5,6 +5,7 @@ import {
   GetQueryResultsCommand,
   type ResultField,
 } from '@aws-sdk/client-cloudwatch-logs'
+import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/core/execution-limits'
 
 interface AwsCredentials {
   region: string
@@ -53,7 +54,7 @@ export async function pollQueryResults(
   queryId: string,
   options: PollOptions = {}
 ): Promise<PollResult> {
-  const { maxWaitMs = 60_000, pollIntervalMs = 1_000 } = options
+  const { maxWaitMs = DEFAULT_EXECUTION_TIMEOUT_MS, pollIntervalMs = 1_000 } = options
   const startTime = Date.now()
 
   while (Date.now() - startTime < maxWaitMs) {
@@ -107,11 +108,12 @@ export async function describeLogStreams(
     storedBytes: number
   }[]
 }> {
+  const hasPrefix = Boolean(options?.prefix)
   const command = new DescribeLogStreamsCommand({
     logGroupName,
-    orderBy: 'LastEventTime',
-    descending: true,
-    ...(options?.prefix && { logStreamNamePrefix: options.prefix }),
+    ...(hasPrefix
+      ? { orderBy: 'LogStreamName', logStreamNamePrefix: options!.prefix }
+      : { orderBy: 'LastEventTime', descending: true }),
     ...(options?.limit !== undefined && { limit: options.limit }),
   })