Merge pull request #5 from itcr-uni-luebeck/gradle-update

Gradle update

Dockerfile

@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:17
+FROM azul/zulu-openjdk-alpine:17
 WORKDIR /app
 ADD . /app
 RUN ./gradlew clean jar

build.gradle

@@ -1,8 +1,4 @@
 buildscript {
-    repositories {
-        jcenter()
-    }
-
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -24,14 +20,12 @@ sourceSets {
 }
 
 repositories {
-    mavenLocal()
-    jcenter()
-    maven { url 'https://kotlin.bintray.com/ktor' }
+    mavenCentral()
 }
 
 dependencies {
     implementation "ch.qos.logback:logback-classic:$logback_version"
-    implementation 'com.beust:klaxon:5.0.1'
+    implementation 'com.beust:klaxon:5.6'
     implementation "com.natpryce:konfig:1.6.10.0"
     implementation "org.jetbrains.kotlinx:kotlinx-cli:0.3.5"
     implementation 'io.ktor:ktor-server-content-negotiation-jvm:2.3.1'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

resources/logback.xml

@@ -4,7 +4,7 @@
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <root level="trace">
+    <root level="info">
         <appender-ref ref="STDOUT"/>
     </root>
     <logger name="org.eclipse.jetty" level="INFO"/>

src/main/kotlin/de/uniluebeck/itcrl/termserverdfnproxy/Application.kt

@@ -33,6 +33,7 @@ import java.io.FileNotFoundException
 import java.security.KeyStore
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import java.util.*
 import javax.net.ssl.SSLContext
 import kotlin.io.path.Path
 import kotlin.io.path.notExists
@@ -180,6 +181,8 @@ fun Application.proxyAppModule() {
     //we intercept all requests (regardless of routing) at the Call state and pass them to the upstream
     intercept(ApplicationCallPipeline.Call) {
 
+        val requestId = UUID.randomUUID().toString()
+
         if (this.context.request.httpMethod == HttpMethod.Options) {
             mainLogger.info("OPTIONS from ${context.request.origin}")
             addCors(call)
@@ -197,14 +200,18 @@ fun Application.proxyAppModule() {
         val requestUri = "$upstreamUri:${configuration[Upstream.port]}/$requestPath".also { mainLogger.info(it) }
         //we need to provide a body for POST, PUT, PATCH, but none otherwise
 
+        val payloadToUpstreamSize = call.request.headers[HttpHeaders.ContentLength]?.toIntOrNull()?.let {
+            "$it bytes payload, "
+        } ?: ""
         mainLogger.info(
             "${call.request.origin.serverHost}:${call.request.origin.serverPort} " +
                     "${LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)} " +
                     "${call.request.httpMethod.value} " +
                     "\"${call.request.uri}\" " +
-                    "${call.request.headers[HttpHeaders.ContentLength] ?: 0} bytes, " +
+                    payloadToUpstreamSize +
                     "${call.request.headers[HttpHeaders.ContentType] ?: "-"} " +
-                    "\"${call.request.headers[HttpHeaders.UserAgent]}\""
+                    "\"${call.request.headers[HttpHeaders.UserAgent]}\"" +
+                    "; request-id $requestId"
         )
 
         var proxyResponse: HttpResponse
@@ -230,16 +237,19 @@ fun Application.proxyAppModule() {
                     }
                 }
             }
-            mainLogger.debug(
-                "proxyRequest to {}, {}, status {}",
-                requestUri,
-                call.request.httpMethod.value,
-                proxyResponse.status
-            )
             proxiedHeaders = proxyResponse.headers
             location = proxiedHeaders[HttpHeaders.Location]
             contentType = proxiedHeaders[HttpHeaders.ContentType]
             contentLength = proxiedHeaders[HttpHeaders.ContentLength]
+            mainLogger.info(
+                "status {}, method {}, request-uri {}, content-length {} bytes (body-size {}b); request-id {}",
+                proxyResponse.status.value,
+                call.request.httpMethod.value,
+                requestUri,
+                contentLength,
+                proxyResponse.bodyAsChannel().toByteArray().size,
+                requestId
+            )
         }
 
         //check if the status code indicates that the server handled the request correctly. This does not 404s,