DRY: move the error handling to the _run() function

Author: sebsto

Sources/AWSLambdaRuntime/LambdaRuntime+ServiceLifecycle.swift

@@ -18,20 +18,7 @@ import ServiceLifecycle
 extension LambdaRuntime: Service {
     public func run() async throws {
         try await cancelWhenGracefulShutdown {
-            do {
-                try await self._run()
-            } catch {
-                // catch top level errors that have not been handled until now
-                // this avoids the runtime to crash and generate a backtrace
-                self.logger.error("LambdaRuntime.run() failed with error", metadata: ["error": "\(error)"])
-                if let error = error as? LambdaRuntimeError,
-                    error.code != .connectionToControlPlaneLost
-                {
-                    // if the error is a LambdaRuntimeError but not a connection error,
-                    // we rethrow it to preserve existing behaviour
-                    throw error
-                }
-            }
+            try await self._run()
         }
     }
 }

Sources/AWSLambdaRuntime/LambdaRuntime.swift

@@ -59,20 +59,7 @@ public final class LambdaRuntime<Handler>: Sendable where Handler: StreamingLamb
     #if !ServiceLifecycleSupport
     @inlinable
     internal func run() async throws {
-        do {
-            try await _run()
-        } catch {
-            // catch top level errors that have not been handled until now
-            // this avoids the runtime to crash and generate a backtrace
-            self.logger.error("LambdaRuntime.run() failed with error", metadata: ["error": "\(error)"])
-            if let error = error as? LambdaRuntimeError,
-                error.code != .connectionToControlPlaneLost
-            {
-                // if the error is a LambdaRuntimeError but not a connection error,
-                // we rethrow it to preserve existing behaviour
-                throw error
-            }
-        }
+        try await _run()
     }
     #endif
 
@@ -107,6 +94,7 @@ public final class LambdaRuntime<Handler>: Sendable where Handler: StreamingLamb
             let ip = String(ipAndPort[0])
             guard let port = Int(ipAndPort[1]) else { throw LambdaRuntimeError(code: .invalidPort) }
 
+            do {
             try await LambdaRuntimeClient.withRuntimeClient(
                 configuration: .init(ip: ip, port: port),
                 eventLoop: self.eventLoop,
@@ -118,6 +106,18 @@ public final class LambdaRuntime<Handler>: Sendable where Handler: StreamingLamb
                     logger: self.logger
                 )
             }
+        } catch {
+            // catch top level errors that have not been handled until now
+            // this avoids the runtime to crash and generate a backtrace
+            self.logger.error("LambdaRuntime.run() failed with error", metadata: ["error": "\(error)"])
+            if let error = error as? LambdaRuntimeError,
+                error.code != .connectionToControlPlaneLost
+            {
+                // if the error is a LambdaRuntimeError but not a connection error,
+                // we rethrow it to preserve existing behaviour
+                throw error
+            }
+        }
 
         } else {