Merge pull request #39 from hayd/xray

Propagate the tracing header

hello.ts

@@ -10,6 +10,7 @@ export async function handler(
 ): Promise<APIGatewayProxyResult> {
   return {
     statusCode: 200,
+    headers: { "content-type": "text/html;charset=utf8" },
     body: `Welcome to deno ${Deno.version.deno} 🦕`
   };
 }

runtime/bootstrap

@@ -93,14 +93,16 @@ function investigate {
 echo "
 import { $HANDLER_NAME } from '$LAMBDA_TASK_ROOT/$HANDLER_FILE';
 const INVOCATION = '${API_ROOT}invocation/';
-function tryParse(headers, headerName) {
+
+function maybeJson(headers, headerName) {
   const json = headers.get(headerName);
   if (json) {
     try {
-      return JSON.parse(json)
+      return JSON.parse(json);
     } catch (e) {
       console.error(
-        'Unable to parse header \'' + headerName + '\' value as JSON: ' + json)
+        'Unable to parse header', headerName, 'value as JSON:', json
+      );
     }
   }
 }
@@ -109,6 +111,7 @@ while (true) {
   const next = await fetch(INVOCATION + 'next');
   const headers = next.headers;
   const reqId = headers.get('lambda-runtime-aws-request-id');
+  Deno.env()._X_AMZN_TRACE_ID = headers.get('lambda-runtime-trace-id') || '';
   const context = {
     functionName: '$AWS_LAMBDA_FUNCTION_NAME',
     functionVersion: '$AWS_LAMBDA_FUNCTION_VERSION',
@@ -117,12 +120,12 @@ while (true) {
     awsRequestId: headers.get('lambda-runtime-aws-request-id'),
     logGroupName: '$AWS_LAMBDA_LOG_GROUP_NAME',
     logStreamName: '$AWS_LAMBDA_LOG_STREAM_NAME',
-    identity: tryParse(headers, 'lambda-runtime-cognito-identity'),
-    clientContext: tryParse(headers, 'lambda-runtime-client-context'),
+    identity: maybeJson(headers, 'lambda-runtime-cognito-identity'),
+    clientContext: maybeJson(headers, 'lambda-runtime-client-context'),
     getRemainingTimeInMillis: function() {
       return Number(headers.get('lambda-runtime-deadline-ms')) - Date.now();
     },
-    // FIXME: we add these for type compatibility with Definitely Typed.
+    // NOTE: we add these for type compatibility with Definitely Typed.
     callbackWaitsForEmptyEventLoop: undefined,
     done: undefined,
     fail: undefined,

tests/handlers.ts

@@ -45,3 +45,7 @@ export async function noArgs() {
 export async function wrongArgs(a: number, b: number, c: number) {
   return { result: a * b * c };
 }
+
+export async function xray(event, context) {
+  return { "_X_AMZN_TRACE_ID": Deno.env("_X_AMZN_TRACE_ID") }
+}

tests/server.ts

@@ -67,7 +67,10 @@ export async function serveEvents(testJson) {
         });
         if (testJson.headers) {
           for (let [k, v] of Object.entries(testJson.headers)) {
-            headers.append(k, JSON.stringify(v));
+            if (Object.prototype.toString.call(v) !== "[object String]") {
+              v = JSON.stringify(v);
+            }
+            headers.append(k, v.toString());
           }
         }
         await req.respond({

tests/test_bundle.json

@@ -7,11 +7,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.29.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.29.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.29.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.29.0 🦕\"}"
     }
   ],
   "files": ["hello.bundle.js"],

tests/test_example_zip.json

@@ -4,11 +4,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.29.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.29.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.29.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.29.0 🦕\"}"
     }
   ],
   "files": "deno-lambda-example.zip",

tests/test_self_contained.json

@@ -4,11 +4,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.29.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.29.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.29.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.29.0 🦕\"}"
     }
   ],
   "files": ["hello.ts", "bootstrap", "amz-deno"]

tests/test_simple.json

@@ -4,11 +4,11 @@
   "expected": [
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.29.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.29.0 🦕\"}"
     },
     {
       "status": "ok",
-      "content": "{\"statusCode\":200,\"body\":\"Welcome to deno 0.29.0 🦕\"}"
+      "content": "{\"statusCode\":200,\"headers\":{\"content-type\":\"text/html;charset=utf8\"},\"body\":\"Welcome to deno 0.29.0 🦕\"}"
     }
   ],
   "files": ["hello.ts"],

tests/test_xray.json

@@ -0,0 +1,15 @@
+{
+  "env": { "_HANDLER": "handlers.xray" },
+  "events": [{ "hello": "deno" }],
+  "expected": [
+    {
+      "status": "ok",
+      "content": "{\"_X_AMZN_TRACE_ID\":\"Root=1-5759e988-bd862e3fe1be46a994272793;Sampled=1\"}"
+    }
+  ],
+  "files": ["handlers.ts"],
+  "layer": "deno-lambda-layer.zip",
+  "headers": {
+    "Lambda-Runtime-Trace-Id": "Root=1-5759e988-bd862e3fe1be46a994272793;Sampled=1"
+  }
+}