From 165976608d0f66880f718204e167fc87c1fae573 Mon Sep 17 00:00:00 2001
From: Nawaz Dhandala <hello@nawazdhandala.com>
Date: Fri, 9 Jan 2026 18:43:39 +0000
Subject: [PATCH] refactor: Replace telemetryServiceId with serviceId in
 FixException metadata and related services for consistency

---
 AIAgent/TaskHandlers/FixExceptionTaskHandler.ts      | 2 +-
 Common/Server/Services/OpenTelemetryIngestService.ts | 8 ++++----
 Common/Server/Services/TelemetryExceptionService.ts  | 7 +++----
 Common/Types/AI/AIAgentTaskMetadata.ts               | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/AIAgent/TaskHandlers/FixExceptionTaskHandler.ts b/AIAgent/TaskHandlers/FixExceptionTaskHandler.ts
index ec78fa5d29..7e8401a69a 100644
--- a/AIAgent/TaskHandlers/FixExceptionTaskHandler.ts
+++ b/AIAgent/TaskHandlers/FixExceptionTaskHandler.ts
@@ -33,7 +33,7 @@ import {
 // Metadata structure for Fix Exception tasks
 export interface FixExceptionMetadata extends TaskMetadata {
   exceptionId: string;
-  telemetryServiceId?: string;
+  serviceId?: string;
   stackTrace?: string;
   errorMessage?: string;
 }
diff --git a/Common/Server/Services/OpenTelemetryIngestService.ts b/Common/Server/Services/OpenTelemetryIngestService.ts
index f4a4e8433b..2470c620f6 100644
--- a/Common/Server/Services/OpenTelemetryIngestService.ts
+++ b/Common/Server/Services/OpenTelemetryIngestService.ts
@@ -78,8 +78,8 @@ export default class OTelIngestService {
     datapoint: JSONObject;
     aggregationTemporality: OtelAggregationTemporality;
     isMonotonic: boolean | undefined;
-    telemetryServiceId: ObjectID;
-    telemetryServiceName: string;
+    serviceId: ObjectID;
+    serviceName: string;
   }): Metric {
     const { dbMetric, datapoint, aggregationTemporality, isMonotonic } = data;
 
@@ -162,8 +162,8 @@ export default class OTelIngestService {
 
       newDbMetric.attributes = {
         ...TelemetryUtil.getAttributesForServiceIdAndServiceName({
-          serviceId: data.telemetryServiceId,
-          serviceName: data.telemetryServiceName,
+          serviceId: data.serviceId,
+          serviceName: data.serviceName,
         }),
         ...TelemetryUtil.getAttributes({
           items: (datapoint["attributes"] as JSONArray) || [],
diff --git a/Common/Server/Services/TelemetryExceptionService.ts b/Common/Server/Services/TelemetryExceptionService.ts
index af9dcc7366..1d73b42de7 100644
--- a/Common/Server/Services/TelemetryExceptionService.ts
+++ b/Common/Server/Services/TelemetryExceptionService.ts
@@ -37,7 +37,7 @@ export class Service extends DatabaseService<Model> {
         projectId: true,
         message: true,
         stackTrace: true,
-        telemetryServiceId: true,
+        serviceId: true,
         exceptionType: true,
       },
       props,
@@ -160,9 +160,8 @@ export class Service extends DatabaseService<Model> {
       metadata.errorMessage = telemetryException.message;
     }
 
-    if (telemetryException.telemetryServiceId) {
-      metadata.telemetryServiceId =
-        telemetryException.telemetryServiceId.toString();
+    if (telemetryException.serviceId) {
+      metadata.serviceId = telemetryException.serviceId.toString();
     }
 
     return metadata;
diff --git a/Common/Types/AI/AIAgentTaskMetadata.ts b/Common/Types/AI/AIAgentTaskMetadata.ts
index 15372d2f5e..7d718f97f0 100644
--- a/Common/Types/AI/AIAgentTaskMetadata.ts
+++ b/Common/Types/AI/AIAgentTaskMetadata.ts
@@ -9,7 +9,7 @@ export interface AIAgentTaskMetadataBase {
 export interface FixExceptionTaskMetadata extends AIAgentTaskMetadataBase {
   taskType: AIAgentTaskType.FixException;
   exceptionId: string;
-  telemetryServiceId?: string;
+  serviceId?: string;
   stackTrace?: string;
   errorMessage?: string;
 }