fix: enable DB instrumentation metrics via Elysia OTel plugin

apps/api/src/middlewares/greptime.ts

@@ -1,6 +1,6 @@
 import { Elysia } from "elysia";
 
-import { greptimeSqlClient, type BunSqlClient } from "@hebo/shared-api/db/greptime";
+import { getGreptimeSqlClient } from "@hebo/shared-api/db/greptime";
 import { auth } from "@hebo/shared-api/middlewares/auth";
 
 export const greptime = new Elysia({
@@ -9,9 +9,9 @@ export const greptime = new Elysia({
   .use(auth)
   .resolve(function resolveGreptimeDb() {
     return {
-      greptimeDb: greptimeSqlClient,
+      greptimeDb: getGreptimeSqlClient(),
     };
   })
   .as("scoped");
 
-export type GreptimeDb = BunSqlClient;
+export type GreptimeDb = Bun.SQL;

packages/shared-api/db/greptime.ts

@@ -1,19 +1,14 @@
 import { getSecret } from "../utils/secret";
 import { DEFAULT_DB_IDLE_TIMEOUT_MS, DEFAULT_DB_POOL_MAX } from "./config";
 
-export const getGreptimeConnectionString = async () => {
-  return `postgres://${(await getSecret("GREPTIME_HOST")) ?? "localhost"}:4003/public`;
-};
+export const GREPTIME_HOST = (await getSecret("GREPTIME_HOST")) ?? "localhost";
 
-export const createBunSqlClient = (url: string) => {
-  const { SQL } = require("bun") as typeof Bun;
-  return new SQL({
-    url,
+let _client: Bun.SQL;
+
+/** Lazily created so BunSqlInstrumentation wraps `bun:sql` before the first `new SQL()` call. */
+export const getGreptimeSqlClient = () =>
+  (_client ??= new (require("bun") as typeof Bun).SQL({
+    url: `postgres://${GREPTIME_HOST}:4003/public`,
     max: DEFAULT_DB_POOL_MAX,
     idleTimeout: DEFAULT_DB_IDLE_TIMEOUT_MS / 1_000,
-  });
-};
-
-export const greptimeSqlClient = createBunSqlClient(await getGreptimeConnectionString());
-
-export type BunSqlClient = ReturnType<typeof createBunSqlClient>;
+  }));

packages/shared-api/lib/otel.ts

@@ -4,7 +4,6 @@ import type { SeverityNumber } from "@opentelemetry/api-logs";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-proto";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-proto";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-proto";
-import { registerInstrumentations } from "@opentelemetry/instrumentation";
 import { PgInstrumentation } from "@opentelemetry/instrumentation-pg";
 import { CompressionAlgorithm } from "@opentelemetry/otlp-exporter-base";
 import { resourceFromAttributes } from "@opentelemetry/resources";
@@ -18,8 +17,8 @@ import {
 import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
 import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
 
+import { GREPTIME_HOST } from "../db/greptime";
 import { IS_PRODUCTION } from "../env";
-import { getSecret } from "../utils/secret";
 import { isRootPathUrl } from "../utils/url";
 
 /**
@@ -48,7 +47,7 @@ const ALLOWED_RESPONSE_HEADERS = [
   "x-request-id",
 ];
 
-export const GREPTIME_OTLP_ENDPOINT = `http://${(await getSecret("GREPTIME_HOST")) ?? "localhost"}:4000/v1/otlp`;
+export const GREPTIME_OTLP_ENDPOINT = `http://${GREPTIME_HOST}:4000/v1/otlp`;
 
 export const createOtelLogger = (serviceName: string, minimumSeverity: SeverityNumber) => {
   const loggerProvider = new LoggerProvider({
@@ -82,24 +81,35 @@ export const createOtelLogger = (serviceName: string, minimumSeverity: SeverityN
   return loggerProvider.getLogger(serviceName);
 };
 
-registerInstrumentations({
-  instrumentations: [
-    new PgInstrumentation({
-      requireParentSpan: true,
-      enhancedDatabaseReporting: false,
-    }),
-    new BunSqlInstrumentation({
-      requireParentSpan: true,
-      ignoreConnectionSpans: true,
-      // FUTURE: set to true to avoid leaking sensitive information
-      maskStatement: false,
-    }),
-  ],
-});
-
 export const getOtelConfig = (serviceName: string): ElysiaOpenTelemetryOptions => {
+  const pgInstrumentation = new PgInstrumentation({
+    requireParentSpan: true,
+    enhancedDatabaseReporting: false,
+  });
+
+  // In Bun, pg is already loaded via @prisma/adapter-pg before OTel's module-load
+  // hooks can patch it. Patch pg.Client directly as a workaround, while still
+  // passing the instrumentation to NodeSDK so providers are configured correctly.
+  try {
+    // oxlint-disable no-unsafe-assignment no-unsafe-call no-unsafe-member-access
+    const { createRequire } = require("module");
+    const pg = createRequire(require.resolve("@prisma/adapter-pg"))("pg");
+    // @ts-expect-error _patchPgClient is a private method on PgInstrumentation
+    pgInstrumentation._patchPgClient(pg.Client);
+    // oxlint-enable no-unsafe-assignment no-unsafe-call no-unsafe-member-access
+  } catch {}
+
   return {
     serviceName,
+    instrumentations: [
+      pgInstrumentation,
+      new BunSqlInstrumentation({
+        requireParentSpan: true,
+        ignoreConnectionSpans: true,
+        // FUTURE: set to true to avoid leaking sensitive information
+        maskStatement: false,
+      }),
+    ],
     headersToSpanAttributes: {
       requestHeaders: ALLOWED_REQUEST_HEADERS,
       responseHeaders: ALLOWED_RESPONSE_HEADERS,