Merge branch 'update-sem-pg' of github.com:maryliag/opentelemetry-js-contrib into update-sem-pg

Author: maryliag

packages/instrumentation-pg/README.md

@@ -56,7 +56,7 @@ PostgreSQL instrumentation has few options available to choose from. You can set
 Prior to version `0.55.0`, this instrumentation created spans and metrics targeting an experimental semantic convention Version 1.27.0.
 
 Database semantic conventions (semconv) were stabilized in v1.34.0, and a [migration process](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/non-normative/db-migration.md) was defined.
-`opentelemetry-instrumentation-pg` versions 0.55.0 and later include support for migrating to stable Database semantic conventions, as described below.
+`@opentelemetry/instrumentation-pg` versions 0.55.0 and later include support for migrating to stable Database semantic conventions, as described below.
 The intent is to provide an approximate 6 month time window for users of this instrumentation to migrate to the new Database semconv, after which a new minor version will use the new semconv by default and drop support for the old semconv.
 
 To select which semconv version(s) is emitted from this instrumentation, use the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable.

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

@@ -994,6 +994,10 @@ describe('pg semantic conventions env variable', () => {
   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)
+  // 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`
+  // (i.e. not a top-level export).
   const pgPool = require('pg-pool');
   pool = new pgPool(CONFIG);