test: removed fs span assertion from tests

aryamohanan · aryamohanan · commit 8d4ea7e4dca6 · 2025-10-10T14:21:28.000+05:30
diff --git a/packages/collector/test/tracing/cloud/azure/blob/test.js b/packages/collector/test/tracing/cloud/azure/blob/test.js
@@ -88,7 +88,9 @@ if (!storageAccount || !accountKey) {
                 AZURE_CONNECTION_STRING: connStr,
                 AZURE_STORAGE_ACCOUNT: storageAccount,
                 AZURE_ACCOUNT_KEY: accountKey,
-                AZURE_BLOB_VERSION: version
+                AZURE_BLOB_VERSION: version,
+                // We set the following env var to disable the OpenTelemetry instrumentation for this test
+                INSTANA_DISABLE_USE_OPENTELEMETRY: 'true'
               }
             });
 
@@ -140,7 +142,9 @@ if (!storageAccount || !accountKey) {
                 withError: false,
                 spans: spans,
                 op: 'upload',
-                totalspans: 4 // expects 1 azure upload span, 1 fs span of otel and 2 http spans
+                // expects 1 azure upload span and 2 http spans
+                // +1 otel fs also there, but we have disabled otel instrumentation for this test
+                totalspans: 3
               });
             });
           });
@@ -159,7 +163,9 @@ if (!storageAccount || !accountKey) {
                 withError: true,
                 spans: spans,
                 op: 'upload',
-                totalspans: 3 // expects 1 azure upload span, 1 fs span of otel and 1 http span
+                // expects 1 azure upload span and 1 http span
+                // +1 otel fs also there, but we have disabled otel instrumentation for this test
+                totalspans: 2
               });
             });
           });
@@ -273,7 +279,8 @@ if (!storageAccount || !accountKey) {
                 withError: false,
                 spans: spans,
                 op: 'download',
-                totalspans: 6 // expects 3 azure spans( delete, upload, download ), 2 fs spans and 1 http span
+                // // +1 otel fs also there, but we have disabled otel instrumentation for this test
+                totalspans: 4 // expects 3 azure spans( delete, upload, download ) and 1 http span
               });
             });
           });
@@ -292,7 +299,9 @@ if (!storageAccount || !accountKey) {
                 withError: false,
                 spans: spans,
                 op: 'download',
-                totalspans: 7 // expects 3 azure spans( delete, upload, download ), 2 fs spans and 2 http spans
+                // expects 3 azure spans( delete, upload, download ) and 1 http span
+                // +2 otel fs also there, but we have disabled otel instrumentation for this test
+                totalspans: 5
               });
             });
           });
@@ -311,7 +320,9 @@ if (!storageAccount || !accountKey) {
                 withError: false,
                 spans: spans,
                 op: 'download',
-                totalspans: 7 // expects 3 azure spans( delete, upload, download ), 2 fs spans and 2 http spans
+                // expects 3 azure spans( delete, upload, download ) and 2 http spans
+                // +2 otel fs also there, but we have disabled otel instrumentation for this test
+                totalspans: 5
               });
             });
           });
@@ -330,7 +341,9 @@ if (!storageAccount || !accountKey) {
                 withError: false,
                 spans: spans,
                 op: 'download',
-                totalspans: 6 // expects 3 azure spans( delete, upload, download ), 2 fs spans and 1 http span
+                // expects 3 azure spans( delete, upload, download ) and 1 http span
+                // +2 otel fs also there, but we have disabled otel instrumentation for this test
+                totalspans: 4
               });
             });
           });
diff --git a/packages/collector/test/tracing/databases/db2/test.js b/packages/collector/test/tracing/databases/db2/test.js
@@ -136,7 +136,9 @@ mochaSuiteFn('tracing/db2', function () {
           DB2_TABLE_NAME_1: TABLE_NAME_1,
           DB2_TABLE_NAME_2: TABLE_NAME_2,
           DB2_TABLE_NAME_3: TABLE_NAME_3,
-          DB2_CLOSE_TIMEOUT_IN_MS
+          DB2_CLOSE_TIMEOUT_IN_MS,
+          // We set the following env var to disable the OpenTelemetry instrumentation for this test
+          INSTANA_DISABLE_USE_OPENTELEMETRY: 'true'
         }
       });
 
