From 25c5acf8e794b085b5ddd23c7f5d877091d61ad9 Mon Sep 17 00:00:00 2001
From: Abhilash <abhilash.sivan@ibm.com>
Date: Fri, 6 Dec 2024 19:06:20 +0530
Subject: [PATCH] chore: cleanup

---
 .../test/tracing/database/couchbase/test.js   | 17 -------------
 .../instrumentation/database/couchbase.js     | 25 +------------------
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/packages/collector/test/tracing/database/couchbase/test.js b/packages/collector/test/tracing/database/couchbase/test.js
index f4c3a1bd9a..2ba290ed4d 100644
--- a/packages/collector/test/tracing/database/couchbase/test.js
+++ b/packages/collector/test/tracing/database/couchbase/test.js
@@ -455,14 +455,6 @@ mochaSuiteFn('tracing/couchbase', function () {
               verifySpans(agentControls, controls, {
                 spanLength: 9,
                 verifyCustom: (entrySpan, spans) => {
-                  // expectExactlyOneMatching(
-                  //   spans,
-                  //   verifyCouchbaseSpan(controls, entrySpan, {
-                  //     bucket: 'projects',
-                  //     type: 'membase',
-                  //     sql: 'NOW SELECT '
-                  //   })
-                  // );
                   expectExactlyNMatching(
                     spans,
                     1,
@@ -490,15 +482,6 @@ mochaSuiteFn('tracing/couchbase', function () {
                       sql: 'CREATE INDEX '
                     })
                   );
-                  // expectExactlyNMatching(
-                  //   spans,
-                  //   1,
-                  //   verifyCouchbaseSpan(controls, entrySpan, {
-                  //     bucket: '',
-                  //     type: '',
-                  //     sql: 'SELECT'
-                  //   })
-                  // );
                   expectExactlyNMatching(
                     spans,
                     1,
diff --git a/packages/core/src/tracing/instrumentation/database/couchbase.js b/packages/core/src/tracing/instrumentation/database/couchbase.js
index d4d8d7d731..54cd0102e7 100644
--- a/packages/core/src/tracing/instrumentation/database/couchbase.js
+++ b/packages/core/src/tracing/instrumentation/database/couchbase.js
@@ -94,7 +94,7 @@ function instrumentCluster(cluster, connectionStr) {
   // #### FTS SERVICE (.searchIndexes().)
   instrumentSearchIndexes(cluster, connectionStr);
 
-  // #### ANALYTICS SERVICES (.analyticsIndexes().) version >= 4.4.4
+  // #### ANALYTICS SERVICES (.analyticsIndexes().)
   instrumentAnalyticsIndexes(cluster, connectionStr);
 
   // #### N1QL SERVICE (.queryIndexes().)
@@ -119,29 +119,6 @@ function instrumentCluster(cluster, connectionStr) {
       ).apply(originalThis, originalArgs);
     };
   });
-
-  // #### ANALYTICS SERVICE (.analyticsIndexes().) v <= 4.4.3
-  shimmer.wrap(cluster, 'analyticsQuery', function instanaClusterAnalyticsQuery(original) {
-    return function instanaClusterAnalyticsQueryWrapped() {
-      const originalThis = this;
-      const originalArgs = arguments;
-      const sqlStatement = originalArgs[0] || '';
-
-      return instrumentOperation(
-        {
-          connectionStr,
-          sql: tracingUtil.shortenDatabaseStatement(sqlStatement),
-          resultHandler: (span, result) => {
-            if (result && result.rows && result.rows.length > 0 && result.rows[0].BucketName) {
-              span.data.couchbase.bucket = result.rows[0].BucketName;
-              span.data.couchbase.type = bucketLookup[span.data.couchbase.bucket];
-            }
-          }
-        },
-        original
-      ).apply(originalThis, originalArgs);
-    };
-  });
 }
 
 function instrumentCollection(cluster, connectionStr) {