Repository navigation
Conversation
Enables instrumentation libraries (OpenTelemetry, etc.) to subscribe to structured events without monkey-patching. Uses TracingChannel for async context propagation and plain channels for simple events. Channels: - pg:query (TracingChannel) — query lifecycle with result enrichment - pg:connection (TracingChannel) — client connect lifecycle - pg:pool:connect (TracingChannel) — pool checkout lifecycle - pg:pool:release (plain) — client released back to pool - pg:pool:remove (plain) — client removed from pool All instrumentation is guarded by hasSubscribers for zero overhead when unused. Gracefully degrades to no-ops on Node < 19.9 or non-Node environments. Closes #3619 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
TracingChannel is not available on Node 18 LTS. Skip the tracing-dependent tests gracefully instead of failing. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Node 18 backported TracingChannel but without the aggregated `hasSubscribers` getter (it returns `undefined` instead of a boolean). Raw truthiness checks treat `undefined` as "no subscribers" which silently disables tracing on Node 18. Replace all `channel.hasSubscribers` guards with `shouldTrace(channel)` which checks `hasSubscribers !== false` — treating `undefined` (Node 18) as "might have subscribers, trace unconditionally" and `false` (Node 20+) as "definitely no subscribers, skip". Also removes the now-unnecessary test skip logic since TracingChannel does exist on Node 18. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Node 18 backported TracingChannel but with a buggy implementation — unsubscribing and resubscribing to the same channel crashes internally (`_subscribers` becomes undefined). Node 16 has no TracingChannel at all. Gate tests on `hasStableTracingChannel` which checks both that `dc.tracingChannel` exists AND that the aggregated `hasSubscribers` getter returns a boolean (only true on Node 19.9+/20.5+). TracingChannel tests: skipped on Node 16/18, run on Node 20+ Plain channel tests (release/remove): run on all versions Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…omise type tracePromise wraps the result in a native Promise, which breaks clients configured with a custom Promise implementation (e.g. bluebird). Switch to traceCallback inside the user's this._Promise constructor so the returned promise type is always correct. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
This PR adds Node.js diagnostics_channel TracingChannel support to the pg and pg-pool packages so that APM/observability tooling can instrument query, connection, and pool lifecycles by subscribing to channels rather than monkey-patching. New diagnostics.js modules lazily resolve the built-in diagnostics_channel (with a Node 18/older fallback and a shouldTrace guard that no-ops when there are no subscribers), and the client/pool wire query, connection, and pool acquire/release/remove events through those channels.
Changes:
- Introduces
pg:queryandpg:connectiontracing channels inpg, andpg:pool:connect(tracing) pluspg:pool:release/pg:pool:remove(plain) channels inpg-pool. - Wraps
Client#connect,Client#query, andPoolconnect/release/remove paths with tracing that is fully skipped when no subscribers are present. - Adds unit tests for both packages, guarded to skip on Node versions lacking a stable
TracingChannel.
Show a summary per file
| File | Description |
|---|---|
| packages/pg/lib/diagnostics.js | New module resolving pg:query/pg:connection tracing channels with a shouldTrace helper. |
| packages/pg/lib/client.js | Wraps connect and query callback paths with tracing when subscribers exist. |
| packages/pg/test/unit/client/diagnostics-tests.js | Unit tests for query/connection channels, skipped on unstable Node. |
| packages/pg-pool/diagnostics.js | New module resolving pool connect/release/remove channels. |
| packages/pg-pool/index.js | Publishes pool acquire/release/remove diagnostics events. |
| packages/pg-pool/test/diagnostics.js | Mocha tests for pool diagnostics channels. |
Note: packages/pg-pool/diagnostics.js is added at the package root but is not part of the package's files allowlist, so it would be omitted from the published npm package and break require('./diagnostics') at load time — see the inline comment.
Review details
Tip
Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Files reviewed: 6/6 changed files
- Comments generated: 2
- Review effort level: Medium
| @@ -1,5 +1,6 @@ | |||
| 'use strict' | |||
| const EventEmitter = require('events').EventEmitter | |||
| const { poolConnectChannel, poolReleaseChannel, poolRemoveChannel, shouldTrace } = require('./diagnostics') | |||
| if (shouldTrace(queryChannel) && query.callback) { | ||
| const context = { | ||
| query: { text: query.text, name: query.name, rowMode: query._rowMode }, | ||
| client: { | ||
| database: this.database, | ||
| host: this.host, | ||
| port: this.port, | ||
| user: this.user, | ||
| processID: this.processID, | ||
| ssl: !!this.ssl, | ||
| }, | ||
| } | ||
| const origCb = query.callback | ||
| const enrichedCb = (err, res) => { | ||
| if (res) context.result = { rowCount: res.rowCount, command: res.command } | ||
| return origCb(err, res) | ||
| } | ||
| queryChannel.traceCallback( | ||
| (tracedCb) => { | ||
| query.callback = tracedCb | ||
| enqueue() | ||
| }, | ||
| 0, | ||
| context, | ||
| null, | ||
| enrichedCb | ||
| ) |
This PR introduces tracing channels support to
pg-poolandpgquerying methods as discussed in #3619I haven't yet run a benchmark, but without active tracing or subscribers the overhead is non-existent so existing users shouldn't be affected. The overhead would come from the consumers of the diag channels published here which is done anyways via monkey patching.
I added the following channels:
pg:querypgpg:connectionpgpg:pool:connectpg-poolpg:pool:releasepg-poolpg:pool:removepg-poolI understand there may be hesitation given that AI tooling was used in the implementation. To be clear, this isn't a drive-by contribution. I designed the channel layout, wrote the proposal document, and iterated through multiple rounds to handle real edge cases (Node 18 compat, preserving custom Promise types, hasSubscribers guards). The AI assisted with the code, but the approach and decisions are mine.
Usage
Instrumentations will only need to subscribe to tracing channels to create traces, logs or metrics:
This is part of a broader initiative to bring TracingChannel support to the most widely used Node.js database and cache libraries. The same pattern has already been merged and shipped in:
I have been directly involved in those prior implementations and I'm happy to own this through to release, address any feedback, and provide whatever support is needed. Would love to hear your thoughts.
Supersedes #3624.