diff --git a/plugins/node/opentelemetry-instrumentation-pg/README.md b/plugins/node/opentelemetry-instrumentation-pg/README.md index 97defcbb8e..b2657c625e 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/README.md +++ b/plugins/node/opentelemetry-instrumentation-pg/README.md @@ -51,23 +51,6 @@ PostgreSQL instrumentation has few options available to choose from. You can set | `requireParentSpan` | `boolean` | If true, requires a parent span to create new spans (default false) | | `addSqlCommenterCommentToQueries` | `boolean` | If true, adds [sqlcommenter](https://github.com/open-telemetry/opentelemetry-sqlcommenter) specification compliant comment to queries with tracing context (default false). _NOTE: A comment will not be added to queries that already contain `--` or `/* ... */` in them, even if these are not actually part of comments_ | -### Metrics - -The value of the environment variable `OTEL_SEMCONV_STABILITY_OPT_IN` (a comma-separated list of values) will define which metrics are being collected. -Possible values: - -- `database` - emit the new database conventions and stop emitting old database conventions. -- `database/dup` - emit both the old and the stable database conventions, allowing for a seamless transition. -- The default behavior (in the absence of one of these values) is to continue emitting only the old database conventions. - -List of Metrics affected by this environment variable (if the metric is not listed here, it will always be emitted): - -| Metric | Emitted with value of `OTEL_SEMCONV_STABILITY_OPT_IN` | -| --------------------------------------- | ---------------------------- | -| `db.client.operation.duration` | `database` or `database/dup` | -| `db.client.connection.count` | `database` or `database/dup` | -| `db.client.connection.pending_requests` | `database` or `database/dup` | - ## Useful links - For more information on OpenTelemetry, visit: diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts index 0de44100c4..2905e783a8 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts @@ -86,8 +86,6 @@ export class PgInstrumentation extends InstrumentationBase { }); describe('pg metrics', () => { - let envOptIn: string | undefined; let metricReader: testUtils.TestMetricReader; beforeEach(() => { metricReader = testUtils.initMeterProvider(instrumentation); }); - before(() => { - envOptIn = process.env.OTEL_SEMCONV_STABILITY_OPT_IN; - process.env.OTEL_SEMCONV_STABILITY_OPT_IN = 'database'; - }); - - after(function () { - process.env.OTEL_SEMCONV_STABILITY_OPT_IN = envOptIn; - }); - it('should generate `db.client.connection.count` and `db.client.connection.pending_requests` metrics', done => { pool.connect((err, client, release) => { if (err) { diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts b/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts index ad31b8de52..cff686eae1 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts @@ -968,22 +968,12 @@ describe('pg', () => { }); describe('pg metrics', () => { - let envOptIn: string | undefined; let metricReader: testUtils.TestMetricReader; beforeEach(() => { metricReader = testUtils.initMeterProvider(instrumentation); }); - before(() => { - envOptIn = process.env.OTEL_SEMCONV_STABILITY_OPT_IN; - process.env.OTEL_SEMCONV_STABILITY_OPT_IN = 'database'; - }); - - after(function () { - process.env.OTEL_SEMCONV_STABILITY_OPT_IN = envOptIn; - }); - it('should generate db.client.operation.duration metric', done => { client.query('SELECT NOW()', async (_, ret) => { assert.ok(ret, 'query should be executed');