Fix sentry

Author: bcomnes

.github/workflows/deploy.yml

@@ -49,10 +49,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
       - name: Install pnpm
         uses: pnpm/action-setup@v6
         with:
-          version: 10
+          version: 11.5.2
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
@@ -97,13 +99,16 @@ jobs:
         if: ${{ github.event.inputs.deploy-web == 'true' }}
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_BROWSER_DSN: ${{ secrets.SENTRY_BROWSER_DSN }}
           MAXMIND_ACCOUNT_ID: ${{ secrets.MAXMIND_ACCOUNT_ID }}
           MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }}
       - name: Deploy worker
         run: pnpm run deploy:worker
         if: ${{ github.event.inputs.deploy-worker == 'true' }}
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - name: Save GeoIP cache
         if: always()
         uses: actions/cache/save@v5

.github/workflows/release.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v6
         with:
-          version: 10
+          version: 11.5.2
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
@@ -116,13 +116,16 @@ jobs:
         if: ${{ github.event.inputs.deploy-web == 'true' }}
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_BROWSER_DSN: ${{ secrets.SENTRY_BROWSER_DSN }}
           MAXMIND_ACCOUNT_ID: ${{ secrets.MAXMIND_ACCOUNT_ID }}
           MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }}
       - name: Deploy worker
         run: pnpm run deploy:worker
         if: ${{ github.event.inputs.deploy-worker == 'true' }}
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - name: Save GeoIP cache
         if: always()
         uses: actions/cache/save@v5

knip.json

