ci: add in missing benchmarks

willfarrell · willfarrell · commit 8d0a13914fb2 · 2023-12-10T12:10:45.000-07:00
diff --git a/packages/appconfig/__benchmarks__/index.js b/packages/appconfig/__benchmarks__/index.js
@@ -1,4 +1,3 @@
-/*
 import { Bench } from 'tinybench'
 import middy from '../../core/index.js'
 import middleware from '../index.js'
@@ -16,8 +15,15 @@ const context = {
   getRemainingTimeInMillis: () => 30000
 }
 const setupHandler = (options = {}) => {
+  const strToUintArray = (str) =>
+    Uint8Array.from(str.split('').map((x) => x.charCodeAt()))
+
   mockClient(AppConfigDataClient)
-    .on(StartConfigurationSessionCommand, params)
+    .on(StartConfigurationSessionCommand, {
+      ApplicationIdentifier: '...',
+      ConfigurationProfileIdentifier: '...',
+      EnvironmentIdentifier: '...'
+    })
     .resolves({
       ContentType: 'application/json',
       InitialConfigurationToken: 'InitialToken...'
@@ -57,4 +63,3 @@ await bench
   .run()
 
 console.table(bench.table())
-*/
diff --git a/packages/cloudwatch-metrics/__benchmarks__/index.js b/packages/cloudwatch-metrics/__benchmarks__/index.js
@@ -1,4 +1,3 @@
-/*
 import { Bench } from 'tinybench'
 import middy from '../../core/index.js'
 import middleware from '../index.js'
@@ -8,28 +7,26 @@ const bench = new Bench({ time: 1_000 })
 const context = {
   getRemainingTimeInMillis: () => 30000
 }
-const setupHandler = () => {
+const setupHandler = (options = {}) => {
   const baseHandler = () => {}
-  return middy(baseHandler)
-    .use(middleware({ namespace: 'namespace' }))
+  return middy(baseHandler).use(middleware({ namespace: 'namespace' }))
 }
 
+const coldHandler = setupHandler({ cacheExpiry: 0 })
 const warmHandler = setupHandler()
 
-// TODO fix error
 await bench
-  .add('Cold Invocation', async (event = {}) => {
-    const coldHandler = setupHandler()
+  .add('without cache', async (event = {}) => {
     try {
       await coldHandler(event, context)
     } catch (e) {}
   })
-  .add('Warm Invocation', async (event = {}) => {
+  .add('with cache', async (event = {}) => {
     try {
       await warmHandler(event, context)
     } catch (e) {}
   })
 
   .run()
 
-console.table(bench.table()) */
+console.table(bench.table())
diff --git a/packages/core/__tests__/index.js b/packages/core/__tests__/index.js
@@ -877,7 +877,7 @@ test('Should trigger all plugin hooks', async (t) => {
   t.is(plugin.requestEnd.callCount, 1)
 })
 
