fix callback support

Ankcorn · Ankcorn · commit 465f3e53a4a6 · 2023-07-24T17:36:52.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+
+## [0.1.17] 2023-07-24
+
+- fix callback support
+
 ## [0.1.16] 2023-07-17
 
 - fix
-
  
  The latest layer is: `arn:aws:lambda:${your-region-here}:097948374213:layer:baselime-node:12`
 
diff --git a/examples/sst/package-lock.json b/examples/sst/package-lock.json
diff --git a/examples/sst/package.json b/examples/sst/package.json
@@ -12,16 +12,13 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "@tsconfig/node16": "^1.0.4",
-    "aws-cdk-lib": "2.79.1",
+    "sst": "^2.22.5",
+    "aws-cdk-lib": "2.84.0",
     "constructs": "10.1.156",
-    "sst": "^2.13.2",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.6",
+    "@tsconfig/node16": "^16.1.0"
   },
   "workspaces": [
     "packages/*"
-  ],
-  "dependencies": {
-    "@aws-sdk/client-lambda": "^3.370.0"
-  }
-}
+  ]
+}
diff --git a/examples/sst/packages/core/package.json b/examples/sst/packages/core/package.json
@@ -7,9 +7,9 @@
     "typecheck": "tsc -noEmit"
   },
   "devDependencies": {
-    "vitest": "^0.32.0",
-    "@types/node": "^20.3.1",
-    "sst": "^2.13.2"
+    "vitest": "^0.33.0",
+    "@types/node": "^20.4.4",
+    "sst": "^2.22.5"
   },
   "dependencies": {
     "zod": "^3.21.4"
diff --git a/examples/sst/packages/core/tsconfig.json b/examples/sst/packages/core/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "@tsconfig/node16/tsconfig.json",
   "compilerOptions": {
-    "module": "esnext"
+    "module": "esnext",
+    "moduleResolution": "node"
   }
 }
diff --git a/examples/sst/packages/functions/package.json b/examples/sst/packages/functions/package.json
@@ -7,9 +7,9 @@
     "typecheck": "tsc -noEmit"
   },
   "devDependencies": {
-    "@types/node": "^20.3.1",
-    "@types/aws-lambda": "^8.10.117",
-    "vitest": "^0.32.0",
-    "sst": "^2.13.2"
+    "@types/node": "^20.4.4",
+    "@types/aws-lambda": "^8.10.119",
+    "vitest": "^0.33.0",
+    "sst": "^2.22.5"
   }
 }
diff --git a/examples/sst/packages/functions/src/events/todo-created.ts b/examples/sst/packages/functions/src/events/todo-created.ts
@@ -1,5 +1,6 @@
+import { EventHandler } from "sst/node/event-bus";
+import { Todo } from "@sst/core/todo";
 
-
-export const handler = () => {
-  console.log("TODO CREATED");
-}
+export const handler = EventHandler(Todo.Events.Created, async (evt) => {
+  console.log("Todo created", evt);
+});
diff --git a/examples/sst/packages/functions/src/lambda.ts b/examples/sst/packages/functions/src/lambda.ts
@@ -0,0 +1,8 @@
+import { ApiHandler } from "sst/node/api";
+
+export const handler = ApiHandler(async (_evt) => {
+  return {
+    statusCode: 200,
+    body: `Hello world. The time is ${new Date().toISOString()}`,
+  };
+});
diff --git a/examples/sst/packages/functions/src/todo.ts b/examples/sst/packages/functions/src/todo.ts
@@ -1,13 +1,18 @@
-import { LambdaClient, ListFunctionsCommand } from "@aws-sdk/client-lambda";
+import { ApiHandler } from "sst/node/api";
+import { Todo } from "@sst/core/todo";
 
