Merge pull request #8 from zeeshanakram3/enhanced_postgres_query_traces

Enable OpenTelemetry enhanced Postgres query traces

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.2.0
+
+- patched `@subsquid/openreader` to pass parameter values in 'queryConfig' object instead of passing as param to `pgClient.query` function.
+- enabled enhanced Opentelemetry postgres query traces.
+
 # 1.1.0
 
 - remove unused dependencies from `package.json` file.

assets/patches/@subsquid+openreader+4.4.1.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@subsquid/openreader/lib/db.js b/node_modules/@subsquid/openreader/lib/db.js
+index c87884b..9a9801e 100644
+--- a/node_modules/@subsquid/openreader/lib/db.js
++++ b/node_modules/@subsquid/openreader/lib/db.js
+@@ -9,7 +9,7 @@ class PgDatabase {
+         this.client = client;
+     }
+     query(sql, parameters) {
+-        return this.client.query({ text: sql, rowMode: 'array' }, parameters)
++        return this.client.query({ text: sql, values: parameters, rowMode: 'array' })
+             .then(result => result.rows)
+             .catch((0, error_handling_1.withErrorContext)({ sql, parameters }));
+     }

opentelemetry/index.js

@@ -15,6 +15,7 @@ const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumenta
 // See: https://github.com/Joystream/joystream/pull/4779#discussion_r1262515887
 const instrumentations = getNodeAutoInstrumentations({
   '@opentelemetry/instrumentation-dns': { enabled: false },
+  '@opentelemetry/instrumentation-pg': { enhancedDatabaseReporting: true },
 })
 
 const { NodeSDK } = require('@opentelemetry/sdk-node')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "storage-squid",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "engines": {
     "node": ">=16"
   },