Curl engine impl (#2)

Curl engine shows better performance over CIO

Author: trueangle

.github/workflows/buildLinuxArm64.yml

@@ -1,10 +1,10 @@
-name: Build Linux64
+name: Build Linux64 curl-engine-branch
 on:
   workflow_dispatch:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -15,13 +15,15 @@ jobs:
           java-version: 17
 
       - name: Install libcurl
-        run: apt-get install libcurl4-gnutls-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install libcurl3-dev
 
       - name: Run build
         run: ./gradlew build
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: kotlin-native-arm-build
-          path: sample/build/bin/linuxArm64/releaseExecutable
+          name: kotlin-native-build
+          path: sample/build/bin

gradle.properties

@@ -4,4 +4,6 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 
 #Ktor
-io.ktor.development=true
+io.ktor.development=true
+
+#kotlin.native.cacheKind.linuxX64=none

lambda-runtime/build.gradle.kts

@@ -13,7 +13,8 @@ kotlin {
             implementation(libs.kotlin.serialization.json)
             implementation(libs.kotlin.io.core)
             implementation(libs.kotlin.date.time)
-            implementation(libs.ktor.client.cio)
+            //implementation(libs.ktor.client.cio)
+            implementation(libs.ktor.client.curl)
             implementation(libs.ktor.client.logging)
             implementation(libs.ktor.content.negotiation)
             implementation(libs.ktor.content.json)

lambda-runtime/src/commonMain/kotlin/io/github/trueangle/knative/lambda/runtime/LambdaRuntime.kt

@@ -9,10 +9,9 @@ import io.github.trueangle.knative.lambda.runtime.handler.LambdaStreamHandler
 import io.github.trueangle.knative.lambda.runtime.log.Log
 import io.github.trueangle.knative.lambda.runtime.log.LogLevel
 import io.ktor.client.HttpClient
-import io.ktor.client.engine.cio.CIO
+import io.ktor.client.engine.curl.Curl
 import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.client.plugins.logging.LogLevel as KtorLogLevel
 import io.ktor.client.plugins.logging.Logger
 import io.ktor.client.plugins.logging.Logging
 import io.ktor.http.content.OutgoingContent.WriteChannelContent
@@ -24,9 +23,11 @@ import io.ktor.utils.io.writeStringUtf8
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 import kotlin.system.exitProcess
+import kotlin.time.TimeSource
+import io.ktor.client.plugins.logging.LogLevel as KtorLogLevel
 
 object LambdaRuntime {
-    private val httpClient = HttpClient(CIO) {
+    private val httpClient = HttpClient(Curl) {
         install(HttpTimeout)
         install(ContentNegotiation) {
             json(Json { explicitNulls = false })
@@ -72,6 +73,7 @@ object LambdaRuntime {
                 } else {
                     handler as LambdaBufferedHandler<I, O>
                     val response = bufferedResponse(context) { handler.handleRequest(event, context) }
+
                     client.sendResponse(context, response, outputTypeInfo)
                 }
             } catch (e: LambdaRuntimeException) {

lambda-runtime/src/commonMain/kotlin/io/github/trueangle/knative/lambda/runtime/api/LambdaRuntimeClient.kt

@@ -24,6 +24,7 @@ import io.ktor.http.contentType
 import io.ktor.util.reflect.TypeInfo
 import kotlinx.serialization.json.Json
 import kotlin.time.Duration.Companion.minutes
+import kotlin.time.TimeSource
 import io.ktor.http.ContentType.Application.Json as ContentTypeJson
 
 @PublishedApi
@@ -37,7 +38,6 @@ internal class LambdaClient(private val httpClient: HttpClient) {
                 requestTimeoutMillis = 60 * 1000 * 30 // todo
             }
         }
-
         val context = contextFromResponseHeaders(response)
         val body = try {
             response.body(bodyType) as T
@@ -49,7 +49,7 @@ internal class LambdaClient(private val httpClient: HttpClient) {
     }
 
     suspend fun <T> sendResponse(event: Context, body: T, bodyType: TypeInfo): HttpResponse {
-        Log.trace("sendResponse from handler: $body")
+        Log.trace("Response from handler: $body")
 
         val response = httpClient.post {
             url("${invokeUrl}/invocation/${event.awsRequestId}/response")

sample/build.gradle.kts

@@ -8,9 +8,11 @@ kotlin {
     val isArm64 = System.getProperty("os.arch") == "aarch64"
     val nativeTarget = if (isArm64) linuxArm64() else linuxX64()
 
-    nativeTarget.binaries {
-        executable {
-            entryPoint = "com.github.trueangle.knative.lambda.runtime.sample.main"
+    nativeTarget.apply {
+        binaries {
+            executable {
+                entryPoint = "com.github.trueangle.knative.lambda.runtime.sample.main"
+            }
         }
     }
 

sample/src/nativeInterop/cinterop/libcurl.def

@@ -0,0 +1,6 @@
+package = libcurl
+headers = curl/curl.h
+headerFilter = curl/*
+
+#compilerOpts.linux = -I/opt/homebrew/Cellar/curl/8.9.1/include
+#linkerOpts.linux = -L/opt/homebrew/Cellar/curl/8.9.1/lib -lcurl

sample/src/nativeMain/kotlin/com/github/trueangle/knative/lambda/runtime/sample/main.kt

@@ -1,6 +1,6 @@
 package com.github.trueangle.knative.lambda.runtime.sample
 
-import com.github.trueangle.knative.lambda.runtime.sample.handler.ObjectBodyLambdaHandler
+import com.github.trueangle.knative.lambda.runtime.sample.handler.StringBodyLambdaHandler
 import io.github.trueangle.knative.lambda.runtime.LambdaRuntime
 
-fun main() = LambdaRuntime.run { ObjectBodyLambdaHandler() }
+fun main() = LambdaRuntime.run { StringBodyLambdaHandler() }