fix: Adjust code for typescript-eslint v6 rules (#222)

* deps: skuba 7.1.1

* Placate ESLint

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ryan Ling <[email protected]>

.prettierignore

@@ -4,4 +4,5 @@
 /.gantry/**/*.yml
 gantry*.yaml
 gantry*.yml
+pnpm-lock.yaml
 # end managed by skuba

package.json

@@ -38,7 +38,7 @@
     "datadog-lambda-js": "7.96.0",
     "dd-trace": "4.12.0",
     "hot-shots": "10.0.0",
-    "skuba": "7.0.1"
+    "skuba": "7.1.1"
   },
   "peerDependencies": {
     "datadog-lambda-js": "6.x || 7.x",

src/createCloudWatchClient.ts

@@ -31,7 +31,7 @@ export const createCloudWatchClient = (config: AppConfig): MetricsClient => {
 
     const name = `${config.name}.${metric.name.toLowerCase()}`;
 
-    const tags = [...globalTags(config), ...(metric.tags || [])]
+    const tags = [...globalTags(config), ...(metric.tags ?? [])]
       .map(sanitiseTag)
       .join(',');
 

src/createLambdaExtensionClient.test.ts

@@ -6,7 +6,9 @@ const sendDistributionMetric = jest
   .spyOn(datadogJS, 'sendDistributionMetric')
   .mockReturnValue();
 
-const datadog = jest.spyOn(datadogJS, 'datadog').mockReturnValue(() => {});
+const datadog = jest
+  .spyOn(datadogJS, 'datadog')
+  .mockReturnValue(() => undefined);
 
 describe('createLambdaExtensionClient', () => {
   const { metricsClient, withLambdaExtension } = createLambdaExtensionClient({

src/createLambdaExtensionClient.ts

@@ -69,7 +69,7 @@ export const createLambdaExtensionClient = (
     const sanitisedLambdaName = config.name.replace(new RegExp('-', 'g'), '_');
     const name = `${sanitisedLambdaName}.${metric.name.toLowerCase()}`;
 
-    const tags = (metric.tags || []).map(sanitiseTag);
+    const tags = (metric.tags ?? []).map(sanitiseTag);
 
     if (config.metrics) {
       sendDistributionMetric(name, value, ...tags);

src/createNoOpClient.ts

@@ -8,8 +8,8 @@ import type { MetricsClient } from './MetricsClient';
  *
  */
 export const createNoOpClient = (): MetricsClient => ({
-  increment: () => {},
-  decrement: () => {},
-  histogram: () => {},
-  timing: () => {},
+  increment: () => undefined,
+  decrement: () => undefined,
+  histogram: () => undefined,
+  timing: () => undefined,
 });

src/createStatsDClient.ts

@@ -8,15 +8,13 @@ interface InternalStatsD extends MetricsClient {
   };
 }
 
-interface StatsD<T extends InternalStatsD> {
-  new (options?: {
-    mock?: boolean;
-    host?: string;
-    errorHandler?: (err: Error) => void;
-    prefix?: string;
-    globalTags?: Record<string, string> | string[];
-  }): T;
-}
+type StatsD<T extends InternalStatsD> = new (options?: {
+  mock?: boolean;
+  host?: string;
+  errorHandler?: (err: Error) => void;
+  prefix?: string;
+  globalTags?: Record<string, string> | string[];
+}) => T;
 
 /**
  * Configuration for building a StatsD client

src/createTimedSpan.test.ts

@@ -74,7 +74,7 @@ describe('timedSpan', () => {
       'test',
       // This is false but we still successfully resolved
       () => Promise.resolve(false),
-      () => {},
+      () => undefined,
       ['new-tags'],
     );
 

src/createTimedSpan.ts

@@ -39,7 +39,7 @@ export const createTimedSpan =
       const complete = afterCompletion?.(durationMilliseconds, success, result);
 
       const tagsToAdd =
-        tags || complete?.tags
+        tags ?? complete?.tags
           ? [...(tags ?? []), ...(complete?.tags ?? [])]
           : undefined;