feat: Add Spotlight to Node events (#108)

dcramer · Nov 28, 2023 · f50f50b · f50f50b
1 parent a0fd62b
commit f50f50b
Show file tree

Hide file tree

Showing 9 changed files with 627 additions and 405 deletions.
diff --git a/apps/server/package.json b/apps/server/package.json
@@ -26,10 +26,10 @@
     "@paralleldrive/cuid2": "^2.2.2",
     "@peated/design": "workspace:*",
     "@peated/tsconfig": "workspace:*",
-    "@sentry/core": "^7.80.1",
-    "@sentry/node-experimental": "^7.80.1",
+    "@sentry/core": "^7.83.0",
+    "@sentry/node-experimental": "^7.83.0",
     "@sentry/profiling-node": "^1.2.6",
-    "@sentry/utils": "^7.80.0",
+    "@sentry/utils": "^7.83.0",
     "@trpc/client": "^10.43.3",
     "@trpc/server": "^10.43.3",
     "@types/bcrypt": "^5.0.2",

diff --git a/apps/server/src/sentry.ts b/apps/server/src/sentry.ts
@@ -1,15 +1,15 @@
 import * as Sentry from "@sentry/node-experimental";
 import { ProfilingIntegration } from "@sentry/profiling-node";
-import config from "./config";
-
 import packageData from "../package.json";
+import config from "./config";
 
 Sentry.init({
   dsn: config.SENTRY_DSN,
   release: config.VERSION,
   tracesSampleRate: 1.0,
   profilesSampleRate: 1.0,
   integrations: [new ProfilingIntegration()],
+  spotlight: config.ENV === "development",
 });
 
 Sentry.setTag("service", packageData.name);
diff --git a/apps/web/app/entry.client.tsx b/apps/web/app/entry.client.tsx
@@ -68,7 +68,7 @@ startTransition(() => {
   hydrateRoot(document, <RemixBrowser />);
 });
 
-import * as Spotlight from "@spotlightjs/core";
+import * as Spotlight from "@spotlightjs/overlay";
 
 if (config.ENV !== "production") {
   Spotlight.init({

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -37,10 +37,9 @@
     "@remix-run/server-runtime": "^2.2.0",
     "@rollup/plugin-replace": "^5.0.5",
     "@sentry-internal/feedback": "0.0.1-alpha.9",
-    "@sentry/react": "^7.80.1",
-    "@sentry/remix": "^7.80.1",
-    "@sentry/vite-plugin": "^2.10.1",
-    "@spotlightjs/core": "^0.0.9",
+    "@sentry/react": "^7.83.0",
+    "@sentry/remix": "^7.83.0",
+    "@sentry/vite-plugin": "^2.10.2",
     "@svgr/cli": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/plugin-svgo": "^8.1.0",
@@ -104,5 +103,8 @@
       "extensions": "svg",
       "quiet": false
     }
+  },
+  "devDependencies": {
+    "@spotlightjs/overlay": "^0.0.17"
   }
 }
diff --git a/apps/web/server.ts b/apps/web/server.ts
@@ -1,7 +1,9 @@
 import prom from "@isaacs/express-prometheus-middleware";
+import { sentryLink } from "@peated/server/src/lib/trpc";
 import { type AppRouter } from "@peated/server/trpc/router";
 import { createRequestHandler } from "@remix-run/express";
 import { type AppLoadContext } from "@remix-run/server-runtime";
+import * as Sentry from "@sentry/remix";
 import { wrapExpressCreateRequestHandler } from "@sentry/remix";
 import { createTRPCProxyClient, httpBatchLink } from "@trpc/client";
 import compression from "compression";
@@ -17,10 +19,6 @@ import {
   getUser,
   logout,
 } from "~/services/session.server";
-
-import * as Sentry from "@sentry/remix";
-
-import { sentryLink } from "@peated/server/src/lib/trpc";
 import packageData from "./package.json";
 
 Sentry.init({
@@ -31,6 +29,7 @@ Sentry.init({
     new Sentry.Integrations.Http({ tracing: true }),
     ...Sentry.autoDiscoverNodePerformanceMonitoringIntegrations(),
   ],
+  spotlight: config.ENV === "development",
   // tracePropagationTargets: ["localhost", "peated.com", config.API_SERVER],
 });
 

diff --git a/apps/worker/package.json b/apps/worker/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@peated/server": "workspace:*",
     "@peated/tsconfig": "workspace:*",
-    "@sentry/node-experimental": "^7.80.1",
+    "@sentry/node-experimental": "^7.83.0",
     "@sentry/profiling-node": "^1.2.6",
     "@swc/core": "^1.3.96",
     "@trpc/client": "^10.43.3",

diff --git a/apps/worker/src/main.ts b/apps/worker/src/main.ts
@@ -21,8 +21,8 @@ Sentry.init({
   tracesSampleRate: 1.0,
   profilesSampleRate: 1.0,
   integrations: [new ProfilingIntegration()],
+  spotlight: process.env.NODE_ENV === "development",
 });
-
 Sentry.setTag("service", packageData.name);
 
 const scheduler = new ToadScheduler();

diff --git a/package.json b/package.json
@@ -33,7 +33,6 @@
   "author": "David Cramer",
   "license": "Apache-2.0",
   "dependencies": {
-    "@spotlightjs/sidecar": "^0.0.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "dotenv": "^16.3.1",
@@ -66,5 +65,8 @@
     "{apps,packages}/**/*.{ts,tsx}": [
       "eslint --cache --fix"
     ]
+  },
+  "devDependencies": {
+    "@spotlightjs/sidecar": "^0.0.8"
   }
 }