remove revalidate + trace drizzle properly

Author: Brendonovich

apps/web/actions/video/upload.ts

@@ -131,21 +131,6 @@ async function getVideoUploadPresignedUrl({
 			return presignedPostData;
 		}).pipe(runPromise);
 
-		const videoId = fileKey.split("/")[1];
-		if (videoId) {
-			try {
-				await fetch(`${serverEnv().WEB_URL}/api/revalidate`, {
-					method: "POST",
-					headers: {
-						"Content-Type": "application/json",
-					},
-					body: JSON.stringify({ videoId }),
-				});
-			} catch (revalidateError) {
-				console.error("Failed to revalidate page:", revalidateError);
-			}
-		}
-
 		return { presignedPostData };
 	} catch (error) {
 		console.error("Error getting presigned URL:", error);

apps/web/app/api/revalidate/route.ts

@@ -322,23 +322,6 @@ app.post(
 								.where(eq(videoUploads.videoId, Video.VideoId.make(videoId)));
 					}
 
-					if (videoIdFromFileKey) {
-						try {
-							await fetch(`${serverEnv().WEB_URL}/api/revalidate`, {
-								method: "POST",
-								headers: {
-									"Content-Type": "application/json",
-								},
-								body: JSON.stringify({ videoId: videoIdFromFileKey }),
-							});
-							console.log(
-								`Revalidation triggered for videoId: ${videoIdFromFileKey}`,
-							);
-						} catch (revalidateError) {
-							console.error("Failed to revalidate page:", revalidateError);
-						}
-					}
-
 					return c.json({
 						location: result.Location,
 						success: true,

apps/web/app/api/upload/[...route]/multipart.ts

@@ -172,20 +172,6 @@ app.post(
 						),
 					);
 
-			if (videoIdFromKey) {
-				try {
-					await fetch(`${serverEnv().WEB_URL}/api/revalidate`, {
-						method: "POST",
-						headers: {
-							"Content-Type": "application/json",
-						},
-						body: JSON.stringify({ videoId: videoIdFromKey }),
-					});
-				} catch (revalidateError) {
-					console.error("Failed to revalidate page:", revalidateError);
-				}
-			}
-
 			if (method === "post") return c.json({ presignedPostData: data! });
 			else return c.json({ presignedPutData: data! });
 		} catch (s3Error) {

apps/web/app/api/upload/[...route]/signed.ts

@@ -2,8 +2,6 @@ import { OTLPHttpJsonTraceExporter, registerOTel } from "@vercel/otel";
 
 export async function register() {
 	if (process.env.NEXT_PUBLIC_AXIOM_TOKEN) {
-		console.log("token", process.env.NEXT_PUBLIC_AXIOM_TOKEN);
-		console.log("dataset", process.env.NEXT_PUBLIC_AXIOM_DATASET);
 		registerOTel({
 			serviceName: "cap-web-backend",
 			traceExporter: new OTLPHttpJsonTraceExporter({
@@ -14,6 +12,11 @@ export async function register() {
 				},
 			}),
 		});
+	} else if (process.env.NODE_ENV === "development") {
+		registerOTel({
+			serviceName: "cap-web-backend",
+			traceExporter: new OTLPHttpJsonTraceExporter({}),
+		});
 	}
 
 	if (process.env.NEXT_RUNTIME === "nodejs") {

apps/web/instrumentation.ts

@@ -41,6 +41,7 @@
 		"@hono/zod-validator": "^0.4.3",
 		"@hookform/resolvers": "^3.3.2",
 		"@intercom/messenger-js-sdk": "^0.0.14",
+		"@kubiks/otel-drizzle": "^2.1.0",
 		"@mux/mux-node": "^8.5.1",
 		"@mux/mux-player-react": "^3.3.0",
 		"@number-flow/react": "^0.5.9",

apps/web/package.json

@@ -1,3 +1,4 @@
+import { instrumentDrizzleClient } from "@kubiks/otel-drizzle";
 import { Client, type Config } from "@planetscale/database";
 import { sql } from "drizzle-orm";
 import type { AnyMySqlColumn } from "drizzle-orm/mysql-core";
@@ -29,6 +30,8 @@ let _cached: ReturnType<typeof createDrizzle> | undefined;
 export const db = () => {
 	if (!_cached) {
 		_cached = createDrizzle();
+
+		instrumentDrizzleClient(_cached);
 	}
 	return _cached;
 };

packages/database/index.ts

@@ -19,6 +19,7 @@
 		"@cap/env": "workspace:*",
 		"@cap/web-domain": "workspace:*",
 		"@effect/sql-mysql2": "^0.47.0",
+		"@kubiks/otel-drizzle": "^2.1.0",
 		"@mattrax/mysql-planetscale": "^0.0.3",
 		"@paralleldrive/cuid2": "^2.2.2",
 		"@planetscale/database": "^1.13.0",

packages/database/package.json

@@ -8,15 +8,11 @@ export class Database extends Effect.Service<Database>()("Database", {
 		return {
 			use: <T>(
 				cb: (_: ReturnType<typeof db>) => Promise<T> & { toSQL?(): Query },
-			) => {
-				const promise = cb(db());
-				const sql = promise.toSQL?.().sql ?? "Transaction";
-
-				return Effect.tryPromise({
-					try: () => promise,
+			) =>
+				Effect.tryPromise({
+					try: () => cb(db()),
 					catch: (cause) => new DatabaseError({ cause }),
-				}).pipe(Effect.withSpan("Database.execute", { attributes: { sql } }));
-			},
+				}),
 		};
 	}),
 }) {}