@@ -1,6 +1,6 @@
 {
   "ignore": [],
-  "ignoreBinaries": ["flyctl", "eslint"],
+  "ignoreBinaries": ["eslint"],
   "ignoreUnresolved": ["spec", "lcov"],
   "ignoreDependencies": [],
   "ignoreWorkspaces": [],

package.json

@@ -11,10 +11,11 @@
     "node": ">=24.0.0"
   },
   "devDependencies": {
-    "releasearoni": "^0.1.0",
+    "@sentry/cli": "^3.5.1",
     "knip": "^6.7.0",
     "neostandard": "^0.12.0",
-    "npm-run-all2": "^8.0.1"
+    "npm-run-all2": "^8.0.1",
+    "releasearoni": "^0.1.0"
   },
   "funding": {
     "type": "individual",
@@ -46,9 +47,10 @@
     "build": "pnpm run -r build",
     "migrate": "pnpm run -r migrate",
     "start": "pnpm run watch",
-    "deploy": "run-s deploy:*",
-    "deploy:web": "flyctl deploy --config ./packages/web/fly.toml --dockerfile ./packages/web/Dockerfile",
-    "deploy:worker": "flyctl deploy --config ./packages/worker/fly.toml --dockerfile ./packages/worker/Dockerfile",
+    "deploy-all": "run-s deploy:*",
+    "deploy:web": "./scripts/deploy-with-sentry.sh ./packages/web/fly.toml ./packages/web/Dockerfile",
+    "deploy:worker": "./scripts/deploy-with-sentry.sh ./packages/worker/fly.toml ./packages/worker/Dockerfile",
+    "sentry:login": "sentry-cli login",
     "knip": "knip --dependencies",
     "new-blogpost": "node scripts/create-blogpost.js --title",
     "publish-draft": "node scripts/publish-blogpost.js",

packages/web/Dockerfile

@@ -7,9 +7,11 @@ ARG ENV=production
 ARG HOST=localhost:3000
 ARG NODE_ENV=production
 ARG NODE_VERSION=24
+ARG SENTRY_BROWSER_DSN=
+ARG SENTRY_RELEASE=development
 ARG TRANSPORT=https
 
-FROM alpine:3.23 AS base
+FROM alpine:3.24 AS base
 
 LABEL maintainer="HifiWifi LLC"
 LABEL fly_launch_runtime="Fastify"
@@ -27,6 +29,8 @@ ARG ENV=production
 ARG HOST=localhost:3000
 ARG NODE_ENV=production
 ARG NODE_VERSION
+ARG SENTRY_BROWSER_DSN=
+ARG SENTRY_RELEASE=development
 ARG TRANSPORT=https
 
 # RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
@@ -54,6 +58,9 @@ RUN pnpm --filter=@breadcrum/web deploy --prod ./deploy/web
 # Final stage for app image
 FROM base
 
+ARG SENTRY_RELEASE=development
+ENV SENTRY_RELEASE=${SENTRY_RELEASE}
+
 # Copy built application from deploy directory
 COPY --from=build /usr/src/app/deploy/web /usr/src/app
 

packages/web/client/globals/global.client.js

@@ -1,12 +1,27 @@
 /// <reference lib="dom" />
 
+import * as Sentry from '@sentry/browser'
 // @ts-expect-error - No type definitions available for mine.css
 import { toggleTheme } from 'mine.css'
 import 'fragmentions'
 import { html } from 'htm/preact'
 import { render } from 'preact'
 import { Header } from '../components/header/index.js'
 
+const sentryDsn = process.env['SENTRY_BROWSER_DSN']
+
+if (sentryDsn) {
+  Sentry.init({
+    dsn: sentryDsn,
+    environment: process.env['SENTRY_ENVIRONMENT'] || undefined,
+    release: process.env['SENTRY_RELEASE'] || undefined,
+    dataCollection: {
+      // userInfo: false,
+      // httpBodies: [],
+    },
+  })
+}
+
 // @ts-expect-error - Adding toggleTheme to global window object
 window.toggleTheme = toggleTheme
 

packages/web/client/globals/global.vars.js

@@ -57,10 +57,15 @@ const host = process.env['HOST'] ?? 'localhost:3000'
 /** @type {string} */
 const baseUrl = `${transport}://${host}`
 /** @type {string} */
+const sentryEnvironment = process.env['SENTRY_ENVIRONMENT'] ?? process.env['ENV'] ?? process.env['NODE_ENV'] ?? 'development'
+/** @type {string} */
 /** @type {Record<string, string>} */
 export const browser = {
   'process.env.TRANSPORT': transport,
   'process.env.HOST': host,
+  'process.env.SENTRY_BROWSER_DSN': process.env['SENTRY_BROWSER_DSN'] ?? '',
+  'process.env.SENTRY_ENVIRONMENT': sentryEnvironment,
+  'process.env.SENTRY_RELEASE': process.env['SENTRY_RELEASE'] ?? '',
 }
 
 /** @type {() => Promise<GlobalVars>} */

packages/web/config/env-schema.js

@@ -97,6 +97,15 @@ export const envSchema = /** @type {const} @satisfies {JSONSchema} */ ({
       type: 'string',
       default: 'deployment.environment=development',
     },
+    SENTRY_DSN: {
+      type: 'string',
+    },
+    SENTRY_BROWSER_DSN: {
+      type: 'string',
+    },
+    SENTRY_RELEASE: {
+      type: 'string',
+    },
     MAXMIND_ACCOUNT_ID: {
       type: 'string',
     },

packages/web/fly.toml

@@ -22,7 +22,7 @@ swap_size_mb = 1024
     NODE_VERSION = "24"
 
 [deploy]
-  release_command = "pnpm run migrate --no-config"
+  release_command = "node --run migrate -- --no-config"
 
 [env]
   ENV = "production"
@@ -62,7 +62,7 @@ swap_size_mb = 1024
   [[services.tcp_checks]]
     interval = "15s"
     timeout = "2s"
-    grace_period = "1s"
+    grace_period = "15s"
     restart_limit = 0
 
   [[services.http_checks]]

packages/web/otel.js

@@ -7,6 +7,20 @@ import { RuntimeNodeInstrumentation } from '@opentelemetry/instrumentation-runti
 import { HostMetrics } from '@opentelemetry/host-metrics'
 import { metrics } from '@opentelemetry/api'
 
+const sentryDsn = process.env['SENTRY_DSN']
+const sentryEnvironment = process.env['SENTRY_ENVIRONMENT'] ?? process.env['ENV'] ?? process.env['NODE_ENV']
+const sentryRelease = process.env['SENTRY_RELEASE']
+
+if (sentryDsn) {
+  const Sentry = await import('@sentry/node')
+  Sentry.init({
+    dsn: sentryDsn,
+    environment: sentryEnvironment,
+    release: sentryRelease,
+    skipOpenTelemetrySetup: true,
+  })
+}
+
 /*
 // Tracing boilerplate.
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'