From 2c140d239d275140dbd56cd7aa5c7be14649d003 Mon Sep 17 00:00:00 2001
From: Jon Jackson <jonjacks@redhat.com>
Date: Wed, 20 Mar 2024 10:25:25 -0400
Subject: [PATCH] Check for TELEMETRY_DISABLED before TELEMETRY_DEBUG in
 segment event handler, and log events that have been ignored.

---
 .../src/listeners/segment.ts                         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/packages/console-telemetry-plugin/src/listeners/segment.ts b/frontend/packages/console-telemetry-plugin/src/listeners/segment.ts
index 137afc09d43a..54514af7060f 100644
--- a/frontend/packages/console-telemetry-plugin/src/listeners/segment.ts
+++ b/frontend/packages/console-telemetry-plugin/src/listeners/segment.ts
@@ -110,12 +110,18 @@ export const eventListener: TelemetryEventListener = async (
   eventType: string,
   properties?: any,
 ) => {
-  if (TELEMETRY_DEBUG) {
+  if (TELEMETRY_DISABLED || !apiKey) {
     // eslint-disable-next-line no-console
-    console.debug('console-telemetry-plugin: received telemetry event:', eventType, properties);
+    console.debug(
+      'console-telemetry-plugin: telemetry disabled - ignoring telemetry event:',
+      eventType,
+      properties,
+    );
     return;
   }
-  if (TELEMETRY_DISABLED || !apiKey) {
+  if (TELEMETRY_DEBUG) {
+    // eslint-disable-next-line no-console
+    console.debug('console-telemetry-plugin: received telemetry event:', eventType, properties);
     return;
   }
   switch (eventType) {