-export const handler = async () => {
-  console.log("TODO LIST", JSON.stringify({ MESSAGE: [{ id: 1, text: "TODO 1" }] }));
-  const client = new LambdaClient({});
-  const command = new ListFunctionsCommand({});
-  const response = await client.send(command);
-  console.log("response", response)
+export const create = ApiHandler(async (_evt) => {
+  await Todo.create();
+
+  return {
+    statusCode: 200,
+    body: "Todo created",
+  };
+});
+
+export const list = ApiHandler(async (_evt) => {
   return {
     statusCode: 200,
-    body: JSON.stringify({ MESSAGE: [{ id: 1, text: "TODO 1" }] }),
-  }
-}
+    body: JSON.stringify(Todo.list()),
+  };
+});
diff --git a/examples/sst/packages/functions/tsconfig.json b/examples/sst/packages/functions/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "@tsconfig/node16/tsconfig.json",
   "compilerOptions": {
     "module": "esnext",
+    "moduleResolution": "node",
     "baseUrl": ".",
     "paths": {
       "@sst/core/*": ["../core/src/*"]
diff --git a/examples/sst/sst.config.ts b/examples/sst/sst.config.ts
@@ -1,5 +1,6 @@
 import { SSTConfig } from "sst";
 import { API } from "./stacks/MyStack";
+import { Tags } from "aws-cdk-lib/core";
 
 export default {
   config(_input) {
@@ -9,15 +10,7 @@ export default {
     };
   },
   stacks(app) {
-    app.setDefaultFunctionProps({
-      timeout: 20,
-      memorySize: 512,
-      tracing: 'pass_through',
-      runtime: "nodejs18.x",
-      nodejs: {
-        format: "esm"
-      }
-    });
     app.stack(API);
+    Tags.of(app).add("baselime:tracing", "true");
   }
 } satisfies SSTConfig;
diff --git a/examples/sst/stacks/MyStack.ts b/examples/sst/stacks/MyStack.ts
@@ -1,10 +1,6 @@
-import { StackContext, Api, EventBus, App } from "sst/constructs";
-import { LayerVersion } from "aws-cdk-lib/aws-lambda";
-import { Tags } from "aws-cdk-lib";
-
+import { StackContext, Api, EventBus } from "sst/constructs";
 
 export function API({ stack }: StackContext) {
-
   const bus = new EventBus(stack, "bus", {
     defaults: {
       retries: 10,
@@ -14,29 +10,21 @@ export function API({ stack }: StackContext) {
   const api = new Api(stack, "api", {
     defaults: {
       function: {
-        permissions: ["lambda:ListFunctions"],
-        environment: {
-          BEEP: "YARP"
-        },
         bind: [bus],
-        nodejs: {
-          esbuild: {
-            external: ["@baselime/lambda-node-opentelemetry"]
-          }
-        }
       },
     },
     routes: {
-      "GET /": "packages/functions/src/todo.handler",
+      "GET /": "packages/functions/src/lambda.handler",
+      "GET /todo": "packages/functions/src/todo.list",
+      "POST /todo": "packages/functions/src/todo.create",
     },
   });
-  api.attachPermissions(["lambda:ListFunctions"]);
-  Tags.of(api).add("baselime:tracing", "true");
 
   bus.subscribe("todo.created", {
     handler: "packages/functions/src/events/todo-created.handler",
   });
 
+  
   stack.addOutputs({
     ApiEndpoint: api.url,
   });
diff --git a/examples/sst/tsconfig.json b/examples/sst/tsconfig.json
@@ -1,4 +1,7 @@
 {
   "extends": "@tsconfig/node16/tsconfig.json",
-  "exclude": ["packages"]
+  "exclude": ["packages"],
+  "compilerOptions": {
+    "moduleResolution": "node"
+  }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@baselime/lambda-node-opentelemetry",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "OpenTelemetry auto tracer for Node.JS based AWS Lambda functions",
   "keywords": [
     "nodejs",
diff --git a/src/index.ts b/src/index.ts
@@ -56,7 +56,7 @@ export function wrap(handler: Handler) {
     const ctx = trace.setSpan(context.active(), span);
 
     try {
-      if(callback && handler.constructor.name !== "AsyncFunction") {
+      if(callback && handler.constructor.name !== "AsyncFunction" && handler.length === 3) {
         console.log("promisify handler");
         handler = promisify(handler);
       }
diff --git a/tests/wrap.test.ts b/tests/wrap.test.ts
@@ -55,7 +55,7 @@ const context = {
 }
 describe("wrap", () => {
     const { getSpan } = setupOtelTestHarness()
-    test("should wrap a callback lambda handler and not error", async () => {
+    test.only("should wrap a callback lambda handler and not error", async () => {
         const wrapped = wrap(callbackHandler);
         await wrapped({}, context, (err, result) => {
             expect(result).toBe("callback lambda go brrr");
@@ -69,7 +69,7 @@ describe("wrap", () => {
 
 
     });
-    test.only("should wrap a async lambda handler and not error", async () => {
+    test("should wrap a async lambda handler and not error", async () => {
         const wrapped = wrap(asyncHandler);
         const result = await wrapped({}, context, () => {});
         const span = getSpan();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "@tsconfig/node16/tsconfig.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "module": "esnext"`
	`4`	`+ "module": "esnext",`
	`5`	`+ "moduleResolution": "node"`
`5`	`6`	`}`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`	`"typecheck": "tsc -noEmit"`
`8`	`8`	`},`
`9`	`9`	`"devDependencies": {`
`10`		`- "@types/node": "^20.3.1",`
`11`		`- "@types/aws-lambda": "^8.10.117",`
`12`		`- "vitest": "^0.32.0",`
`13`		`- "sst": "^2.13.2"`
	`10`	`+ "@types/node": "^20.4.4",`
	`11`	`+ "@types/aws-lambda": "^8.10.119",`
	`12`	`+ "vitest": "^0.33.0",`
	`13`	`+ "sst": "^2.22.5"`
`14`	`14`	`}`
`15`	`15`	`}`