chore: fix conflicts with main

Author: david-luna

packages/instrumentation-pg/package.json

@@ -18,7 +18,7 @@
     "lint:readme": "node ../../scripts/lint-readme.js",
     "prepublishOnly": "npm run compile",
     "tdd": "npm run test -- --watch-extensions ts --watch",
-    "test": "cat test/pg-pool.test.ts nyc mocha 'test/**/*.test.ts'",
+    "test": "nyc mocha 'test/**/*.test.ts'",
     "test:debug": "mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'",
     "test:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm test",
     "test-all-versions": "tav",

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

@@ -982,9 +982,8 @@ describe('pg semantic conventions env variable', () => {
   const provider = new BasicTracerProvider({
     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;
   // Here we are `require`ing *before* the instrumentation is created below.
   // In *general* this is a potential instrumentation issue, but this works for
   // `pg-pool` instrumentation because it patches the `pgPool.prototype`
@@ -1003,23 +1002,13 @@ describe('pg semantic conventions env variable', () => {
     if (!shouldTest) {
       skip();
     }
-
-    if (testPostgresLocally) {
-      testUtils.startDocker('postgres');
-    }
   });
 
   beforeEach(() => {
     contextManager = new AsyncLocalStorageContextManager().enable();
     context.setGlobalContextManager(contextManager);
   });
 
-  after(() => {
-    if (testPostgresLocally) {
-      testUtils.cleanUpDocker('postgres');
-    }
-  });
-
   afterEach(() => {
     delete process.env.OTEL_SEMCONV_STABILITY_OPT_IN;
     memoryExporter.reset();