chore: op improvements (#1137)

* fix: add user agent and location

* fix: api middleware event track

* chore: trpc metadata

apps/server/src/v1/middleware.ts

@@ -55,7 +55,9 @@ export function trackMiddleware(event: EventProps, eventProps?: string[]) {
     await next();
 
     // REMINDER: only track the event if the request was successful
-    if (!c.error) {
+    const isValid = c.res.status.toString().startsWith("2") && !c.error;
+
+    if (isValid) {
       // We have checked the request to be valid already
       let json: unknown;
       if (c.req.raw.bodyUsed) {

apps/web/src/components/forms/monitor/form.tsx

@@ -111,7 +111,6 @@ export function MonitorForm({
 
   const handleDataUpdateOrInsertion = async (props: InsertMonitor) => {
     if (defaultValues) {
-      console.log(props);
       await api.monitor.update.mutate(props);
     } else {
       await api.monitor.create.mutate(props);

apps/web/src/content/posts/event-analytics-implementation.mdx

@@ -148,8 +148,10 @@ import type { User } from "@openstatus/auth";
 export function trackMiddleware(event: EventProps) {
   return async (c: Context<{ Variables: { user?: User } }, "/*">, next: Next) => {
     await next();
+
+    const isValid = c.res.status.toString().startsWith("2") && !c.error;
 
-    if (!c.error) {
+    if (isValid) {
       setTimeout(async () => {
         const analytics = await setupAnalytics({
           profileId: c.get("user")?.id,

packages/analytics/package.json

@@ -4,8 +4,7 @@
   "description": "",
   "main": "src/index.ts",
   "dependencies": {
-    "@jitsu/js": "1.9.2",
-    "@openpanel/sdk": "^1.0.0",
+    "@openpanel/sdk": "1.0.0",
     "@t3-oss/env-core": "0.7.0",
     "zod": "3.23.8"
   },

packages/analytics/src/server.ts

@@ -18,13 +18,24 @@ export type IdentifyProps = {
   email?: string;
   workspaceId?: string;
   plan?: string;
+  // headers from the request
+  location?: string;
+  userAgent?: string;
 };
 
 export async function setupAnalytics(props: IdentifyProps) {
   if (process.env.NODE_ENV !== "production") {
     return noop();
   }
 
+  if (props.location) {
+    op.api.addHeader("x-client-ip", props.location);
+  }
+
+  if (props.userAgent) {
+    op.api.addHeader("user-agent", props.userAgent);
+  }
+
   if (props.userId) {
     const [firstName, lastName] = props.fullName?.split(" ") || [];
     await op.identify({

packages/api/src/trpc.ts

@@ -32,6 +32,10 @@ type CreateContextOptions = {
   workspace?: Workspace | null;
   user?: User | null;
   req?: NextRequest;
+  metadata?: {
+    userAgent?: string;
+    location?: string;
+  };
 };
 
 type Meta = {
@@ -73,6 +77,13 @@ export const createTRPCContext = async (opts: {
     workspace,
     user,
     req: opts.req,
+    metadata: {
+      userAgent: opts.req.headers.get("user-agent") ?? undefined,
+      location:
+        opts.req.headers.get("x-forwarded-for") ??
+        process.env.VERCEL_REGION ??
+        undefined,
+    },
   });
 };
 
@@ -202,9 +213,13 @@ const enforceUserIsAuthed = t.middleware(async (opts) => {
   // REMINDER: We only track the event if the request was successful
   // REMINDER: We are not blocking the request
   after(async () => {
-    const { meta, getRawInput } = opts;
+    const { ctx, meta, getRawInput } = opts;
+
     if (meta?.track) {
-      let identify: IdentifyProps = {};
+      let identify: IdentifyProps = {
+        userAgent: ctx.metadata?.userAgent,
+        location: ctx.metadata?.location,
+      };
 
       if (user && workspace) {
         identify = {