From 432f65ff6115e9959310d6eecfc94318d9be3600 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 27 Feb 2025 13:51:57 -0600
Subject: [PATCH] Remove `@/config.ts` import when starting Sentry

---
 packages/ditto/app.ts                   |  3 +++
 packages/ditto/sentry.ts                | 19 +++++++++----------
 packages/ditto/server.ts                |  8 ++++----
 packages/ditto/workers/verify.worker.ts |  1 -
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/ditto/app.ts b/packages/ditto/app.ts
index f89448c4..f417b1b0 100644
--- a/packages/ditto/app.ts
+++ b/packages/ditto/app.ts
@@ -12,6 +12,7 @@ import { NostrEvent, NostrSigner, NRelay, NUploader } from '@nostrify/nostrify';
 
 import { cron } from '@/cron.ts';
 import { startFirehose } from '@/firehose.ts';
+import { startSentry } from '@/sentry.ts';
 import { DittoAPIStore } from '@/storages/DittoAPIStore.ts';
 import { DittoPgStore } from '@/storages/DittoPgStore.ts';
 import { DittoPool } from '@/storages/DittoPool.ts';
@@ -182,6 +183,8 @@ type AppController<P extends string = any> = Handler<AppEnv, P, HonoInput, Respo
 
 const conf = new DittoConf(Deno.env);
 
+startSentry(conf);
+
 const db = new DittoPolyPg(conf.databaseUrl, {
   poolSize: conf.pg.poolSize,
   debug: conf.pgliteDebug,
diff --git a/packages/ditto/sentry.ts b/packages/ditto/sentry.ts
index 4875a12e..4e8c3c2b 100644
--- a/packages/ditto/sentry.ts
+++ b/packages/ditto/sentry.ts
@@ -1,15 +1,14 @@
 import * as Sentry from '@sentry/deno';
 import { logi } from '@soapbox/logi';
 
-import { Conf } from '@/config.ts';
+import type { DittoConf } from '@ditto/conf';
 
-// Sentry
-if (Conf.sentryDsn) {
-  logi({ level: 'info', ns: 'ditto.sentry', msg: 'Sentry enabled.', enabled: true });
-  Sentry.init({
-    dsn: Conf.sentryDsn,
-    tracesSampleRate: 1.0,
-  });
-} else {
-  logi({ level: 'info', ns: 'ditto.sentry', msg: 'Sentry not configured. Skipping.', enabled: false });
+/** Start Sentry, if configured. */
+export function startSentry(conf: DittoConf): void {
+  if (conf.sentryDsn) {
+    logi({ level: 'info', ns: 'ditto.sentry', msg: 'Sentry enabled.', enabled: true });
+    Sentry.init({ dsn: conf.sentryDsn });
+  } else {
+    logi({ level: 'info', ns: 'ditto.sentry', msg: 'Sentry not configured. Skipping.', enabled: false });
+  }
 }
diff --git a/packages/ditto/server.ts b/packages/ditto/server.ts
index 69dc1e02..0dad9fba 100644
--- a/packages/ditto/server.ts
+++ b/packages/ditto/server.ts
@@ -1,12 +1,12 @@
+import { DittoConf } from '@ditto/conf';
 import { logi } from '@soapbox/logi';
 
-import '@/sentry.ts';
-import '@/nostr-wasm.ts';
 import app from '@/app.ts';
-import { Conf } from '@/config.ts';
+
+const conf = new DittoConf(Deno.env);
 
 Deno.serve({
-  port: Conf.port,
+  port: conf.port,
   onListen({ hostname, port }): void {
     logi({ level: 'info', ns: 'ditto.server', msg: `Listening on http://${hostname}:${port}`, hostname, port });
   },
diff --git a/packages/ditto/workers/verify.worker.ts b/packages/ditto/workers/verify.worker.ts
index 3e71215d..e218474e 100644
--- a/packages/ditto/workers/verify.worker.ts
+++ b/packages/ditto/workers/verify.worker.ts
@@ -3,7 +3,6 @@ import * as Comlink from 'comlink';
 import { VerifiedEvent, verifyEvent } from 'nostr-tools';
 
 import '@/nostr-wasm.ts';
-import '@/sentry.ts';
 
 export const VerifyWorker = {
   verifyEvent(event: NostrEvent): event is VerifiedEvent {