New runtime works on happy path

Author: fabianfett

Sources/AWSLambdaRuntimeCore/Lambda+LocalServer.swift

@@ -131,7 +131,7 @@ private enum LocalLambda {
                 guard let work = request.body else {
                     return self.writeResponse(context: context, response: .init(status: .badRequest))
                 }
-                let requestID = "\(DispatchTime.now().uptimeNanoseconds)" // FIXME:
+                let requestID = LambdaRequestID().lowercased
                 let promise = context.eventLoop.makePromise(of: Response.self)
                 promise.futureResult.whenComplete { result in
                     switch result {

Sources/AWSLambdaRuntimeCore/Lambda.swift

@@ -89,7 +89,7 @@ public enum Lambda {
             return _run(configuration)
         }
         #else
-        return _run(configuration, factory)
+        return _run(configuration)
         #endif
     }
 }

Sources/AWSLambdaRuntimeCore/LambdaHandler.swift

@@ -201,7 +201,27 @@ extension ByteBufferLambdaHandler {
     /// The lambda runtime provides a default implementation of the method that manages the launch
     /// process.
     public static func main() {
+        #if false
         _ = Lambda.run(configuration: .init(), handlerType: Self.self)
+        #else
+
+        #if DEBUG
+        if Lambda.env("LOCAL_LAMBDA_SERVER_ENABLED").flatMap(Bool.init) ?? false {
+            do {
+                return try Lambda.withLocalServer {
+                    NewLambdaRuntime.run(handlerType: Self.self)
+                }
+            } catch {
+                print(error)
+                exit(1)
+            }
+        } else {
+            NewLambdaRuntime.run(handlerType: Self.self)
+        }
+        #else
+        NewLambdaRuntime.run(handlerType: Self.self)
+        #endif
+        #endif
     }
 }
 

Sources/AWSLambdaRuntimeCore/LambdaRequestID.swift

@@ -64,11 +64,6 @@ struct LambdaRequestID {
 
     private let _uuid: uuid_t
 
-    /// Returns a string representation for the `LambdaRequestID`, such as "E621E1F8-C36C-495A-93FC-0C247A3E6E5F"
-    var uuidString: String {
-        self.uppercased
-    }
-
     /// Returns a lowercase string representation for the `LambdaRequestID`, such as "e621e1f8-c36c-495a-93fc-0c247a3e6e5f"
     var lowercased: String {
         var bytes = self.toAsciiBytesOnStack(characters: Self.lowercaseLookup)
@@ -144,13 +139,13 @@ extension LambdaRequestID: Hashable {
 
 extension LambdaRequestID: CustomStringConvertible {
     var description: String {
-        self.uuidString
+        self.lowercased
     }
 }
 
 extension LambdaRequestID: CustomDebugStringConvertible {
     var debugDescription: String {
-        self.uuidString
+        self.lowercased
     }
 }
 
@@ -170,7 +165,7 @@ extension LambdaRequestID: Decodable {
 extension LambdaRequestID: Encodable {
     func encode(to encoder: Encoder) throws {
         var container = encoder.singleValueContainer()
-        try container.encode(self.uuidString)
+        try container.encode(self.lowercased)
     }
 }
 
@@ -340,7 +335,7 @@ extension ByteBuffer {
 
     @discardableResult
     mutating func setRequestID(_ requestID: LambdaRequestID, at index: Int) -> Int {
-        var localBytes = requestID.toAsciiBytesOnStack(characters: LambdaRequestID.uppercaseLookup)
+        var localBytes = requestID.toAsciiBytesOnStack(characters: LambdaRequestID.lowercaseLookup)
         return withUnsafeBytes(of: &localBytes) {
             self.setBytes($0, at: index)
         }

Sources/AWSLambdaRuntimeCore/NewLambdaChannelHandler.swift

@@ -61,7 +61,8 @@ final class NewLambdaChannelHandler<Delegate: LambdaChannelHandlerDelegate>: Cha
 
     func channelRead(context: ChannelHandlerContext, data: NIOAny) {
         do {
-            try self.decoder.process(buffer: self.unwrapInboundIn(data)) { response in
+            let buffer = self.unwrapInboundIn(data)
+            try self.decoder.process(buffer: buffer) { response in
                 guard self.requestsInFlight.popFirst() != nil else {
                     throw LambdaRuntimeError.unsolicitedResponse
                 }

Sources/AWSLambdaRuntimeCore/NewLambdaRuntime.swift

@@ -18,6 +18,10 @@ import NIOCore
 import NIOPosix
 import Backtrace
 
+#if canImport(Glibc)
+import Glibc
+#endif
+
 /// `LambdaRuntime` manages the Lambda process lifecycle.
 ///
 /// - note: All state changes are dispatched onto the supplied EventLoop.
@@ -134,6 +138,7 @@ public final class NewLambdaRuntime<Handler: ByteBufferLambdaHandler> {
             }
 
         case .invokeHandler(let handler, let invocation, let event):
+            self.logger.trace("invoking handler")
             let context = LambdaContext(
                 logger: self.logger,
                 eventLoop: self.eventLoop,
@@ -149,15 +154,22 @@ public final class NewLambdaRuntime<Handler: ByteBufferLambdaHandler> {
             self.shutdownPromise.fail(error)
 
         case .requestNextInvocation(let handler, let startPromise):
+            self.logger.trace("requesting next invocation")
             handler.sendRequest(.next)
             startPromise?.succeed(())
 
         case .reportInvocationResult(let requestID, let result, let pipelineNextInvocationRequest, let handler):
             switch result {
             case .success(let body):
+                self.logger.trace("reporting invocation success", metadata: [
+                    "lambda-request-id": "\(requestID)"
+                ])
                 handler.sendRequest(.invocationResponse(requestID, body))
 
             case .failure(let error):
+                self.logger.trace("reporting invocation failure", metadata: [
+                    "lambda-request-id": "\(requestID)"
+                ])
                 let errorString = String(describing: error)
                 let errorResponse = ErrorResponse(errorType: errorString, errorMessage: errorString)
                 handler.sendRequest(.invocationError(requestID, errorResponse))
@@ -262,7 +274,14 @@ extension NewLambdaRuntime {
         logger.logLevel = configuration.general.logLevel
 
         MultiThreadedEventLoopGroup.withCurrentThreadAsEventLoop { eventLoop in
-            let runtime = NewLambdaRuntime<Handler>(eventLoop: eventLoop, logger: logger, configuration: configuration, handlerType: Handler.self)
+            let runtime = NewLambdaRuntime(
+                eventLoop: eventLoop,
+                logger: logger,
+                configuration: configuration,
+                handlerType: Handler.self
+            )
+
+            logger.info("lambda runtime starting with \(configuration)")
 
             #if DEBUG
             let signalSource = trap(signal: configuration.lifecycle.stopSignal) { signal in