-test('Should abort handler', async (t) => {
+test('Should abort handler when timeout expires', async (t) => {
   const plugin = {
     timeoutEarlyInMillis: 1,
     timeoutEarlyResponse: () => true
@@ -899,15 +899,15 @@ test('Should abort handler', async (t) => {
   } catch (e) {}
 })
 
-test('Should abort timeout', async (t) => {
+test('Should throw error when timeout expires', async (t) => {
   const plugin = {
-    timeoutEarlyInMillis: 50
+    timeoutEarlyInMillis: 1
   }
   const context = {
     getRemainingTimeInMillis: () => 100
   }
   const handler = middy(async (event, context, { signal }) => {
-    await setTimeout(200)
+    await setTimeout(100)
     return true
   }, plugin)
 
@@ -916,6 +916,7 @@ test('Should abort timeout', async (t) => {
   } catch (e) {
     t.is(e.name, 'TimeoutError')
     t.is(e.message, '[AbortError]: The operation was aborted.')
+    t.deepEqual(e.cause, { package: '@middy/core' })
   }
 })
 
diff --git a/packages/core/index.js b/packages/core/index.js
@@ -42,10 +42,10 @@ const middy = (lambdaHandler = defaultLambdaHandler, plugin = {}) => {
 
     return runRequest(
       request,
-      [...beforeMiddlewares],
+      beforeMiddlewares,
       lambdaHandler,
-      [...afterMiddlewares],
-      [...onErrorMiddlewares],
+      afterMiddlewares,
+      onErrorMiddlewares,
       plugin
     )
   }
diff --git a/packages/dynamodb/__benchmarks__/index.js b/packages/dynamodb/__benchmarks__/index.js
@@ -1,28 +1,30 @@
-/*
 import { Bench } from 'tinybench'
 import middy from '../../core/index.js'
 import middleware from '../index.js'
 
 import { mockClient } from 'aws-sdk-client-mock'
-import {
-  SecretsManagerClient,
-  GetSecretValueCommand
-} from '@aws-sdk/client-dynamodb'
+import { DynamoDBClient, GetItemCommand } from '@aws-sdk/client-dynamodb'
 
 const bench = new Bench({ time: 1_000 })
 
 const context = {
   getRemainingTimeInMillis: () => 30000
 }
 const setupHandler = (options = {}) => {
-  mockClient(SecretsManagerClient)
-    .on(GetSecretValueCommand)
-    .resolves({ SecretString: 'token' })
+  mockClient(DynamoDBClient)
+    .on(GetItemCommand)
+    .resolvesOnce({
+      Item: {
+        value: {
+          S: 'value'
+        }
+      }
+    })
   const baseHandler = () => {}
   return middy(baseHandler).use(
     middleware({
       ...options,
-      AwsClient: SecretsManagerClient
+      AwsClient: DynamoDBClient
     })
   )
 }
@@ -45,4 +47,3 @@ await bench
   .run()
 
 console.table(bench.table())
-*/
diff --git a/packages/event-normalizer/__benchmarks__/index.js b/packages/event-normalizer/__benchmarks__/index.js
@@ -1,4 +1,3 @@
-/*
 import { Bench } from 'tinybench'
 import createEvent from '@serverless/event-mocks'
 import middy from '../../core/index.js'
@@ -15,38 +14,86 @@ const setupHandler = () => {
 }
 
 const warmHandler = setupHandler()
-const dynamoEvent = createEvent.default('aws:dynamo')
-const kinesisEvent = { event: createEvent.default('aws:kinesis') }
-const s3Event = createEvent.default('aws:s3')
-const sqsEvent = createEvent.default('aws:sqs')
-const snsEvent = createEvent.default('aws:sns')
-
-kinesisEvent.event.Records[0].kinesis.data = Buffer.from(
-  JSON.stringify({ hello: 'world' }),
-  'utf-8'
-).toString('base64')
+const dynamoEvent = () => createEvent.default('aws:dynamo')
+const kinesisEvent = () => {
+  const event = createEvent.default('aws:kinesis')
+  event.Records[0].kinesis.data = Buffer.from(
+    JSON.stringify({ hello: 'world' }),
+    'utf-8'
+  ).toString('base64')
+  return { event }
+}
+const s3Event = () => createEvent.default('aws:s3')
+const sqsEvent = () => createEvent.default('aws:sqs')
+const snsEvent = () => {
+  const event = createEvent.default('aws:sns')
+  event.Records[0].Sns.Message = JSON.stringify(sqsEvent())
+  return event
+}
 
-const deepJsonEvent = createEvent.default('aws:sqs')
-snsEvent.Records[0].Sns.Message = JSON.stringify(sqsEvent)
-deepJsonEvent.Records[0].body = JSON.stringify(snsEvent)
+const deepJsonEvent = () => {
+  const event = createEvent.default('aws:sqs')
+  event.Records[0].body = JSON.stringify(snsEvent())
+  return event
+}
 
+let event
 await bench
-  .add('S3 Event', async (event = { ...s3Event }) => {
-    await warmHandler(event, context)
-  })
-  .add('Shallow JSON (SQS) Event', async (event = { ...sqsEvent }) => {
-    await warmHandler(event, context)
-  })
-  .add('Deep JSON (S3>SNS>SQS) Event', async (event = { ...deepJsonEvent }) => {
-    await warmHandler(event, context)
-  })
-  .add('DynamoDB Event', async (event = { ...dynamoEvent }) => {
-    await warmHandler(event, context)
-  })
-  .add('Kinesis Event', async (event = { ...kinesisEvent }) => {
-    await warmHandler(event, context)
-  })
+  .add(
+    'S3 Event',
+    async () => {
+      await warmHandler(event, context)
+    },
+    {
+      beforeEach: () => {
+        event = s3Event()
+      }
+    }
+  )
+  .add(
+    'Shallow JSON (SQS) Event',
+    async () => {
+      await warmHandler(event, context)
+    },
+    {
+      beforeEach: () => {
+        event = sqsEvent()
+      }
+    }
+  )
+  .add(
+    'Deep JSON (S3>SNS>SQS) Event',
+    async () => {
+      await warmHandler(event, context)
+    },
+    {
+      beforeEach: () => {
+        event = deepJsonEvent()
+      }
+    }
+  )
+  .add(
+    'DynamoDB Event',
+    async () => {
+      await warmHandler(event, context)
+    },
+    {
+      beforeEach: () => {
+        event = dynamoEvent()
+      }
+    }
+  )
+  .add(
+    'Kinesis Event',
+    async () => {
+      await warmHandler(event, context)
+    },
+    {
+      beforeEach: () => {
+        event = kinesisEvent()
+      }
+    }
+  )
   .run()
 
 console.table(bench.table())
-*/
diff --git a/packages/s3/__benchmarks__/index.js b/packages/s3/__benchmarks__/index.js
@@ -1,25 +1,32 @@
-/*
 import { Bench } from 'tinybench'
 import middy from '../../core/index.js'
 import middleware from '../index.js'
 
 import { mockClient } from 'aws-sdk-client-mock'
-import { SecretsManagerClient, GetSecretValueCommand } from '@aws-sdk/client-s3'
+import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3'
 
 const bench = new Bench({ time: 1_000 })
 
 const context = {
   getRemainingTimeInMillis: () => 30000
 }
 const setupHandler = (options = {}) => {
-  mockClient(SecretsManagerClient)
-    .on(GetSecretValueCommand)
-    .resolves({ SecretString: 'token' })
+  const s3Response = (content) => {
+    return {
+      transformToString: async () => content
+    }
+  }
+  mockClient(S3Client)
+    .on(GetObjectCommand)
+    .resolvesOnce({
+      ContentType: 'application/json',
+      Body: s3Response('{"option":"value"}')
+    })
   const baseHandler = () => {}
   return middy(baseHandler).use(
     middleware({
       ...options,
-      AwsClient: SecretsManagerClient
+      AwsClient: S3Client
     })
   )
 }
@@ -42,4 +49,3 @@ await bench
   .run()
 
 console.table(bench.table())
-*/

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,10 @@ const middy = (lambdaHandler = defaultLambdaHandler, plugin = {}) => {`
`42`	`42`
`43`	`43`	`return runRequest(`
`44`	`44`	`request,`
`45`		`- [...beforeMiddlewares],`
	`45`	`+ beforeMiddlewares,`
`46`	`46`	`lambdaHandler,`
`47`		`- [...afterMiddlewares],`
`48`		`- [...onErrorMiddlewares],`
	`47`	`+ afterMiddlewares,`
	`48`	`+ onErrorMiddlewares,`
`49`	`49`	`plugin`
`50`	`50`	`)`
`51`	`51`	`}`