diff --git a/Dockerfile b/Dockerfile index 43d410ac..9af85358 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,14 +44,12 @@ COPY ./packages/db ./packages/db COPY ./packages/schemas ./packages/schemas COPY ./packages/crypto ./packages/crypto COPY ./packages/error ./packages/error -COPY ./packages/logger ./packages/logger COPY ./packages/shared ./packages/shared RUN yarn workspace @sourcebot/db install RUN yarn workspace @sourcebot/schemas install RUN yarn workspace @sourcebot/crypto install RUN yarn workspace @sourcebot/error install -RUN yarn workspace @sourcebot/logger install RUN yarn workspace @sourcebot/shared install # ------------------------------------ @@ -99,7 +97,6 @@ COPY --from=shared-libs-builder /app/packages/db ./packages/db COPY --from=shared-libs-builder /app/packages/schemas ./packages/schemas COPY --from=shared-libs-builder /app/packages/crypto ./packages/crypto COPY --from=shared-libs-builder /app/packages/error ./packages/error -COPY --from=shared-libs-builder /app/packages/logger ./packages/logger COPY --from=shared-libs-builder /app/packages/shared ./packages/shared # Fixes arm64 timeouts @@ -140,7 +137,6 @@ COPY --from=shared-libs-builder /app/packages/db ./packages/db COPY --from=shared-libs-builder /app/packages/schemas ./packages/schemas COPY --from=shared-libs-builder /app/packages/crypto ./packages/crypto COPY --from=shared-libs-builder /app/packages/error ./packages/error -COPY --from=shared-libs-builder /app/packages/logger ./packages/logger COPY --from=shared-libs-builder /app/packages/shared ./packages/shared RUN yarn workspace @sourcebot/backend install RUN yarn workspace @sourcebot/backend build @@ -227,7 +223,6 @@ COPY --from=shared-libs-builder /app/packages/db ./packages/db COPY --from=shared-libs-builder /app/packages/schemas ./packages/schemas COPY --from=shared-libs-builder /app/packages/crypto ./packages/crypto COPY --from=shared-libs-builder /app/packages/error ./packages/error -COPY --from=shared-libs-builder /app/packages/logger ./packages/logger COPY --from=shared-libs-builder /app/packages/shared ./packages/shared # Configure dependencies diff --git a/packages/backend/package.json b/packages/backend/package.json index 8b0659d2..99b11588 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -32,7 +32,6 @@ "@sourcebot/crypto": "workspace:*", "@sourcebot/db": "workspace:*", "@sourcebot/error": "workspace:*", - "@sourcebot/logger": "workspace:*", "@sourcebot/schemas": "workspace:*", "@sourcebot/shared": "workspace:*", "@t3-oss/env-core": "^0.12.0", diff --git a/packages/backend/src/azuredevops.ts b/packages/backend/src/azuredevops.ts index aa0fbf55..779ee82d 100644 --- a/packages/backend/src/azuredevops.ts +++ b/packages/backend/src/azuredevops.ts @@ -1,5 +1,5 @@ import { AzureDevOpsConnectionConfig } from "@sourcebot/schemas/v3/azuredevops.type"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { measure, fetchWithRetry } from "./utils.js"; import micromatch from "micromatch"; import { BackendException, BackendError } from "@sourcebot/error"; diff --git a/packages/backend/src/bitbucket.ts b/packages/backend/src/bitbucket.ts index c6fa87ff..c1069b61 100644 --- a/packages/backend/src/bitbucket.ts +++ b/packages/backend/src/bitbucket.ts @@ -2,7 +2,7 @@ import { createBitbucketCloudClient } from "@coderabbitai/bitbucket/cloud"; import { createBitbucketServerClient } from "@coderabbitai/bitbucket/server"; import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"; import type { ClientOptions, ClientPathsWithMethod } from "openapi-fetch"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { measure, fetchWithRetry } from "./utils.js"; import * as Sentry from "@sentry/node"; import { diff --git a/packages/backend/src/configManager.ts b/packages/backend/src/configManager.ts index 14c6b0de..55dbd6ed 100644 --- a/packages/backend/src/configManager.ts +++ b/packages/backend/src/configManager.ts @@ -1,5 +1,5 @@ import { Prisma, PrismaClient } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type"; import { loadConfig } from "@sourcebot/shared"; import chokidar, { FSWatcher } from 'chokidar'; diff --git a/packages/backend/src/connectionManager.ts b/packages/backend/src/connectionManager.ts index cf0b9194..8b54fa4d 100644 --- a/packages/backend/src/connectionManager.ts +++ b/packages/backend/src/connectionManager.ts @@ -1,6 +1,6 @@ import * as Sentry from "@sentry/node"; import { Connection, ConnectionSyncJobStatus, PrismaClient } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type"; import { loadConfig, env } from "@sourcebot/shared"; import { Job, Queue, ReservedJob, Worker } from "groupmq"; diff --git a/packages/backend/src/ee/accountPermissionSyncer.ts b/packages/backend/src/ee/accountPermissionSyncer.ts index 3945aa38..eb32ba3b 100644 --- a/packages/backend/src/ee/accountPermissionSyncer.ts +++ b/packages/backend/src/ee/accountPermissionSyncer.ts @@ -1,7 +1,6 @@ import * as Sentry from "@sentry/node"; -import { PrismaClient, AccountPermissionSyncJobStatus, Account } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; -import { env, hasEntitlement } from "@sourcebot/shared"; +import { PrismaClient, AccountPermissionSyncJobStatus, Account} from "@sourcebot/db"; +import { env, hasEntitlement, createLogger } from "@sourcebot/shared"; import { Job, Queue, Worker } from "bullmq"; import { Redis } from "ioredis"; import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js"; diff --git a/packages/backend/src/ee/githubAppManager.ts b/packages/backend/src/ee/githubAppManager.ts index 3b8d337c..dc6e1cde 100644 --- a/packages/backend/src/ee/githubAppManager.ts +++ b/packages/backend/src/ee/githubAppManager.ts @@ -1,7 +1,7 @@ import { App } from "@octokit/app"; import { getTokenFromConfig } from "@sourcebot/crypto"; import { PrismaClient } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { GitHubAppConfig } from "@sourcebot/schemas/v3/index.type"; import { env, loadConfig } from "@sourcebot/shared"; diff --git a/packages/backend/src/ee/repoPermissionSyncer.ts b/packages/backend/src/ee/repoPermissionSyncer.ts index 95e6d893..078055ff 100644 --- a/packages/backend/src/ee/repoPermissionSyncer.ts +++ b/packages/backend/src/ee/repoPermissionSyncer.ts @@ -1,6 +1,6 @@ import * as Sentry from "@sentry/node"; import { PrismaClient, Repo, RepoPermissionSyncJobStatus } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { env, hasEntitlement } from "@sourcebot/shared"; import { Job, Queue, Worker } from 'bullmq'; import { Redis } from 'ioredis'; diff --git a/packages/backend/src/ee/syncSearchContexts.ts b/packages/backend/src/ee/syncSearchContexts.ts index e53679ae..8f9265a3 100644 --- a/packages/backend/src/ee/syncSearchContexts.ts +++ b/packages/backend/src/ee/syncSearchContexts.ts @@ -1,5 +1,5 @@ import micromatch from "micromatch"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { PrismaClient } from "@sourcebot/db"; import { getPlan, hasEntitlement, SOURCEBOT_SUPPORT_EMAIL } from "@sourcebot/shared"; import { SearchContext } from "@sourcebot/schemas/v3/index.type"; diff --git a/packages/backend/src/gerrit.ts b/packages/backend/src/gerrit.ts index ef149648..70862600 100644 --- a/packages/backend/src/gerrit.ts +++ b/packages/backend/src/gerrit.ts @@ -1,6 +1,6 @@ import fetch from 'cross-fetch'; import { GerritConnectionConfig } from "@sourcebot/schemas/v3/index.type" -import { createLogger } from '@sourcebot/logger'; +import { createLogger } from '@sourcebot/shared'; import micromatch from "micromatch"; import { measure, fetchWithRetry } from './utils.js'; import { BackendError } from '@sourcebot/error'; diff --git a/packages/backend/src/gitea.ts b/packages/backend/src/gitea.ts index 1969a6f2..53bf55bf 100644 --- a/packages/backend/src/gitea.ts +++ b/packages/backend/src/gitea.ts @@ -1,6 +1,6 @@ import * as Sentry from "@sentry/node"; import { getTokenFromConfig } from "@sourcebot/crypto"; -import { createLogger } from '@sourcebot/logger'; +import { createLogger } from '@sourcebot/shared'; import { GiteaConnectionConfig } from '@sourcebot/schemas/v3/gitea.type'; import { env } from "@sourcebot/shared"; import fetch from 'cross-fetch'; diff --git a/packages/backend/src/github.ts b/packages/backend/src/github.ts index f6ab176a..e913a128 100644 --- a/packages/backend/src/github.ts +++ b/packages/backend/src/github.ts @@ -1,7 +1,7 @@ import { Octokit } from "@octokit/rest"; import * as Sentry from "@sentry/node"; import { getTokenFromConfig } from "@sourcebot/crypto"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type"; import { env, hasEntitlement } from "@sourcebot/shared"; import micromatch from "micromatch"; diff --git a/packages/backend/src/gitlab.ts b/packages/backend/src/gitlab.ts index a8878828..b7f2dc91 100644 --- a/packages/backend/src/gitlab.ts +++ b/packages/backend/src/gitlab.ts @@ -1,7 +1,7 @@ import { Gitlab, ProjectSchema } from "@gitbeaker/rest"; import * as Sentry from "@sentry/node"; import { getTokenFromConfig } from "@sourcebot/crypto"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type"; import { env } from "@sourcebot/shared"; import micromatch from "micromatch"; diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index dfda4b0a..ffdff86a 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -1,7 +1,7 @@ import "./instrument.js"; import { PrismaClient } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { env, getConfigSettings, hasEntitlement } from '@sourcebot/shared'; import { existsSync } from 'fs'; import { mkdir } from 'fs/promises'; diff --git a/packages/backend/src/instrument.ts b/packages/backend/src/instrument.ts index fcaf730c..d760d3df 100644 --- a/packages/backend/src/instrument.ts +++ b/packages/backend/src/instrument.ts @@ -1,5 +1,5 @@ import * as Sentry from "@sentry/node"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { env } from "@sourcebot/shared"; const logger = createLogger('instrument'); diff --git a/packages/backend/src/promClient.ts b/packages/backend/src/promClient.ts index 67ed6f3f..2fa7718f 100644 --- a/packages/backend/src/promClient.ts +++ b/packages/backend/src/promClient.ts @@ -1,7 +1,7 @@ import express, { Request, Response } from 'express'; import { Server } from 'http'; import client, { Registry, Counter, Gauge } from 'prom-client'; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('prometheus-client'); diff --git a/packages/backend/src/repoCompileUtils.ts b/packages/backend/src/repoCompileUtils.ts index 04a8b3b5..10c748a8 100644 --- a/packages/backend/src/repoCompileUtils.ts +++ b/packages/backend/src/repoCompileUtils.ts @@ -10,7 +10,7 @@ import { SchemaRepository as BitbucketCloudRepository } from "@coderabbitai/bitb import { CodeHostType, Prisma } from '@sourcebot/db'; import { WithRequired } from "./types.js" import { marshalBool } from "./utils.js"; -import { createLogger } from '@sourcebot/logger'; +import { createLogger } from '@sourcebot/shared'; import { BitbucketConnectionConfig, GerritConnectionConfig, GiteaConnectionConfig, GitlabConnectionConfig, GenericGitHostConnectionConfig, AzureDevOpsConnectionConfig } from '@sourcebot/schemas/v3/connection.type'; import { ProjectVisibility } from "azure-devops-node-api/interfaces/CoreInterfaces.js"; import path from 'path'; diff --git a/packages/backend/src/repoIndexManager.ts b/packages/backend/src/repoIndexManager.ts index fe6ec881..cccc1b90 100644 --- a/packages/backend/src/repoIndexManager.ts +++ b/packages/backend/src/repoIndexManager.ts @@ -1,6 +1,6 @@ import * as Sentry from '@sentry/node'; import { PrismaClient, Repo, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db"; -import { createLogger, Logger } from "@sourcebot/logger"; +import { createLogger, Logger } from "@sourcebot/shared"; import { env, RepoIndexingJobMetadata, repoIndexingJobMetadataSchema, RepoMetadata, repoMetadataSchema } from '@sourcebot/shared'; import { existsSync } from 'fs'; import { readdir, rm } from 'fs/promises'; diff --git a/packages/backend/src/zoekt.ts b/packages/backend/src/zoekt.ts index 54ae615e..9f65f473 100644 --- a/packages/backend/src/zoekt.ts +++ b/packages/backend/src/zoekt.ts @@ -1,5 +1,5 @@ import { Repo } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { exec } from "child_process"; import { INDEX_CACHE_DIR } from "./constants.js"; import { Settings } from "./types.js"; diff --git a/packages/db/package.json b/packages/db/package.json index 8dc07d69..7af80bb4 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -25,7 +25,6 @@ }, "dependencies": { "@prisma/client": "6.2.1", - "@sourcebot/logger": "workspace:*", "@types/readline-sync": "^1.4.8", "readline-sync": "^1.4.10" } diff --git a/packages/db/tools/scriptRunner.ts b/packages/db/tools/scriptRunner.ts index 499a3770..6bb61949 100644 --- a/packages/db/tools/scriptRunner.ts +++ b/packages/db/tools/scriptRunner.ts @@ -3,7 +3,6 @@ import { ArgumentParser } from "argparse"; import { migrateDuplicateConnections } from "./scripts/migrate-duplicate-connections"; import { injectAuditData } from "./scripts/inject-audit-data"; import { confirmAction } from "./utils"; -import { createLogger } from "@sourcebot/logger"; import { injectRepoData } from "./scripts/inject-repo-data"; import { testRepoQueryPerf } from "./scripts/test-repo-query-perf"; @@ -23,19 +22,17 @@ parser.add_argument("--url", { required: true, help: "Database URL" }); parser.add_argument("--script", { required: true, help: "Script to run" }); const args = parser.parse_args(); -const logger = createLogger('db-script-runner'); - (async () => { if (!(args.script in scripts)) { - logger.error("Invalid script"); + console.error("Invalid script"); process.exit(1); } const selectedScript = scripts[args.script]; - logger.info("\nTo confirm:"); - logger.info(`- Database URL: ${args.url}`); - logger.info(`- Script: ${args.script}`); + console.log("\nTo confirm:"); + console.log(`- Database URL: ${args.url}`); + console.log(`- Script: ${args.script}`); confirmAction(); @@ -45,7 +42,7 @@ const logger = createLogger('db-script-runner'); await selectedScript.run(prisma); - logger.info("\nDone."); + console.log("\nDone."); process.exit(0); })(); diff --git a/packages/db/tools/scripts/inject-audit-data.ts b/packages/db/tools/scripts/inject-audit-data.ts index 11f3e8cc..c0c202d9 100644 --- a/packages/db/tools/scripts/inject-audit-data.ts +++ b/packages/db/tools/scripts/inject-audit-data.ts @@ -1,9 +1,6 @@ import { Script } from "../scriptRunner"; import { PrismaClient } from "../../dist"; import { confirmAction } from "../utils"; -import { createLogger } from "@sourcebot/logger"; - -const logger = createLogger('inject-audit-data'); // Generate realistic audit data for analytics testing // Simulates 50 engineers with varying activity patterns @@ -17,11 +14,11 @@ export const injectAuditData: Script = { }); if (!org) { - logger.error(`Organization with id ${orgId} not found. Please create it first.`); + console.error(`Organization with id ${orgId} not found. Please create it first.`); return; } - logger.info(`Injecting audit data for organization: ${org.name} (${org.domain})`); + console.log(`Injecting audit data for organization: ${org.name} (${org.domain})`); // Generate 50 fake user IDs const userIds = Array.from({ length: 50 }, (_, i) => `user_${String(i + 1).padStart(3, '0')}`); @@ -38,7 +35,7 @@ export const injectAuditData: Script = { const startDate = new Date(); startDate.setDate(startDate.getDate() - 90); - logger.info(`Generating data from ${startDate.toISOString().split('T')[0]} to ${endDate.toISOString().split('T')[0]}`); + console.log(`Generating data from ${startDate.toISOString().split('T')[0]} to ${endDate.toISOString().split('T')[0]}`); confirmAction(); @@ -125,9 +122,9 @@ export const injectAuditData: Script = { } } - logger.info(`\nAudit data injection complete!`); - logger.info(`Users: ${userIds.length}`); - logger.info(`Date range: ${startDate.toISOString().split('T')[0]} to ${endDate.toISOString().split('T')[0]}`); + console.log(`\nAudit data injection complete!`); + console.log(`Users: ${userIds.length}`); + console.log(`Date range: ${startDate.toISOString().split('T')[0]} to ${endDate.toISOString().split('T')[0]}`); // Show some statistics const stats = await prisma.audit.groupBy({ @@ -136,9 +133,9 @@ export const injectAuditData: Script = { _count: { action: true } }); - logger.info('\nAction breakdown:'); + console.log('\nAction breakdown:'); stats.forEach(stat => { - logger.info(` ${stat.action}: ${stat._count.action}`); + console.log(` ${stat.action}: ${stat._count.action}`); }); }, }; \ No newline at end of file diff --git a/packages/db/tools/scripts/inject-repo-data.ts b/packages/db/tools/scripts/inject-repo-data.ts index 209880f3..bb427cbe 100644 --- a/packages/db/tools/scripts/inject-repo-data.ts +++ b/packages/db/tools/scripts/inject-repo-data.ts @@ -1,8 +1,5 @@ import { Script } from "../scriptRunner"; import { PrismaClient } from "../../dist"; -import { createLogger } from "@sourcebot/logger"; - -const logger = createLogger('inject-repo-data'); const NUM_REPOS = 100000; @@ -35,7 +32,7 @@ export const injectRepoData: Script = { }); - logger.info(`Creating ${NUM_REPOS} repos...`); + console.log(`Creating ${NUM_REPOS} repos...`); for (let i = 0; i < NUM_REPOS; i++) { await prisma.repo.create({ @@ -59,6 +56,6 @@ export const injectRepoData: Script = { }); } - logger.info(`Created ${NUM_REPOS} repos.`); + console.log(`Created ${NUM_REPOS} repos.`); } }; \ No newline at end of file diff --git a/packages/db/tools/scripts/migrate-duplicate-connections.ts b/packages/db/tools/scripts/migrate-duplicate-connections.ts index fe3fa949..7093e429 100644 --- a/packages/db/tools/scripts/migrate-duplicate-connections.ts +++ b/packages/db/tools/scripts/migrate-duplicate-connections.ts @@ -1,9 +1,6 @@ import { Script } from "../scriptRunner"; import { PrismaClient } from "../../dist"; import { confirmAction } from "../utils"; -import { createLogger } from "@sourcebot/logger"; - -const logger = createLogger('migrate-duplicate-connections'); // Handles duplicate connections by renaming them to be unique. // @see: 20250320215449_unique_connection_name_constraint_within_org @@ -18,7 +15,7 @@ export const migrateDuplicateConnections: Script = { }, })).filter(({ _count }) => _count._all > 1); - logger.info(`Found ${duplicates.reduce((acc, { _count }) => acc + _count._all, 0)} duplicate connections.`); + console.log(`Found ${duplicates.reduce((acc, { _count }) => acc + _count._all, 0)} duplicate connections.`); confirmAction(); @@ -40,7 +37,7 @@ export const migrateDuplicateConnections: Script = { const connection = connections[i]; const newName = `${name}-${i + 1}`; - logger.info(`Migrating connection with id ${connection.id} from name=${name} to name=${newName}`); + console.log(`Migrating connection with id ${connection.id} from name=${name} to name=${newName}`); await prisma.connection.update({ where: { id: connection.id }, @@ -50,6 +47,6 @@ export const migrateDuplicateConnections: Script = { } } - logger.info(`Migrated ${migrated} connections.`); + console.log(`Migrated ${migrated} connections.`); }, }; diff --git a/packages/db/tools/scripts/test-repo-query-perf.ts b/packages/db/tools/scripts/test-repo-query-perf.ts index ee07d14f..c41beaca 100644 --- a/packages/db/tools/scripts/test-repo-query-perf.ts +++ b/packages/db/tools/scripts/test-repo-query-perf.ts @@ -1,8 +1,5 @@ import { Script } from "../scriptRunner"; import { PrismaClient } from "../../dist"; -import { createLogger } from "@sourcebot/logger"; - -const logger = createLogger('test-repo-query-perf'); export const testRepoQueryPerf: Script = { run: async (prisma: PrismaClient) => { @@ -23,6 +20,6 @@ export const testRepoQueryPerf: Script = { }); const durationMs = Date.now() - start; - logger.info(`Found ${allRepos.length} repos in ${durationMs}ms`); + console.log(`Found ${allRepos.length} repos in ${durationMs}ms`); } }; \ No newline at end of file diff --git a/packages/db/tools/utils.ts b/packages/db/tools/utils.ts index a096ac9f..ed1886b4 100644 --- a/packages/db/tools/utils.ts +++ b/packages/db/tools/utils.ts @@ -1,17 +1,14 @@ import readline from 'readline-sync'; -import { createLogger } from "@sourcebot/logger"; - -const logger = createLogger('db-utils'); export const confirmAction = (message: string = "Are you sure you want to proceed? [N/y]") => { const response = readline.question(message).toLowerCase(); if (response !== 'y') { - logger.info("Aborted."); + console.log("Aborted."); process.exit(0); } } export const abort = () => { - logger.info("Aborted."); + console.log("Aborted."); process.exit(0); }; diff --git a/packages/logger/.gitignore b/packages/logger/.gitignore deleted file mode 100644 index 96351007..00000000 --- a/packages/logger/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -dist/ -*.tsbuildinfo \ No newline at end of file diff --git a/packages/logger/package.json b/packages/logger/package.json deleted file mode 100644 index 2e2279a3..00000000 --- a/packages/logger/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "@sourcebot/logger", - "version": "0.1.0", - "main": "dist/index.js", - "type": "module", - "private": true, - "scripts": { - "build": "tsc", - "postinstall": "yarn build" - }, - "dependencies": { - "@logtail/node": "^0.5.2", - "@logtail/winston": "^0.5.2", - "@t3-oss/env-core": "^0.12.0", - "dotenv": "^16.4.5", - "triple-beam": "^1.4.1", - "winston": "^3.15.0", - "zod": "^3.24.3" - }, - "devDependencies": { - "@types/node": "^22.7.5", - "typescript": "^5.7.3" - } -} diff --git a/packages/logger/src/env.ts b/packages/logger/src/env.ts deleted file mode 100644 index 5f582e0d..00000000 --- a/packages/logger/src/env.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { createEnv } from "@t3-oss/env-core"; -import { z } from "zod"; -import dotenv from 'dotenv'; - -// Booleans are specified as 'true' or 'false' strings. -const booleanSchema = z.enum(["true", "false"]); - -dotenv.config({ - path: './.env', -}); - -dotenv.config({ - path: './.env.local', - override: true -}); - -export const env = createEnv({ - server: { - SOURCEBOT_LOG_LEVEL: z.enum(["info", "debug", "warn", "error"]).default("info"), - SOURCEBOT_STRUCTURED_LOGGING_ENABLED: booleanSchema.default("false"), - SOURCEBOT_STRUCTURED_LOGGING_FILE: z.string().optional(), - LOGTAIL_TOKEN: z.string().optional(), - LOGTAIL_HOST: z.string().url().optional(), - }, - runtimeEnv: process.env, - emptyStringAsUndefined: true, - skipValidation: process.env.SKIP_ENV_VALIDATION === "1", -}); \ No newline at end of file diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json deleted file mode 100644 index 88ae91dd..00000000 --- a/packages/logger/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2022", - "module": "Node16", - "moduleResolution": "Node16", - "lib": ["ES2023"], - "outDir": "dist", - "rootDir": "src", - "declaration": true, - "declarationMap": true, - "sourceMap": true, - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "skipLibCheck": true, - "isolatedModules": true, - "resolveJsonModule": true - }, - "include": ["src/**/*"], - "exclude": ["node_modules", "dist"] -} \ No newline at end of file diff --git a/packages/shared/package.json b/packages/shared/package.json index 902a3485..a921526e 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -9,14 +9,17 @@ "postinstall": "yarn build" }, "dependencies": { + "@logtail/node": "^0.5.2", + "@logtail/winston": "^0.5.2", "@sourcebot/crypto": "workspace:*", "@sourcebot/db": "workspace:*", - "@sourcebot/logger": "workspace:*", "@sourcebot/schemas": "workspace:*", "@t3-oss/env-core": "^0.12.0", "ajv": "^8.17.1", "micromatch": "^4.0.8", "strip-json-comments": "^5.0.1", + "triple-beam": "^1.4.1", + "winston": "^3.15.0", "zod": "^3.24.3" }, "devDependencies": { diff --git a/packages/shared/src/entitlements.ts b/packages/shared/src/entitlements.ts index 1c0c688f..184a2cb6 100644 --- a/packages/shared/src/entitlements.ts +++ b/packages/shared/src/entitlements.ts @@ -1,6 +1,6 @@ import { base64Decode } from "./utils.js"; import { z } from "zod"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "./logger.js"; import { verifySignature } from "@sourcebot/crypto"; import { env } from "./env.js"; import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js"; diff --git a/packages/shared/src/env.ts b/packages/shared/src/env.ts index 667dedaa..604315b5 100644 --- a/packages/shared/src/env.ts +++ b/packages/shared/src/env.ts @@ -72,16 +72,13 @@ export const env = createEnv({ FALLBACK_GITLAB_CLOUD_TOKEN: z.string().optional(), FALLBACK_GITEA_CLOUD_TOKEN: z.string().optional(), - REDIS_URL: z.string().url(), + REDIS_URL: z.string().url().default("redis://localhost:6379"), REDIS_REMOVE_ON_COMPLETE: numberSchema.default(0), REDIS_REMOVE_ON_FAIL: numberSchema.default(100), - LOGTAIL_TOKEN: z.string().optional(), - LOGTAIL_HOST: z.string().url().optional(), - SOURCEBOT_LOG_LEVEL: z.enum(["info", "debug", "warn", "error"]).default("info"), DEBUG_ENABLE_GROUPMQ_LOGGING: booleanSchema.default('false'), - DATABASE_URL: z.string().url(), + DATABASE_URL: z.string().url().default("postgresql://postgres:postgres@localhost:5432/postgres"), CONFIG_PATH: z.string(), CONNECTION_MANAGER_UPSERT_TIMEOUT_MS: numberSchema.default(300000), @@ -92,6 +89,12 @@ export const env = createEnv({ EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'), AUTH_EE_GITHUB_BASE_URL: z.string().optional(), AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"), + + SOURCEBOT_LOG_LEVEL: z.enum(["info", "debug", "warn", "error"]).default("info"), + SOURCEBOT_STRUCTURED_LOGGING_ENABLED: booleanSchema.default("false"), + SOURCEBOT_STRUCTURED_LOGGING_FILE: z.string().optional(), + LOGTAIL_TOKEN: z.string().optional(), + LOGTAIL_HOST: z.string().url().optional(), }, client: { NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(), diff --git a/packages/shared/src/index.server.ts b/packages/shared/src/index.server.ts index b841c6d9..585f4e53 100644 --- a/packages/shared/src/index.server.ts +++ b/packages/shared/src/index.server.ts @@ -27,4 +27,10 @@ export { export * from "./constants.js"; export { env -} from "./env.js"; \ No newline at end of file +} from "./env.js"; +export { + createLogger, +} from "./logger.js"; +export type { + Logger, +} from "./logger.js"; \ No newline at end of file diff --git a/packages/logger/src/index.ts b/packages/shared/src/logger.ts similarity index 96% rename from packages/logger/src/index.ts rename to packages/shared/src/logger.ts index 635c8b3c..c636868d 100644 --- a/packages/logger/src/index.ts +++ b/packages/shared/src/logger.ts @@ -16,7 +16,7 @@ import { env } from './env.js'; * - Logs will be formatted as: "timestamp level: [label] message" */ -const { combine, colorize, timestamp, prettyPrint, errors, printf, label: labelFn, json } = format; +const { combine, colorize, timestamp, errors, printf, label: labelFn, json } = format; const datadogFormat = format((info) => { info.status = info.level.toLowerCase(); diff --git a/packages/web/package.json b/packages/web/package.json index a7a798ab..62ede328 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -93,7 +93,6 @@ "@sourcebot/crypto": "workspace:*", "@sourcebot/db": "workspace:*", "@sourcebot/error": "workspace:*", - "@sourcebot/logger": "workspace:*", "@sourcebot/schemas": "workspace:*", "@sourcebot/shared": "workspace:*", "@ssddanbrown/codemirror-lang-twig": "^1.0.0", diff --git a/packages/web/sentry.server.config.ts b/packages/web/sentry.server.config.ts index 548160c8..c9416bc6 100644 --- a/packages/web/sentry.server.config.ts +++ b/packages/web/sentry.server.config.ts @@ -3,7 +3,7 @@ // https://docs.sentry.io/platforms/javascript/guides/nextjs/ import * as Sentry from "@sentry/nextjs"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('sentry-server-config'); diff --git a/packages/web/src/actions.ts b/packages/web/src/actions.ts index 4ebfd552..112d7c28 100644 --- a/packages/web/src/actions.ts +++ b/packages/web/src/actions.ts @@ -11,7 +11,7 @@ import { render } from "@react-email/components"; import * as Sentry from '@sentry/nextjs'; import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/crypto"; import { ApiKey, ConnectionSyncJobStatus, Org, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType, StripeSubscriptionStatus } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type"; import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type"; import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type"; diff --git a/packages/web/src/app/api/(server)/chat/route.ts b/packages/web/src/app/api/(server)/chat/route.ts index 8f045305..1abc1a1c 100644 --- a/packages/web/src/app/api/(server)/chat/route.ts +++ b/packages/web/src/app/api/(server)/chat/route.ts @@ -10,7 +10,7 @@ import { prisma } from "@/prisma"; import { LanguageModelV2 as AISDKLanguageModelV2 } from "@ai-sdk/provider"; import * as Sentry from "@sentry/nextjs"; import { OrgRole } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { createUIMessageStream, createUIMessageStreamResponse, diff --git a/packages/web/src/app/api/(server)/ee/user/route.ts b/packages/web/src/app/api/(server)/ee/user/route.ts index e308924b..539f4e7c 100644 --- a/packages/web/src/app/api/(server)/ee/user/route.ts +++ b/packages/web/src/app/api/(server)/ee/user/route.ts @@ -4,7 +4,7 @@ import { withAuthV2, withMinimumOrgRole } from "@/withAuthV2"; import { OrgRole } from "@sourcebot/db"; import { isServiceError } from "@/lib/utils"; import { serviceErrorResponse, missingQueryParam, notFound } from "@/lib/serviceError"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { NextRequest } from "next/server"; import { StatusCodes } from "http-status-codes"; import { ErrorCode } from "@/lib/errorCodes"; diff --git a/packages/web/src/app/api/(server)/ee/users/route.ts b/packages/web/src/app/api/(server)/ee/users/route.ts index cc37c419..e77edb18 100644 --- a/packages/web/src/app/api/(server)/ee/users/route.ts +++ b/packages/web/src/app/api/(server)/ee/users/route.ts @@ -4,7 +4,7 @@ import { withAuthV2, withMinimumOrgRole } from "@/withAuthV2"; import { OrgRole } from "@sourcebot/db"; import { isServiceError } from "@/lib/utils"; import { serviceErrorResponse } from "@/lib/serviceError"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { getAuditService } from "@/ee/features/audit/factory"; const logger = createLogger('ee-users-api'); diff --git a/packages/web/src/app/api/(server)/health/route.ts b/packages/web/src/app/api/(server)/health/route.ts index ac1a2ba1..24b69876 100644 --- a/packages/web/src/app/api/(server)/health/route.ts +++ b/packages/web/src/app/api/(server)/health/route.ts @@ -1,6 +1,6 @@ 'use server'; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('health-check'); diff --git a/packages/web/src/app/api/(server)/stripe/route.ts b/packages/web/src/app/api/(server)/stripe/route.ts index 84b67114..cab38a33 100644 --- a/packages/web/src/app/api/(server)/stripe/route.ts +++ b/packages/web/src/app/api/(server)/stripe/route.ts @@ -5,7 +5,7 @@ import { prisma } from '@/prisma'; import { StripeSubscriptionStatus } from '@sourcebot/db'; import { stripeClient } from '@/ee/features/billing/stripe'; import { env } from '@/env.mjs'; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('stripe-webhook'); diff --git a/packages/web/src/app/api/(server)/webhook/route.ts b/packages/web/src/app/api/(server)/webhook/route.ts index ade6e54d..a13b5d07 100644 --- a/packages/web/src/app/api/(server)/webhook/route.ts +++ b/packages/web/src/app/api/(server)/webhook/route.ts @@ -9,7 +9,7 @@ import { processGitHubPullRequest } from "@/features/agents/review-agent/app"; import { throttling } from "@octokit/plugin-throttling"; import fs from "fs"; import { GitHubPullRequest } from "@/features/agents/review-agent/types"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('github-webhook'); diff --git a/packages/web/src/app/signup/page.tsx b/packages/web/src/app/signup/page.tsx index fd00c87d..2ca0b868 100644 --- a/packages/web/src/app/signup/page.tsx +++ b/packages/web/src/app/signup/page.tsx @@ -2,8 +2,9 @@ import { auth } from "@/auth"; import { LoginForm } from "../login/components/loginForm"; import { redirect } from "next/navigation"; import { Footer } from "@/app/components/footer"; -import { createLogger } from "@sourcebot/logger"; import { getIdentityProviderMetadata } from "@/lib/identityProviders"; +import { createLogger } from "@sourcebot/shared"; +import { getAuthProviders } from "@/lib/authProviders"; import { getOrgFromDomain } from "@/data/org"; import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"; diff --git a/packages/web/src/ee/features/audit/actions.ts b/packages/web/src/ee/features/audit/actions.ts index 57455cb0..60814946 100644 --- a/packages/web/src/ee/features/audit/actions.ts +++ b/packages/web/src/ee/features/audit/actions.ts @@ -5,7 +5,7 @@ import { ErrorCode } from "@/lib/errorCodes"; import { StatusCodes } from "http-status-codes"; import { sew, withAuth, withOrgMembership } from "@/actions"; import { OrgRole } from "@sourcebot/db"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { ServiceError } from "@/lib/serviceError"; import { getAuditService } from "@/ee/features/audit/factory"; import { AuditEvent } from "./types"; diff --git a/packages/web/src/ee/features/audit/auditService.ts b/packages/web/src/ee/features/audit/auditService.ts index 09cc647b..a0bee39a 100644 --- a/packages/web/src/ee/features/audit/auditService.ts +++ b/packages/web/src/ee/features/audit/auditService.ts @@ -1,7 +1,7 @@ import { IAuditService, AuditEvent } from '@/ee/features/audit/types'; import { prisma } from '@/prisma'; import { Audit } from '@prisma/client'; -import { createLogger } from '@sourcebot/logger'; +import { createLogger } from '@sourcebot/shared'; const logger = createLogger('audit-service'); diff --git a/packages/web/src/ee/features/billing/actions.ts b/packages/web/src/ee/features/billing/actions.ts index 48b11581..84ede5e7 100644 --- a/packages/web/src/ee/features/billing/actions.ts +++ b/packages/web/src/ee/features/billing/actions.ts @@ -12,7 +12,7 @@ import { StatusCodes } from "http-status-codes"; import { ErrorCode } from "@/lib/errorCodes"; import { headers } from "next/headers"; import { getSubscriptionForOrg } from "./serverUtils"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('billing-actions'); diff --git a/packages/web/src/ee/features/sso/sso.ts b/packages/web/src/ee/features/sso/sso.ts index 9a5153ff..9095cc06 100644 --- a/packages/web/src/ee/features/sso/sso.ts +++ b/packages/web/src/ee/features/sso/sso.ts @@ -11,11 +11,11 @@ import Credentials from "next-auth/providers/credentials"; import type { User as AuthJsUser } from "next-auth"; import type { Provider } from "next-auth/providers"; import { onCreateUser } from "@/lib/authUtils"; -import { createLogger } from "@sourcebot/logger"; import { hasEntitlement, loadConfig } from "@sourcebot/shared"; import { getTokenFromConfig } from "@sourcebot/crypto"; import type { IdentityProvider } from "@/auth"; import { GCPIAPIdentityProviderConfig, GitHubIdentityProviderConfig, GitLabIdentityProviderConfig, GoogleIdentityProviderConfig, KeycloakIdentityProviderConfig, MicrosoftEntraIDIdentityProviderConfig, OktaIdentityProviderConfig } from "@sourcebot/schemas/v3/index.type"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('web-sso'); diff --git a/packages/web/src/features/agents/review-agent/app.ts b/packages/web/src/features/agents/review-agent/app.ts index 0ea2af8f..dfd7a289 100644 --- a/packages/web/src/features/agents/review-agent/app.ts +++ b/packages/web/src/features/agents/review-agent/app.ts @@ -6,7 +6,7 @@ import { env } from "@/env.mjs"; import { GitHubPullRequest } from "@/features/agents/review-agent/types"; import path from "path"; import fs from "fs"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const rules = [ "Do NOT provide general feedback, summaries, explanations of changes, or praises for making good additions.", diff --git a/packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts b/packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts index 7617c959..d9903b72 100644 --- a/packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts +++ b/packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts @@ -2,7 +2,7 @@ import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/revie import { getFileSource } from "@/features/search/fileSourceApi"; import { fileSourceResponseSchema } from "@/features/search/schemas"; import { isServiceError } from "@/lib/utils"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('fetch-file-content'); diff --git a/packages/web/src/features/agents/review-agent/nodes/generateDiffReviewPrompt.ts b/packages/web/src/features/agents/review-agent/nodes/generateDiffReviewPrompt.ts index 59060408..f5eda1ca 100644 --- a/packages/web/src/features/agents/review-agent/nodes/generateDiffReviewPrompt.ts +++ b/packages/web/src/features/agents/review-agent/nodes/generateDiffReviewPrompt.ts @@ -1,6 +1,6 @@ import { sourcebot_diff, sourcebot_context, sourcebot_file_diff_review_schema } from "@/features/agents/review-agent/types"; import { zodToJsonSchema } from "zod-to-json-schema"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('generate-diff-review-prompt'); diff --git a/packages/web/src/features/agents/review-agent/nodes/generatePrReview.ts b/packages/web/src/features/agents/review-agent/nodes/generatePrReview.ts index 48f6bda0..3e1fb0ed 100644 --- a/packages/web/src/features/agents/review-agent/nodes/generatePrReview.ts +++ b/packages/web/src/features/agents/review-agent/nodes/generatePrReview.ts @@ -2,7 +2,7 @@ import { sourcebot_pr_payload, sourcebot_diff_review, sourcebot_file_diff_review import { generateDiffReviewPrompt } from "@/features/agents/review-agent/nodes/generateDiffReviewPrompt"; import { invokeDiffReviewLlm } from "@/features/agents/review-agent/nodes/invokeDiffReviewLlm"; import { fetchFileContent } from "@/features/agents/review-agent/nodes/fetchFileContent"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('generate-pr-review'); diff --git a/packages/web/src/features/agents/review-agent/nodes/githubPrParser.ts b/packages/web/src/features/agents/review-agent/nodes/githubPrParser.ts index b1cee198..b633450e 100644 --- a/packages/web/src/features/agents/review-agent/nodes/githubPrParser.ts +++ b/packages/web/src/features/agents/review-agent/nodes/githubPrParser.ts @@ -2,7 +2,7 @@ import { sourcebot_pr_payload, sourcebot_file_diff, sourcebot_diff } from "@/fea import parse from "parse-diff"; import { Octokit } from "octokit"; import { GitHubPullRequest } from "@/features/agents/review-agent/types"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('github-pr-parser'); diff --git a/packages/web/src/features/agents/review-agent/nodes/githubPushPrReviews.ts b/packages/web/src/features/agents/review-agent/nodes/githubPushPrReviews.ts index e0a9e597..a6ef88d2 100644 --- a/packages/web/src/features/agents/review-agent/nodes/githubPushPrReviews.ts +++ b/packages/web/src/features/agents/review-agent/nodes/githubPushPrReviews.ts @@ -1,6 +1,6 @@ import { Octokit } from "octokit"; import { sourcebot_pr_payload, sourcebot_file_diff_review } from "@/features/agents/review-agent/types"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('github-push-pr-reviews'); diff --git a/packages/web/src/features/agents/review-agent/nodes/invokeDiffReviewLlm.ts b/packages/web/src/features/agents/review-agent/nodes/invokeDiffReviewLlm.ts index c726ba01..36684ffc 100644 --- a/packages/web/src/features/agents/review-agent/nodes/invokeDiffReviewLlm.ts +++ b/packages/web/src/features/agents/review-agent/nodes/invokeDiffReviewLlm.ts @@ -2,7 +2,7 @@ import OpenAI from "openai"; import { sourcebot_file_diff_review, sourcebot_file_diff_review_schema } from "@/features/agents/review-agent/types"; import { env } from "@/env.mjs"; import fs from "fs"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; const logger = createLogger('invoke-diff-review-llm'); diff --git a/packages/web/src/features/chat/agent.ts b/packages/web/src/features/chat/agent.ts index 7df5a6d4..402e1732 100644 --- a/packages/web/src/features/chat/agent.ts +++ b/packages/web/src/features/chat/agent.ts @@ -2,7 +2,7 @@ import { env } from "@/env.mjs"; import { getFileSource } from "@/features/search/fileSourceApi"; import { isServiceError } from "@/lib/utils"; import { ProviderOptions } from "@ai-sdk/provider-utils"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { LanguageModel, ModelMessage, StopCondition, streamText } from "ai"; import { ANSWER_TAG, FILE_REFERENCE_PREFIX, toolNames } from "./constants"; import { createCodeSearchTool, findSymbolDefinitionsTool, findSymbolReferencesTool, readFilesTool, searchReposTool, listAllReposTool } from "./tools"; diff --git a/packages/web/src/features/fileTree/actions.ts b/packages/web/src/features/fileTree/actions.ts index 6111ea70..4d03eb17 100644 --- a/packages/web/src/features/fileTree/actions.ts +++ b/packages/web/src/features/fileTree/actions.ts @@ -5,7 +5,7 @@ import { env } from '@/env.mjs'; import { notFound, unexpectedError } from '@/lib/serviceError'; import { withOptionalAuthV2 } from '@/withAuthV2'; import { Repo } from '@sourcebot/db'; -import { createLogger } from '@sourcebot/logger'; +import { createLogger } from '@sourcebot/shared'; import path from 'path'; import { simpleGit } from 'simple-git'; diff --git a/packages/web/src/initialize.ts b/packages/web/src/initialize.ts index b08685b2..d40a7ccf 100644 --- a/packages/web/src/initialize.ts +++ b/packages/web/src/initialize.ts @@ -2,7 +2,7 @@ import { createGuestUser } from '@/lib/authUtils'; import { SOURCEBOT_SUPPORT_EMAIL } from "@/lib/constants"; import { prisma } from "@/prisma"; import { OrgRole } from '@sourcebot/db'; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { hasEntitlement, loadConfig } from '@sourcebot/shared'; import { getOrgFromDomain } from './data/org'; import { env } from './env.mjs'; diff --git a/packages/web/src/lib/authUtils.ts b/packages/web/src/lib/authUtils.ts index bf7e5ea9..e11942a4 100644 --- a/packages/web/src/lib/authUtils.ts +++ b/packages/web/src/lib/authUtils.ts @@ -5,7 +5,7 @@ import { SINGLE_TENANT_ORG_ID, SOURCEBOT_GUEST_USER_EMAIL, SOURCEBOT_GUEST_USER_ import { getPlan, getSeats, hasEntitlement, SOURCEBOT_UNLIMITED_SEATS } from "@sourcebot/shared"; import { isServiceError } from "@/lib/utils"; import { orgNotFound, ServiceError, userNotFound } from "@/lib/serviceError"; -import { createLogger } from "@sourcebot/logger"; +import { createLogger } from "@sourcebot/shared"; import { getAuditService } from "@/ee/features/audit/factory"; import { StatusCodes } from "http-status-codes"; import { ErrorCode } from "./errorCodes"; diff --git a/yarn.lock b/yarn.lock index f6f9af62..fd3f54f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7896,7 +7896,6 @@ __metadata: "@sourcebot/crypto": "workspace:*" "@sourcebot/db": "workspace:*" "@sourcebot/error": "workspace:*" - "@sourcebot/logger": "workspace:*" "@sourcebot/schemas": "workspace:*" "@sourcebot/shared": "workspace:*" "@t3-oss/env-core": "npm:^0.12.0" @@ -7964,7 +7963,6 @@ __metadata: resolution: "@sourcebot/db@workspace:packages/db" dependencies: "@prisma/client": "npm:6.2.1" - "@sourcebot/logger": "workspace:*" "@types/argparse": "npm:^2.0.16" "@types/readline-sync": "npm:^1.4.8" argparse: "npm:^2.0.1" @@ -7984,22 +7982,6 @@ __metadata: languageName: unknown linkType: soft -"@sourcebot/logger@workspace:*, @sourcebot/logger@workspace:packages/logger": - version: 0.0.0-use.local - resolution: "@sourcebot/logger@workspace:packages/logger" - dependencies: - "@logtail/node": "npm:^0.5.2" - "@logtail/winston": "npm:^0.5.2" - "@t3-oss/env-core": "npm:^0.12.0" - "@types/node": "npm:^22.7.5" - dotenv: "npm:^16.4.5" - triple-beam: "npm:^1.4.1" - typescript: "npm:^5.7.3" - winston: "npm:^3.15.0" - zod: "npm:^3.24.3" - languageName: unknown - linkType: soft - "@sourcebot/mcp@workspace:packages/mcp": version: 0.0.0-use.local resolution: "@sourcebot/mcp@workspace:packages/mcp" @@ -8036,9 +8018,10 @@ __metadata: version: 0.0.0-use.local resolution: "@sourcebot/shared@workspace:packages/shared" dependencies: + "@logtail/node": "npm:^0.5.2" + "@logtail/winston": "npm:^0.5.2" "@sourcebot/crypto": "workspace:*" "@sourcebot/db": "workspace:*" - "@sourcebot/logger": "workspace:*" "@sourcebot/schemas": "workspace:*" "@t3-oss/env-core": "npm:^0.12.0" "@types/micromatch": "npm:^4.0.9" @@ -8046,8 +8029,10 @@ __metadata: ajv: "npm:^8.17.1" micromatch: "npm:^4.0.8" strip-json-comments: "npm:^5.0.1" + triple-beam: "npm:^1.4.1" tsc-watch: "npm:6.2.1" typescript: "npm:^5.7.3" + winston: "npm:^3.15.0" zod: "npm:^3.24.3" languageName: unknown linkType: soft @@ -8138,7 +8123,6 @@ __metadata: "@sourcebot/crypto": "workspace:*" "@sourcebot/db": "workspace:*" "@sourcebot/error": "workspace:*" - "@sourcebot/logger": "workspace:*" "@sourcebot/schemas": "workspace:*" "@sourcebot/shared": "workspace:*" "@ssddanbrown/codemirror-lang-twig": "npm:^1.0.0"