chore: updates cripts for oracle and pg instrumentations

Author: david-luna

packages/instrumentation-oracledb/package.json

@@ -20,10 +20,12 @@
     "prepublishOnly": "npm run compile",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc mocha 'test/**/*.test.ts'",
-    "test-all-versions": "tav",
-    "test-all-versions:local": "cross-env RUN_ORACLEDB_TESTS_LOCAL=true npm run test-all-versions",
     "test:debug": "mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'",
-    "test:local": "cross-env RUN_ORACLEDB_TESTS_LOCAL=true npm run test",
+    "test:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm test",
+    "test-all-versions": "tav",
+    "test-all-versions:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm run test-all-versions",
+    "test-services:start": "cd ../.. && npm run test-services:start oracledb",
+    "test-services:stop": "cd ../.. && npm run test-services:stop oracledb",
     "version:update": "node ../../scripts/version-update.js",
     "watch": "tsc -w"
   },

packages/instrumentation-oracledb/test/oracle.test.ts

@@ -395,8 +395,7 @@ describe('oracledb', () => {
   let connection: oracledb.Connection;
 
   const testOracleDB = process.env.RUN_ORACLEDB_TESTS; // For CI: assumes local oracledb is already available
-  const testOracleDBLocally = process.env.RUN_ORACLEDB_TESTS_LOCAL; // For local: spins up local oracledb via docker
-  const shouldTest = testOracleDB || testOracleDBLocally; // Skips these tests if false (default)
+  const shouldTest = testOracleDB; // Skips these tests if false (default)
   const sql = 'select 1 from dual';
   const sqlWithBinds = 'select :1 from dual';
   const sqlWithBindsByName = 'select :name from dual';
@@ -483,29 +482,7 @@ describe('oracledb', () => {
       skip();
     }
 
-    if (testOracleDBLocally) {
-      testUtils.startDocker('oracledb');
-
-      // increase test time
-      this.timeout(50000);
-
-      // check if docker container is up
-      let retries = 6;
-      while (retries-- > 0) {
-        try {
-          connection = await oracledb.getConnection(CONFIG);
-          break;
-        } catch (err) {
-          console.log('retry count %d failed waiting for DB', retries);
-          await new Promise(r => setTimeout(r, 10000));
-        }
-      }
-      if (retries < 0) {
-        throw new Error('docker setup Failed');
-      }
-    } else {
-      connection = await oracledb.getConnection(CONFIG);
-    }
+    connection = await oracledb.getConnection(CONFIG);
     await doSetup();
     updateAttrSpanList(connection);
     contextManager = new AsyncLocalStorageContextManager().enable();
@@ -520,10 +497,6 @@ describe('oracledb', () => {
       await connection.close();
     }
     instrumentation.disable();
-    if (testOracleDBLocally) {
-      this.timeout(5000);
-      testUtils.cleanUpDocker('oracledb');
-    }
   });
 
   beforeEach(() => {

packages/instrumentation-pg/package.json

@@ -19,10 +19,12 @@
     "prepublishOnly": "npm run compile",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc mocha 'test/**/*.test.ts'",
-    "test-all-versions": "tav",
-    "test-all-versions:local": "cross-env RUN_POSTGRES_TESTS_LOCAL=true npm run test-all-versions",
     "test:debug": "mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'",
-    "test:local": "cross-env RUN_POSTGRES_TESTS_LOCAL=true npm run test",
+    "test:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm test",
+    "test-all-versions": "tav",
+    "test-all-versions:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm run test-all-versions",
+    "test-services:start": "cd ../.. && npm run test-services:start postgres",
+    "test-services:stop": "cd ../.. && npm run test-services:stop postgres",
     "version:update": "node ../../scripts/version-update.js",
     "watch": "tsc -w"
   },

packages/instrumentation-pg/test/pg-pool.test.ts

@@ -127,9 +127,8 @@ describe('pg-pool', () => {
     spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
   });
 
-  const testPostgres = process.env.RUN_POSTGRES_TESTS; // For CI: assumes local postgres db is already available
-  const testPostgresLocally = process.env.RUN_POSTGRES_TESTS_LOCAL; // For local: spins up local postgres db via docker
-  const shouldTest = testPostgres || testPostgresLocally; // Skips these tests if false (default)
+  const testPostgres = process.env.RUN_POSTGRES_TESTS;
+  const shouldTest = testPostgres; // Skips these tests if false (default)
 
   before(function () {
     const skip = () => {
@@ -143,10 +142,6 @@ describe('pg-pool', () => {
       skip();
     }
 
-    if (testPostgresLocally) {
-      testUtils.startDocker('postgres');
-    }
-
     instrumentation = new PgInstrumentation();
 
     contextManager = new AsyncLocalStorageContextManager().enable();
@@ -158,10 +153,6 @@ describe('pg-pool', () => {
   });
 
   after(done => {
-    if (testPostgresLocally) {
-      testUtils.cleanUpDocker('postgres');
-    }
-
     pool.end(() => {
       done();
     });