From e6c7dec0480999e67290a372ad10ddae4bd90557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Wed, 12 Nov 2025 11:53:10 +0100
Subject: [PATCH] remove reqid and user agent

---
 apps/api/scripts/test.ts                            | 2 --
 apps/worker/src/jobs/events.create-session-end.ts   | 1 -
 apps/worker/src/jobs/events.incoming-event.ts       | 1 -
 apps/worker/src/jobs/events.incoming-events.test.ts | 8 --------
 apps/worker/src/utils/session-handler.ts            | 1 -
 packages/db/src/services/event.service.ts           | 2 --
 6 files changed, 15 deletions(-)

diff --git a/apps/api/scripts/test.ts b/apps/api/scripts/test.ts
index b4929f60..b1ab8938 100644
--- a/apps/api/scripts/test.ts
+++ b/apps/api/scripts/test.ts
@@ -40,8 +40,6 @@ async function main() {
         properties: {
           hash: 'test-hash',
           'query.utm_source': 'test',
-          __reqId: `req_${Math.floor(Math.random() * 1000)}`,
-          __user_agent: 'Mozilla/5.0 (Test)',
         },
         created_at: formatClickhouseDate(eventTime),
         country: 'US',
diff --git a/apps/worker/src/jobs/events.create-session-end.ts b/apps/worker/src/jobs/events.create-session-end.ts
index dde407a0..e9b57245 100644
--- a/apps/worker/src/jobs/events.create-session-end.ts
+++ b/apps/worker/src/jobs/events.create-session-end.ts
@@ -65,7 +65,6 @@ export async function createSessionEnd(
   const logger = baseLogger.child({
     payload,
     jobId: job.id,
-    reqId: payload.properties?.__reqId ?? 'unknown',
   });
 
   logger.debug('Processing session end job');
diff --git a/apps/worker/src/jobs/events.incoming-event.ts b/apps/worker/src/jobs/events.incoming-event.ts
index 2742e84a..9d20f81d 100644
--- a/apps/worker/src/jobs/events.incoming-event.ts
+++ b/apps/worker/src/jobs/events.incoming-event.ts
@@ -93,7 +93,6 @@ export async function incomingEvent(
       ...properties,
       __hash: hash,
       __query: query,
-      __reqId: reqId,
     }),
     createdAt,
     duration: 0,
diff --git a/apps/worker/src/jobs/events.incoming-events.test.ts b/apps/worker/src/jobs/events.incoming-events.test.ts
index c4deec1b..255070fa 100644
--- a/apps/worker/src/jobs/events.incoming-events.test.ts
+++ b/apps/worker/src/jobs/events.incoming-events.test.ts
@@ -101,8 +101,6 @@ describe('incomingEvent', () => {
       properties: {
         __hash: undefined,
         __query: undefined,
-        __user_agent: jobData.headers['user-agent'],
-        __reqId: jobData.headers['request-id'],
       },
       createdAt: timestamp,
       country: 'US',
@@ -207,8 +205,6 @@ describe('incomingEvent', () => {
       properties: {
         __hash: undefined,
         __query: undefined,
-        __user_agent: jobData.headers['user-agent'],
-        __reqId: jobData.headers['request-id'],
       },
       createdAt: timestamp,
       country: 'US',
@@ -297,8 +293,6 @@ describe('incomingEvent', () => {
       projectId,
       properties: {
         custom_property: 'test_value',
-        __user_agent: 'OpenPanel Server/1.0',
-        __reqId: '123',
         __hash: undefined,
         __query: undefined,
       },
@@ -364,8 +358,6 @@ describe('incomingEvent', () => {
       projectId,
       properties: {
         custom_property: 'test_value',
-        __user_agent: 'OpenPanel Server/1.0',
-        __reqId: '123',
         __hash: undefined,
         __query: undefined,
       },
diff --git a/apps/worker/src/utils/session-handler.ts b/apps/worker/src/utils/session-handler.ts
index 9415dc6f..99af0535 100644
--- a/apps/worker/src/utils/session-handler.ts
+++ b/apps/worker/src/utils/session-handler.ts
@@ -119,7 +119,6 @@ export async function getSessionEndJob(args: {
         jobTimestamp: new Date(job.timestamp).toISOString(),
         jobDelta: Date.now() - job.timestamp,
         jobId: job.id,
-        reqId: job.data.payload.properties?.__reqId ?? 'unknown',
         payload: job.data.payload,
       });
     }
diff --git a/packages/db/src/services/event.service.ts b/packages/db/src/services/event.service.ts
index 1a0c5991..59675acf 100644
--- a/packages/db/src/services/event.service.ts
+++ b/packages/db/src/services/event.service.ts
@@ -153,8 +153,6 @@ export interface IServiceEvent {
   properties: Record<string, unknown> & {
     hash?: string;
     query?: Record<string, unknown>;
-    __reqId?: string;
-    __user_agent?: string;
   };
   createdAt: Date;
   country?: string | undefined;