fix(pino): Allow custom namespaces for msg and err

Author: s1gr1d

dev-packages/node-integration-tests/suites/pino/test.ts

@@ -295,4 +295,79 @@ conditionalTest({ min: 20 })('Pino integration', () => {
       .start()
       .completed();
   });
+
+  test('captures logs with custom messageKey and errorKey', async () => {
+    const instrumentPath = join(__dirname, 'instrument.mjs');
+
+    await createRunner(__dirname, 'scenario-custom-keys.mjs')
+      .withMockSentryServer()
+      .withInstrument(instrumentPath)
+      .ignore('transaction')
+      .expect({
+        event: {
+          exception: {
+            values: [
+              {
+                type: 'Error',
+                value: 'Custom error key',
+                mechanism: {
+                  type: 'pino',
+                  handled: true,
+                },
+                stacktrace: {
+                  frames: expect.arrayContaining([
+                    expect.objectContaining({
+                      function: '?',
+                      in_app: true,
+                      module: 'scenario-custom-keys',
+                    }),
+                  ]),
+                },
+              },
+            ],
+          },
+        },
+      })
+      .expect({
+        log: {
+          items: [
+            {
+              timestamp: expect.any(Number),
+              level: 'info',
+              body: 'Custom message key',
+              trace_id: expect.any(String),
+              severity_number: 9,
+              attributes: {
+                name: { value: 'myapp', type: 'string' },
+                'pino.logger.level': { value: 30, type: 'integer' },
+                user: { value: 'user-123', type: 'string' },
+                action: { value: 'custom-key-test', type: 'string' },
+                message: { value: 'Custom message key', type: 'string' },
+                'sentry.origin': { value: 'auto.log.pino', type: 'string' },
+                'sentry.release': { value: '1.0', type: 'string' },
+                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+              },
+            },
+            {
+              timestamp: expect.any(Number),
+              level: 'error',
+              body: 'Custom error key',
+              trace_id: expect.any(String),
+              severity_number: 17,
+              attributes: {
+                name: { value: 'myapp', type: 'string' },
+                'pino.logger.level': { value: 50, type: 'integer' },
+                message: { value: 'Custom error key', type: 'string' },
+                error: { value: expect.any(String), type: 'string' },
+                'sentry.origin': { value: 'auto.log.pino', type: 'string' },
+                'sentry.release': { value: '1.0', type: 'string' },
+                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+              },
+            },
+          ],
+        },
+      })
+      .start()
+      .completed();
+  });
 });

packages/node-core/src/integrations/pino.ts

@@ -19,10 +19,27 @@ type LevelMapping = {
 };
 
 type Pino = {
+  [key: symbol]: unknown;
   levels: LevelMapping;
   [SENTRY_TRACK_SYMBOL]?: 'track' | 'ignore';
 };
 
+/**
+ * Gets a custom Pino key from a logger instance by searching for the symbol.
+ * Pino uses non-global symbols like Symbol('pino.messageKey'): https://github.com/pinojs/pino/blob/8a816c0b1f72de5ae9181f3bb402109b66f7d812/lib/symbols.js
+ */
+function getPinoKey(logger: Pino, symbolName: string, defaultKey: string): string {
+  const symbols = Object.getOwnPropertySymbols(logger);
+  const symbolString = `Symbol(${symbolName})`;
+  for (const sym of symbols) {
+    if (sym.toString() === symbolString) {
+      const value = logger[sym];
+      return typeof value === 'string' ? value : defaultKey;
+    }
+  }
+  return defaultKey;
+}
+
 type MergeObject = {
   [key: string]: unknown;
   err?: Error;
@@ -134,7 +151,8 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial<PinoOptions
 
         const [captureObj, message, levelNumber] = args;
         const level = self?.levels?.labels?.[levelNumber] || 'info';
-        const logMessage = message || (resultObj?.msg as string | undefined) || '';
+        const messageKey = getPinoKey(self, 'pino.messageKey', 'msg');
+        const logMessage = message || (resultObj?.[messageKey] as string | undefined) || '';
 
         if (enableLogs && options.log.levels.includes(level)) {
           const attributes: Record<string, unknown> = {
@@ -163,8 +181,9 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial<PinoOptions
               return event;
             });
 
-            if (captureObj.err) {
-              captureException(captureObj.err, captureContext);
+            const error = captureObj[getPinoKey(self, 'pino.errorKey', 'err')];
+            if (error) {
+              captureException(error, captureContext);
               return;
             }