Updated header values for provided runtime (awslabs#2)

* Updated header values for provided runtime and switched to ms time remaining

* Fixed issue with deadline not being set in context and switched to realtime clock to get correct epoch

Author: sapessi

lambda-runtime-client/src/client.rs

@@ -34,12 +34,12 @@ pub enum LambdaHeaders {
 impl fmt::Display for LambdaHeaders {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            LambdaHeaders::RequestId => write!(f, "X-Amz-Aws-Request-Id"),
-            LambdaHeaders::FunctionArn => write!(f, "X-Amz-Invoked-Function-Arn"),
-            LambdaHeaders::TraceId => write!(f, "X-Amzn-Trace-Id"),
-            LambdaHeaders::Deadline => write!(f, "X-Amz-Deadline-Ns"),
-            LambdaHeaders::ClientContext => write!(f, "X-Amz-Client-Context"),
-            LambdaHeaders::CognitoIdentity => write!(f, "X-Amz-Cognito-Identity"),
+            LambdaHeaders::RequestId => write!(f, "Lambda-Runtime-Aws-Request-Id"),
+            LambdaHeaders::FunctionArn => write!(f, "Lambda-Runtime-Invoked-Function-Arn"),
+            LambdaHeaders::TraceId => write!(f, "Lambda-Runtime-Trace-Id"),
+            LambdaHeaders::Deadline => write!(f, "Lambda-Runtime-Deadline-Ms"),
+            LambdaHeaders::ClientContext => write!(f, "Lambda-Runtime-Client-Context"),
+            LambdaHeaders::CognitoIdentity => write!(f, "Lambda-Runtime-Cognito-Identity"),
         }
     }
 }

lambda-runtime/src/context.rs

@@ -100,8 +100,8 @@ impl Context {
 
     /// Returns the remaining time in the execution in milliseconds. This is based on the
     /// deadline header passed by Lambda's Runtime APIs.
-    pub fn get_time_remaining_mills(&self) -> u128 {
-        (self.deadline - systime::get_time_ns()) / 1000 / 1000
+    pub fn get_time_remaining_millis(&self) -> u128 {
+        self.deadline - systime::get_time_ms()
     }
 }
 
@@ -112,17 +112,17 @@ mod systime {
     use libc;
 
     #[cfg(any(target_os = "macos", target_os = "ios"))]
-    pub(super) fn get_time_ns() -> u128 {
-        unsafe { u128::from(libc::mach_absolute_time()) }
+    pub(super) fn get_time_ms() -> u128 {
+        unsafe { u128::from(libc::mach_absolute_time()) / 1_000_000 }
     }
 
     #[cfg(not(any(windows, target_os = "macos", target_os = "ios")))]
-    pub(super) fn get_time_ns() -> u128 {
+    pub(super) fn get_time_ms() -> u128 {
         let mut ts = libc::timespec { tv_sec: 0, tv_nsec: 0 };
         unsafe {
-            libc::clock_gettime(libc::CLOCK_MONOTONIC, &mut ts);
+            libc::clock_gettime(libc::CLOCK_REALTIME, &mut ts);
         }
-        return (ts.tv_sec as u128) * 1000000000 + (ts.tv_nsec as u128);
+        return ((ts.tv_sec as u128) * 1_000) + ((ts.tv_nsec as u128) / 1_000_000);
     }
 }
 
@@ -133,7 +133,7 @@ pub(crate) mod tests {
     use std::{thread::sleep, time};
 
     fn get_deadline(secs: u8) -> u128 {
-        systime::get_time_ns() + (u128::from(secs) * 1000 * 1000 * 1000)
+        systime::get_time_ms() + (u128::from(secs) * 1_000)
     }
 
     pub(crate) fn test_context(deadline: u8) -> Context {
@@ -160,7 +160,7 @@ pub(crate) mod tests {
         println!("Set deadline to: {}", ctx.deadline);
         sleep(time::Duration::new(2, 0));
 
-        let remaining = ctx.get_time_remaining_mills();
+        let remaining = ctx.get_time_remaining_millis();
         assert!(
             remaining > 7800 && remaining < 8200,
             "Remaining time in millis outside the expected range: {}",

lambda-runtime/src/runtime.rs

@@ -259,6 +259,7 @@ where
                         handler_ctx.xray_trace_id = invocation_ctx.xray_trace_id;
                         handler_ctx.client_context = invocation_ctx.client_context;
                         handler_ctx.identity = invocation_ctx.identity;
+                        handler_ctx.deadline = invocation_ctx.deadline;
 
                         (ev, handler_ctx)
                     }
@@ -304,7 +305,8 @@ pub(crate) mod tests {
                 .get_runtime_api_endpoint()
                 .expect("Could not get runtime endpoint"),
             None,
-        ).expect("Could not initialize client");
+        )
+        .expect("Could not initialize client");
         let handler = |_e: String, _c: context::Context| -> Result<String, HandlerError> { Ok("hello".to_string()) };
         let retries: i8 = 3;
         let runtime = Runtime::new(