✨ Add support for 3-param calls for Sentry extend

Author: Michal Vlasák

src/sentry.ts

@@ -51,9 +51,9 @@ export const extendSentry = (logger: Cosmas, options: { sentry: string | true; s
     };
 
     logger.realHooks.logMethod = function (inputArgs, method) {
-        // 2nd argument is Sentry options
-        const sentryCallback: SentryCallback | undefined = inputArgs[1];
-        // TODO: automatic type for 2nd log method arg
+        // TODO: automatic types for logFn calls
+        const sentryCallback: SentryCallback | undefined =
+            typeof inputArgs[0] === 'object' ? inputArgs[2] : inputArgs[1];
 
         if (!sentryCallback) {
             return method.apply(this, inputArgs);

src/tests/sentry-mocked.test.ts

@@ -131,7 +131,49 @@ describe('sentry mocked', () => {
         });
     });
 
-    test('can pass sentry tags', async () => {
+    test('can pass sentry tags, context and extras', async () => {
+        const dateNow = Date.now;
+        Date.now = jest.fn(() => 1520343036000);
+        await new Promise((resolve, reject) => {
+            const logger = loggerFactory();
+            extendSentry(logger, { sentry: 'DSN' });
+            captureMessage.mockImplementation(createCapture(resolve));
+            logger.fatal({ name: 'John Doe' }, 'sentryData', (scope: Scope) => {
+                scope.setContext('dummyContext', { foo: 'bar' });
+                scope.setTags({ first: 'firstTag' });
+                scope.setExtras({ extra: 'extraValue' });
+            });
+        });
+        expect(captureMessage).toHaveBeenCalledTimes(1);
+        expect(captureException).not.toHaveBeenCalled();
+        expect(captureMessage.mock.calls[0]).toMatchInlineSnapshot(`
+            Array [
+              "sentryData",
+            ]
+        `);
+        expect(omit(captureMessage.mock.results[0].value, 'cosmas.pkgVersion')).toMatchInlineSnapshot(`
+            Object {
+              "data": "sentryData",
+              "scope": Object {
+                "context": Object {
+                  "dummyContext": Object {
+                    "foo": "bar",
+                  },
+                },
+                "extras": Object {
+                  "extra": "extraValue",
+                },
+                "level": "critical",
+                "tags": Object {
+                  "first": "firstTag",
+                },
+              },
+            }
+        `);
+        Date.now = dateNow;
+    });
+
+    test('can pass sentry tags, context and extras with 3 params', async () => {
         const dateNow = Date.now;
         Date.now = jest.fn(() => 1520343036000);
         await new Promise((resolve, reject) => {