Skip to content

Commit 93f68a9

Browse files
waleedlatif1waleedlatif
andauthored
refactor(logger): code cleanup for new execution logger (#798)
* refactor(logger): code hygiene with new logger * modify remaining files * simplify code structure --------- Co-authored-by: waleedlatif <waleedlatif@waleedlatifs-MacBook-Pro.local>
1 parent 727e5e8 commit 93f68a9

File tree

434 files changed

+563
-638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

434 files changed

+563
-638
lines changed

apps/sim/app/(auth)/login/login-form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
import { Input } from '@/components/ui/input'
1616
import { Label } from '@/components/ui/label'
1717
import { client } from '@/lib/auth-client'
18-
import { createLogger } from '@/lib/logs/console-logger'
18+
import { createLogger } from '@/lib/logs/console/logger'
1919
import { cn } from '@/lib/utils'
2020
import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
2121

apps/sim/app/(auth)/reset-password/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
CardHeader,
1212
CardTitle,
1313
} from '@/components/ui/card'
14-
import { createLogger } from '@/lib/logs/console-logger'
14+
import { createLogger } from '@/lib/logs/console/logger'
1515
import { SetNewPasswordForm } from './reset-password-form'
1616

1717
const logger = createLogger('ResetPasswordPage')

apps/sim/app/(auth)/verify/use-verification.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'
44
import { useRouter, useSearchParams } from 'next/navigation'
55
import { client } from '@/lib/auth-client'
66
import { env, isTruthy } from '@/lib/env'
7-
import { createLogger } from '@/lib/logs/console-logger'
7+
import { createLogger } from '@/lib/logs/console/logger'
88

99
const logger = createLogger('useVerification')
1010

apps/sim/app/api/__test-utils__/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export function mockExecutionDependencies() {
279279
}
280280
})
281281

282-
vi.mock('@/lib/logs/trace-spans', () => ({
282+
vi.mock('@/lib/logs/execution/trace-spans/trace-spans', () => ({
283283
buildTraceSpans: vi.fn().mockReturnValue({
284284
traceSpans: [],
285285
totalDuration: 100,
@@ -375,7 +375,7 @@ export function mockWorkflowAccessValidation(shouldSucceed = true) {
375375

376376
export async function getMockedDependencies() {
377377
const utilsModule = await import('@/lib/utils')
378-
const traceSpansModule = await import('@/lib/logs/trace-spans')
378+
const traceSpansModule = await import('@/lib/logs/execution/trace-spans/trace-spans')
379379
const workflowUtilsModule = await import('@/lib/workflows/utils')
380380
const executorModule = await import('@/executor')
381381
const serializerModule = await import('@/serializer')
@@ -655,7 +655,7 @@ export function mockKnowledgeSchemas() {
655655
* Mock console logger
656656
*/
657657
export function mockConsoleLogger() {
658-
vi.doMock('@/lib/logs/console-logger', () => ({
658+
vi.doMock('@/lib/logs/console/logger', () => ({
659659
createLogger: vi.fn().mockReturnValue(mockLogger),
660660
}))
661661
}

apps/sim/app/api/auth/forget-password/route.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ describe('Forget Password API Route', () => {
134134
expect(response.status).toBe(500)
135135
expect(data.message).toBe(errorMessage)
136136

137-
const logger = await import('@/lib/logs/console-logger')
137+
const logger = await import('@/lib/logs/console/logger')
138138
const mockLogger = logger.createLogger('ForgetPasswordTest')
139139
expect(mockLogger.error).toHaveBeenCalledWith('Error requesting password reset:', {
140140
error: expect.any(Error),
@@ -164,7 +164,7 @@ describe('Forget Password API Route', () => {
164164
expect(response.status).toBe(500)
165165
expect(data.message).toBe('Failed to send password reset email. Please try again later.')
166166

167-
const logger = await import('@/lib/logs/console-logger')
167+
const logger = await import('@/lib/logs/console/logger')
168168
const mockLogger = logger.createLogger('ForgetPasswordTest')
169169
expect(mockLogger.error).toHaveBeenCalled()
170170
})

apps/sim/app/api/auth/forget-password/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { type NextRequest, NextResponse } from 'next/server'
22
import { auth } from '@/lib/auth'
3-
import { createLogger } from '@/lib/logs/console-logger'
3+
import { createLogger } from '@/lib/logs/console/logger'
44

55
export const dynamic = 'force-dynamic'
66

apps/sim/app/api/auth/oauth/connections/route.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('OAuth Connections API Route', () => {
5151
jwtDecode: vi.fn(),
5252
}))
5353

54-
vi.doMock('@/lib/logs/console-logger', () => ({
54+
vi.doMock('@/lib/logs/console/logger', () => ({
5555
createLogger: vi.fn().mockReturnValue(mockLogger),
5656
}))
5757
})

apps/sim/app/api/auth/oauth/connections/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { eq } from 'drizzle-orm'
22
import { jwtDecode } from 'jwt-decode'
33
import { type NextRequest, NextResponse } from 'next/server'
44
import { getSession } from '@/lib/auth'
5-
import { createLogger } from '@/lib/logs/console-logger'
5+
import { createLogger } from '@/lib/logs/console/logger'
66
import { db } from '@/db'
77
import { account, user } from '@/db/schema'
88

apps/sim/app/api/auth/oauth/credentials/route.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe('OAuth Credentials API Route', () => {
6363
jwtDecode: vi.fn(),
6464
}))
6565

66-
vi.doMock('@/lib/logs/console-logger', () => ({
66+
vi.doMock('@/lib/logs/console/logger', () => ({
6767
createLogger: vi.fn().mockReturnValue(mockLogger),
6868
}))
6969
})

apps/sim/app/api/auth/oauth/credentials/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { and, eq } from 'drizzle-orm'
22
import { jwtDecode } from 'jwt-decode'
33
import { type NextRequest, NextResponse } from 'next/server'
44
import { getSession } from '@/lib/auth'
5-
import { createLogger } from '@/lib/logs/console-logger'
5+
import { createLogger } from '@/lib/logs/console/logger'
66
import type { OAuthService } from '@/lib/oauth/oauth'
77
import { parseProvider } from '@/lib/oauth/oauth'
88
import { db } from '@/db'

0 commit comments

Comments
 (0)