worked on auto tracing

Author: Ankcorn

README.md

@@ -130,9 +130,15 @@ app.setDefaultFunctionProps({
 
 ## Automatic Instrumentation
 
-WIP - you still need to manually apply baselime.wrap(handler). This will be automated in future versions.
+### Manual Setup
 
-## SST
+1. Add the baselime-node layer - `arn:aws:lambda:${region:097948374213:layer:baselime-node:2`
+2. Add the baselime-extension layer - `arn:aws:lambda:${region}:097948374213:layer:baselime-extension-${'x86_64' || 'arm64'}:1`
+3. Set the handler to `/opt/nodejs/node_modules/@baselime/lambda-node-opentelemetry/handler.handler`
+4. Set the BASELIME_ORIGINAL_HANDLER environment variable to the original path of your lambda
+5. Set the BASELIME_KEY environment variable with the value of your environments baselime api key
+
+### SST
 
 ```typescript
 import { LayerVersion } from "aws-cdk-lib/aws-lambda";
@@ -152,7 +158,7 @@ if (!scope.local) {
 }
 ```
 
-## Serverless
+### Serverless
 
 ```yml
 provider:
@@ -164,7 +170,7 @@ provider:
     BASELIME_KEY: ${env:BASELIME_KEY}
 ```
 
-## Architect
+### Architect
 
 ```
 // app.arc

dist/index.js

@@ -34,6 +34,7 @@ provider:
     NODE_OPTIONS: --require node_modules/@baselime/lambda-node-opentelemetry/lambda-wrapper.js
     OTEL_LOG_LEVEL: debug
     COLLECTOR_URL: https://otel.baselime.cc/v1
+    DISPATCH_POST_URI: https://lambda-extension.baselime.cc
 functions:
   hello:
     handler: src/main.handler

dist/lambda-wrapper.js

@@ -1,10 +1,8 @@
-import baselime from "@baselime/lambda-node-opentelemetry";
-
-export const handler = baselime.wrap(async () => {
+export const handler = async () => {
   console.log("TODO LIST", JSON.stringify({ MESSAGE:[{ id: 1, text: "TODO 1" }]}));
 
   return {
     statusCode: 200,
     body: JSON.stringify({ MESSAGE:[{ id: 1, text: "TODO 1" }]}),
   }
-})
+}

examples/serverless/serverless.yml

@@ -1,12 +1,16 @@
 import { StackContext, Api, EventBus, App } from "sst/constructs";
 import { LayerVersion } from "aws-cdk-lib/aws-lambda";
 
+
+function magicShit(api) {
+  console.log(api)
+}
 export function API({ stack }: StackContext) {
 
   const baselime = LayerVersion.fromLayerVersionArn(
     stack,
     "BaselimeLayer",
-    `arn:aws:lambda:eu-west-2:097948374213:layer:baselime-node:2`
+    `arn:aws:lambda:eu-west-2:374211872663:layer:baselime-node:7`
   );
 
   if (!(stack.node.scope as App)?.local) {
@@ -15,7 +19,8 @@ export function API({ stack }: StackContext) {
       AWS_LAMBDA_EXEC_WRAPPER: '/opt/baselime',
       BASELIME_KEY: process.env.BASELIME_KEY as string,
       COLLECTOR_URL: 'https://otel.baselime.cc/v1',
-      OTEL_LOG_LEVEL: 'debug'
+      OTEL_LOG_LEVEL: 'debug',
+      BASELIME_ORIGINAL_HANDLER: 'packages/functions/src/todo.handler',
     });
 
   }
@@ -40,10 +45,11 @@ export function API({ stack }: StackContext) {
     },
     routes: {
       "GET /": "packages/functions/src/todo.handler",
-      "POST /": "packages/functions/src/todo.handler",
     },
   });
 
+  magicShit(api);
+
   bus.subscribe("todo.created", {
     handler: "packages/functions/src/events/todo-created.handler",
   });

examples/sst/packages/functions/src/todo.ts

@@ -0,0 +1,6 @@
+const { loadSync } = require('../src/loader');
+
+exports.handler = function (...args) {
+
+    loadSync();
+};

examples/sst/stacks/MyStack.ts

@@ -0,0 +1,20 @@
+import { load } from '../src/loader.js';
+import { wrap } from '../src/index.js';
+
+export const handler = async function (...args) {
+    const actualHandler = process.env.BASELIME_ACTUAL_HANDLER;
+    const taskRoot = process.env.LAMBDA_TASK_ROOT;
+
+    if(!taskRoot) {
+        throw Error('LAMBDA_TASK_ROOT is not defined');
+    }
+
+    if(!actualHandler) {
+        throw Error('BASELIME_ACTUAL_HANDLER is not defined');
+    }
+
+    const handler = await load(taskRoot, actualHandler);
+
+    const [event, context] = args
+    return wrap(handler)(event, context);
+};

handler.cjs

@@ -0,0 +1,6 @@
+const { loadSync } = require('../src/loader');
+
+exports.handler = function (...args) {
+
+    loadSync();
+};

handler.mjs

@@ -0,0 +1,20 @@
+import { load } from '../src/loader.js';
+import { wrap } from '../src/index.js';
+
+export const handler = async function (...args) {
+    const actualHandler = process.env.BASELIME_ACTUAL_HANDLER;
+    const taskRoot = process.env.LAMBDA_TASK_ROOT;
+
+    if(!taskRoot) {
+        throw Error('LAMBDA_TASK_ROOT is not defined');
+    }
+
+    if(!actualHandler) {
+        throw Error('BASELIME_ACTUAL_HANDLER is not defined');
+    }
+
+    const handler = await load(taskRoot, actualHandler);
+
+    const [event, context] = args
+    return wrap(handler)(event, context);
+};