reorder and add additional logging data to custom runtime demo

Author: julianwood

custom-runtime-extension-demo/extensionssrc/extensions/extension1.sh

@@ -25,21 +25,20 @@ forward_sigterm_and_wait() {
 
 # Registration
 HEADERS="$(mktemp)"
-echo "[${LAMBDA_EXTENSION_NAME}] Registering..."
-sleep 1
+echo "[${LAMBDA_EXTENSION_NAME}] Registering at http://${AWS_LAMBDA_RUNTIME_API}/2020-01-01/extension/register"
   curl -sS -LD "$HEADERS" -XPOST "http://${AWS_LAMBDA_RUNTIME_API}/2020-01-01/extension/register" --header "Lambda-Extension-Name: ${LAMBDA_EXTENSION_NAME}" -d "{ \"events\": [\"INVOKE\", \"SHUTDOWN\"]}" > $TMPFILE
 
 RESPONSE=$(<$TMPFILE)
 HEADINFO=$(<$HEADERS)
-echo "[${LAMBDA_EXTENSION_NAME}] Register response: ${RESPONSE}"
-sleep 1
 # Extract Extension ID from response headers
 EXTENSION_ID=$(grep -Fi Lambda-Extension-Identifier "$HEADERS" | tr -d '[:space:]' | cut -d: -f2)
+echo "[${LAMBDA_EXTENSION_NAME}] Registration response: ${RESPONSE} with EXTENSION_ID $(grep -Fi Lambda-Extension-Identifier "$HEADERS" | tr -d '[:space:]' | cut -d: -f2)"
+
 
 # Event processing
 while true
 do
-  echo "[${LAMBDA_EXTENSION_NAME}] Waiting for event..."
+  echo "[${LAMBDA_EXTENSION_NAME}] Waiting for event. Get /next event from http://${AWS_LAMBDA_RUNTIME_API}/2020-01-01/extension/event/next"
 
   # Get an event. The HTTP request will block until one is received
   curl -sS -L -XGET "http://${AWS_LAMBDA_RUNTIME_API}/2020-01-01/extension/event/next" --header "Lambda-Extension-Identifier: ${EXTENSION_ID}" > $TMPFILE &

custom-runtime-extension-demo/extensionssrc/extensions/extension2.sh

@@ -25,21 +25,20 @@ forward_sigterm_and_wait() {
 
 # Registration
 HEADERS="$(mktemp)"
-echo "[${LAMBDA_EXTENSION_NAME}] Registering..."
-sleep 1
+echo "[${LAMBDA_EXTENSION_NAME}] Registering at http://${AWS_LAMBDA_RUNTIME_API}/2020-01-01/extension/register"
   curl -sS -LD "$HEADERS" -XPOST "http://${AWS_LAMBDA_RUNTIME_API}/2020-01-01/extension/register" --header "Lambda-Extension-Name: ${LAMBDA_EXTENSION_NAME}" -d "{ \"events\": [\"INVOKE\", \"SHUTDOWN\"]}" > $TMPFILE
 
 RESPONSE=$(<$TMPFILE)
 HEADINFO=$(<$HEADERS)
-echo "[${LAMBDA_EXTENSION_NAME}] Register response: ${RESPONSE}"
-sleep 1
 # Extract Extension ID from response headers
 EXTENSION_ID=$(grep -Fi Lambda-Extension-Identifier "$HEADERS" | tr -d '[:space:]' | cut -d: -f2)
+echo "[${LAMBDA_EXTENSION_NAME}] Registration response: ${RESPONSE} with EXTENSION_ID $(grep -Fi Lambda-Extension-Identifier "$HEADERS" | tr -d '[:space:]' | cut -d: -f2)"
+
 
 # Event processing
 while true
 do
-  echo "[${LAMBDA_EXTENSION_NAME}] Waiting for event..."
+  echo "[${LAMBDA_EXTENSION_NAME}] Waiting for event. Get /next event from http://${AWS_LAMBDA_RUNTIME_API}/2020-01-01/extension/event/next"
 
   # Get an event. The HTTP request will block until one is received
   curl -sS -L -XGET "http://${AWS_LAMBDA_RUNTIME_API}/2020-01-01/extension/event/next" --header "Lambda-Extension-Identifier: ${EXTENSION_ID}" > $TMPFILE &

custom-runtime-extension-demo/functionsrc/function.sh

@@ -1,9 +1,12 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: MIT-0
 
+echo "[function] Running init code outside handler"
+
 function handler () {
   EVENT_DATA=$1
-  echo "[function] Receiving invocation: '$EVENT_DATA'"
+  echo "[function] handler receiving invocation: '$EVENT_DATA'"
+  sleep 1
   RESPONSE="Echoing request: '$EVENT_DATA'"
   echo $RESPONSE
 }

custom-runtime-extension-demo/runtime/bootstrap

@@ -22,15 +22,16 @@ forward_sigterm_and_wait() {
   trap - SIGTERM
 }
 
-# Initialization - load function handler
-source $LAMBDA_TASK_ROOT/"$(echo $_HANDLER | cut -d. -f1).sh"
-
 echo "[runtime] Initializing..."
 
+# Initialization - load function 
+echo "[runtime] Load function from $LAMBDA_TASK_ROOT/$(echo $_HANDLER | cut -d. -f1).sh"
+source $LAMBDA_TASK_ROOT/"$(echo $_HANDLER | cut -d. -f1).sh"
+
 # Processing
 while true
 do
-  echo "[runtime] Waiting for invocation..."
+  echo "[runtime] Waiting for invocation, Get /next event from http://${AWS_LAMBDA_RUNTIME_API}/2018-06-01/runtime/invocation/next"
 
   HEADERS="$(mktemp)"
 
@@ -46,12 +47,12 @@ do
   # Extract request ID by scraping response headers received above
   REQUEST_ID=$(grep -Fi Lambda-Runtime-Aws-Request-Id "$HEADERS" | tr -d '[:space:]' | cut -d: -f2)
 
-  echo "[runtime] Executing function: $_HANDLER"
+  echo "[runtime] Executing function handler: $_HANDLER"
 
   # Execute the handler function from the script
-  RESPONSE=$($(echo "$_HANDLER" | cut -d. -f2) "$EVENT_DATA")
-
-  echo "[runtime] Sending invocation response: $RESPONSE"
+    RESPONSE=$($(echo "$_HANDLER" | cut -d. -f2) "$EVENT_DATA")
+  sleep 1
+  echo "[runtime] Sending invocation response: $RESPONSE to http://${AWS_LAMBDA_RUNTIME_API}/2018-06-01/runtime/invocation/$REQUEST_ID/response"
 
   # Send the response
   curl -sS -X POST "http://${AWS_LAMBDA_RUNTIME_API}/2018-06-01/runtime/invocation/$REQUEST_ID/response"  -d "$RESPONSE" > $TMPFILE