make sure flushing is not canceled

Author: Ankcorn

CHANGELOG.md

@@ -32,6 +32,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
  The latest layer is: `arn:aws:lambda:${your-region-here}:097948374213:layer:baselime-node:8`
 
+ 
+ The latest layer is: `arn:aws:lambda:${your-region-here}:097948374213:layer:baselime-node:8`
+
+ 
+ The latest layer is: `arn:aws:lambda:${your-region-here}:374211872663:layer:baselime-node:13`
+
+ 
+ The latest layer is: `arn:aws:lambda:${your-region-here}:374211872663:layer:baselime-node:14`
+
+ 
+ The latest layer is: `arn:aws:lambda:${your-region-here}:374211872663:layer:baselime-node:15`
+
 ## [0.1.11] 2023-07-22
 
 - publish via CI

examples/serverless/serverless.yml

@@ -2,8 +2,6 @@ service: tracing
 
 package:
   individually: true
-  patterns:
-    - 'node_modules/@baselime/lambda-node-opentelemetry'
 
 plugins:
   - serverless-esbuild
@@ -15,8 +13,6 @@ provider:
   region: eu-west-2
   architecture: arm64
   versionFunctions: false
-  layers:
-   - arn:aws:lambda:eu-west-2:097948374213:layer:baselime-extension-arm64:1
   iam:
     role:
       statements:
@@ -29,12 +25,8 @@ provider:
         - Effect: Allow
           Action: 'events:PutEvents'
           Resource: '*'
-  environment:
-    BASELIME_KEY: ${env:BASELIME_KEY}
-    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
+  tags:
+    'baselime:tracing': true
 functions:
   hello:
     handler: src/main.handler

examples/serverless/src/api.js

@@ -1,13 +1,13 @@
 import Dynamodb from 'aws-sdk/clients/dynamodb';
 import SNS from 'aws-sdk/clients/sns';
 import EventBridge from 'aws-sdk/clients/eventbridge';
-import { wrap } from '@baselime/lambda-node-opentelemetry';
 
 const dynamo = new Dynamodb();
 const sns = new SNS();
 const eventbridge = new EventBridge();
 
-export const handler = wrap(async (event) => {
+export const handler = async (event, context) => {
+    context.callbackWaitForEmptyEventLoop = false;
     await sns.publish({ TopicArn: process.env.TOPIC_ARN, Message: 'wow much payload' }).promise()
     await eventbridge.putEvents({
         Entries: [{
@@ -16,24 +16,24 @@ export const handler = wrap(async (event) => {
         }]
     }).promise()
     const random = Math.random();
-    if(random < 0.3) {
-        const response = await dynamo.updateItem({
-            TableName: 'this-table-does-not-exist',
-            ReturnValues: 'ALL_NEW',
-            Key: {
-                id: {
-                    S: 'test'
-                }
-            },
-            UpdateExpression: 'ADD #c :c',
-            ExpressionAttributeNames: {
-                '#c': 'count'
-            },
-            ExpressionAttributeValues: {
-                ':c': { N: '1' }
-            }
-        }).promise()
-    }
+    // if(random < 0.3) {
+    //     const response = await dynamo.updateItem({
+    //         TableName: 'this-table-does-not-exist',
+    //         ReturnValues: 'ALL_NEW',
+    //         Key: {
+    //             id: {
+    //                 S: 'test'
+    //             }
+    //         },
+    //         UpdateExpression: 'ADD #c :c',
+    //         ExpressionAttributeNames: {
+    //             '#c': 'count'
+    //         },
+    //         ExpressionAttributeValues: {
+    //             ':c': { N: '1' }
+    //         }
+    //     }).promise()
+    // }
     const response = await dynamo.updateItem({
         TableName: process.env.DB_NAME,
         ReturnValues: 'ALL_NEW',
@@ -56,4 +56,4 @@ export const handler = wrap(async (event) => {
             data: response
         })
     }
-});
+};

examples/serverless/src/dispatcher.js

@@ -1,8 +1,8 @@
-const { wrap } = require('@baselime/lambda-node-opentelemetry');
 
-exports.handler = wrap(async (event) => {
+exports.handler = async (event, context) => {
+    context.callbackWaitForEmptyEventLoop = false;
     console.log(event.Records[0].Sns)
     return {
       message: 'req processed'
     }
-});
+};

examples/serverless/src/eventbridge.js

@@ -1,8 +1,8 @@
-const { wrap } = require('@baselime/lambda-node-opentelemetry');
 
-exports.handler = wrap(async (event) => {
+exports.handler = async (event, context) => {
+    context.callbackWaitForEmptyEventLoop = false;
     console.log(event)
     return {
       message: 'req processed'
     }
-});
+};

examples/serverless/src/main.js

@@ -1,6 +1,5 @@
 const tiny = require("tiny-json-http");
 const { context, trace, } = require("@opentelemetry/api");
-const { wrap } = require("@baselime/lambda-node-opentelemetry");
 
 const { flattenObject } = require("./utils");
 
@@ -36,15 +35,16 @@ function trackAll(name, lib) {
   return tracedLib;
 }
 
-exports.handler = wrap(async (e) => {
+exports.handler = async (e, context) => {
+  context.callbackWaitForEmptyEventLoop = false;
   const { body: customer } = await track("tiny.get", tiny.get, {
     url: `${process.env.API_URL}/hello`,
   });
 
-  await track("tiny.post", tiny.post, {
-    url: "https://eokl0ly5zia7pe1.m.pipedream.net",
-    data: customer,
-  });
+  // await track("tiny.post", tiny.post, {
+  //   url: "https://eokl0ly5zia7pe1.m.pipedream.net",
+  //   data: customer,
+  // });
 
   return customer;
-});
+};

src/index.ts

@@ -5,7 +5,7 @@ import { Context } from 'aws-lambda';
 export * as logger from './logger';
 
 declare const global : {
-	baselimeLambdaFlush: () => void;
+	baselimeLambdaFlush: () => Promise<void>;
 }
 
 export function wrap(handler: Handler) {
@@ -45,11 +45,9 @@ export function wrap(handler: Handler) {
       span.end();
       throw e
     } finally {
-      
       if (global.baselimeLambdaFlush) {
-        global.baselimeLambdaFlush();
+        await global.baselimeLambdaFlush();
       }
-
     }
   }
 }
@@ -118,4 +116,3 @@ function extractContext(event: any) {
   }
   return propagation.extract(api.context.active(), {}, headerGetter);
 }
-

src/lambda-wrapper.ts

@@ -68,6 +68,10 @@ declare const global : {
 }
 
 
-global['baselimeLambdaFlush'] = () => {
-	provider.forceFlush();
+global['baselimeLambdaFlush'] = async () => {
+	try {
+		await provider.forceFlush();
+	} catch(e) {
+		console.log(e)
+	}
 };