@@ -878,12 +880,12 @@ mochaSuiteFn('tracing/db2', function () {
         .then(() =>
           testUtils.retry(() =>
             verifySpans(agentControls, controls, {
-              numberOfSpans: 15,
+              numberOfSpans: 10,
               // Spans:
               // 10 queries splitted from the file
               // 5 fs operations on top (ours + from db2 internally fs-extra)
               // https://github.com/ibmdb/node-ibm_db/blob/fb25937524d74d25917e9aa67fb4737971317986/lib/odbc.js#L916
-              // If the Otel integration is disabled, we expect 11 spans.
+              // Since the Otel instrumentation is disabled, we expect 10 spans.
               verifyCustom: (entrySpan, spans) => {
                 const stmtsToExpect = [
                   `create table ${TABLE_NAME_3}(no integer,name varchar(10))`,
diff --git a/packages/collector/test/tracing/databases/mysql/test.js b/packages/collector/test/tracing/databases/mysql/test.js
@@ -71,7 +71,9 @@ function registerSuite(agentControls, driverMode, useExecute, mysql2Version) {
   describe('suppressed', function () {
     const env = {
       DRIVER_MODE: driverMode,
-      MYSQL2_VERSION: mysql2Version
+      MYSQL2_VERSION: mysql2Version,
+      // We set the following env var to disable the OpenTelemetry instrumentation for this test
+      INSTANA_DISABLE_USE_OPENTELEMETRY: 'true'
     };
     if (useExecute) {
       env.USE_EXECUTE = 'true';
@@ -276,8 +278,8 @@ function test(env, agentControls, driverMode) {
             // 1 x mysql
             // 1 x httpserver
             // 1 x httpclient
-            // 1 x otel fs(included in mysql2/promise)
-            const expectedSpanCount = driverMode === 'mysql2/promises' ? 4 : 3;
+            // 1 x otel fs(included in mysql2/promise), but we disable otel for this test
+            const expectedSpanCount = 3;
             expect(spans.length).to.equal(expectedSpanCount);
             const postEntrySpan = testUtils.expectAtLeastOneMatching(spans, [
               span => expect(span.n).to.equal('node.http.server'),
diff --git a/packages/collector/test/tracing/logging/bunyan/test.js b/packages/collector/test/tracing/logging/bunyan/test.js
@@ -29,7 +29,11 @@ mochaSuiteFn('tracing/logging/bunyan', function () {
     before(async () => {
       controls = new ProcessControls({
         appPath: path.join(__dirname, 'bunyanApp'),
-        useGlobalAgent: true
+        useGlobalAgent: true,
+        env: {
+          // We set the following env var to disable the OpenTelemetry instrumentation for this test
+          INSTANA_DISABLE_USE_OPENTELEMETRY: 'true'
+        }
       });
 
       await controls.startAndWaitForAgentConnection();
@@ -87,7 +91,9 @@ mochaSuiteFn('tracing/logging/bunyan', function () {
         '{"_id":"638dea148cff492d47e792ea","index":0,"guid":"01b61bfa-fe4c-4d75-9224-389c4c04de10","isActive":false,"balance":"$1,919.18","picture":"http://placehold.it/32x32","age":37,"eyeColor":"blue","name":"Manning Brady","gender":"male","company":"ZYTRAC","email":"manningbrady@zytrac.com","phone":"+1 (957) 538-2183","address":"146 Bushwick Court, Gilgo, New York, 2992","about":"Ullamco cillum reprehenderit eu proident veniam laboris tempor voluptate. Officia deserunt velit incididunt consequat la...',
         controls,
         500,
-        4
+        // entry + exit + bunyan log + fs call so total 4
+        // but we disabled otel instrumentation for this test so total 3
+        3
       ));
 
     it("must capture an error object's message and an additional string", () =>
diff --git a/packages/collector/test/tracing/open_tracing/integration_test.js b/packages/collector/test/tracing/open_tracing/integration_test.js
@@ -114,16 +114,20 @@ describe('tracing/opentracing/integration', function () {
 
           // OpenTracing lazy loads cls.js, which creates a span via the OTel fs plug-in.
           // realpathSync /path/to/repo/nodejs/packages/core/src/tracing/cls.js
-          testUtils.expectAtLeastOneMatching(spans, [
-            span => expect(span.t).to.equal(httpSpan.t),
-            span => expect(span.p).to.equal(httpSpan.s),
-            span => expect(span.s).to.be.a('string'),
-            span => expect(span.s).not.to.equal(span.t),
-            span => expect(span.s).not.to.equal(span.p),
-            span => expect(span.n).to.equal('otel'),
-            span => expect(span.f.e).to.equal(String(expressOpentracingControls.getPid())),
-            span => expect(span.f.h).to.equal('agent-stub-uuid')
-          ]);
+
+          // Currently we disable OTel instrumentation for tests due npm workspace issue, so the fs span is not created.
+          // If we re-enable OTel instrumentation for tests, we need to uncomment the check below.
+
+          // testUtils.expectAtLeastOneMatching(spans, [
+          //   span => expect(span.t).to.equal(httpSpan.t),
+          //   span => expect(span.p).to.equal(httpSpan.s),
+          //   span => expect(span.s).to.be.a('string'),
+          //   span => expect(span.s).not.to.equal(span.t),
+          //   span => expect(span.s).not.to.equal(span.p),
+          //   span => expect(span.n).to.equal('otel'),
+          //   span => expect(span.f.e).to.equal(String(expressOpentracingControls.getPid())),
+          //   span => expect(span.f.h).to.equal('agent-stub-uuid')
+          // ]);
         });
       });
 
