From 161fa131c700827c5c7b04f6f63b99662656a2dd Mon Sep 17 00:00:00 2001
From: Mateusz Kwasniewski <kwasniewski.mateusz@gmail.com>
Date: Thu, 9 Jan 2025 09:46:04 +0100
Subject: [PATCH] chore: remove connection id from tracking (#9072)

---
 src/lib/metrics.test.ts                     | 2 +-
 src/lib/metrics.ts                          | 5 ++---
 src/lib/middleware/response-time-metrics.ts | 5 -----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/lib/metrics.test.ts b/src/lib/metrics.test.ts
index 3e796c89fc..d72b6cc61f 100644
--- a/src/lib/metrics.test.ts
+++ b/src/lib/metrics.test.ts
@@ -130,7 +130,7 @@ test('should collect metrics for requests', async () => {
 
     const metrics = await prometheusRegister.metrics();
     expect(metrics).toMatch(
-        /http_request_duration_milliseconds\{quantile="0\.99",path="somePath",method="GET",status="200",appName="undefined",connectionId="undefined"\}.*1337/,
+        /http_request_duration_milliseconds\{quantile="0\.99",path="somePath",method="GET",status="200",appName="undefined"\}.*1337/,
     );
 });
 
diff --git a/src/lib/metrics.ts b/src/lib/metrics.ts
index 863417a291..02b1373336 100644
--- a/src/lib/metrics.ts
+++ b/src/lib/metrics.ts
@@ -124,7 +124,7 @@ export function registerPrometheusMetrics(
     const requestDuration = createSummary({
         name: 'http_request_duration_milliseconds',
         help: 'App response time',
-        labelNames: ['path', 'method', 'status', 'appName', 'connectionId'],
+        labelNames: ['path', 'method', 'status', 'appName'],
         percentiles: [0.1, 0.5, 0.9, 0.95, 0.99],
         maxAgeSeconds: 600,
         ageBuckets: 5,
@@ -700,14 +700,13 @@ export function registerPrometheusMetrics(
 
     eventBus.on(
         events.REQUEST_TIME,
-        ({ path, method, time, statusCode, appName, connectionId }) => {
+        ({ path, method, time, statusCode, appName }) => {
             requestDuration
                 .labels({
                     path,
                     method,
                     status: statusCode,
                     appName,
-                    connectionId,
                 })
                 .observe(time);
         },
diff --git a/src/lib/middleware/response-time-metrics.ts b/src/lib/middleware/response-time-metrics.ts
index 4a1928bfc6..8ab50328ee 100644
--- a/src/lib/middleware/response-time-metrics.ts
+++ b/src/lib/middleware/response-time-metrics.ts
@@ -55,7 +55,6 @@ export function responseTimeMetrics(
         // when pathname is undefined use a fallback
         pathname = pathname ?? collapse(req.path);
         let appName: string | undefined;
-        let connectionId: string | undefined;
         if (
             !flagResolver.isEnabled('responseTimeWithAppNameKillSwitch') &&
             (instanceStatsService.getAppCountSnapshot('7d') ??
@@ -65,9 +64,6 @@ export function responseTimeMetrics(
                 req.headers['x-unleash-appname'] ??
                 req.headers['unleash-appname'] ??
                 req.query.appName;
-            if (flagResolver.isEnabled('uniqueSdkTracking')) {
-                connectionId = req.headers['x-unleash-connection-id'];
-            }
         }
 
         const timingInfo = {
@@ -76,7 +72,6 @@ export function responseTimeMetrics(
             statusCode,
             time,
             appName,
-            connectionId,
         };
         if (!res.locals.responseTimeEmitted) {
             res.locals.responseTimeEmitted = true;