Merge branch 'RED-10365' into 'master'

RED-10365: update pdftron logic commons to avoid crash for specific file

See merge request fforesight/ocr-service!59

ocr-service-v1/ocr-service-processor/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     api("com.iqser.red.commons:metric-commons:2.1.0")
     api("com.iqser.red.commons:storage-commons:2.45.0")
     api("com.knecon.fforesight:tenant-commons:0.21.0")
+    api("com.knecon.fforesight:lifecycle-commons:0.6.0")
     api("com.pdftron:PDFNet:10.5.0")
     api("org.apache.pdfbox:pdfbox:3.0.0")
     api("org.apache.pdfbox:jbig2-imageio:3.0.4")
@@ -24,7 +25,7 @@ dependencies {
     api("io.github.karols:hocr4j:0.2.0")
     api("com.amazonaws:aws-java-sdk-kms:1.12.440")
     api("com.google.guava:guava:31.1-jre")
-    api("com.iqser.red.commons:pdftron-logic-commons:2.27.0")
+    api("com.iqser.red.commons:pdftron-logic-commons:2.32.0")
     api("com.knecon.fforesight:viewer-doc-processor:0.125.0")
     testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
 }

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/RenderedPageOcrImage.java

@@ -24,7 +24,7 @@ public class RenderedPageOcrImage implements OcrImage {
     public AffineTransform getImageCTM() {
 
         double scalingFactor = calculateScalingFactor();
-        AffineTransform imageToCropBoxScaling = new AffineTransform(scalingFactor, 0, 0, scalingFactor, -pageInformation.minX(), -pageInformation.minY());
+        AffineTransform imageToCropBoxScaling = new AffineTransform(scalingFactor, 0, 0, scalingFactor, 0, 0);
 
         AffineTransform mirrorMatrix = new AffineTransform(1, 0, 0, -1, 0, pageInformation.height());
 

ocr-service-v1/ocr-service-server/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     implementation(project(":ocr-service-processor"))
     implementation(project(":ocr-service-api"))
 
-    implementation("com.knecon.fforesight:tracing-commons:0.5.0")
+    implementation("com.knecon.fforesight:tracing-commons:0.7.0")
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.1.1")
     implementation("org.springframework.boot:spring-boot-starter-amqp:${springBootStarterVersion}")
 
@@ -39,7 +39,7 @@ tasks.named<BootBuildImage>("bootBuildImage") {
 
     environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
     environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")
-    environment.put("BPE_GS_LIB", "/layers/fagiani_apt/apt/usr/share/ghostscript/9.26/Resource/Init/") // set ghostscript lib path
+    environment.put("BPE_GS_LIB", "/layers/fagiani_apt/apt/usr/share/ghostscript/9.55.0/Resource/Init/") // set ghostscript lib path, version in path must match version in Aptfile
     environment.put("BPE_FONTCONFIG_PATH", "/layers/fagiani_apt/apt/etc/fonts/") // set ghostscript fontconfig path
 
     var aptfile = layout.projectDirectory.file("src/main/resources/Aptfile").toString()

ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/Application.java

@@ -6,23 +6,27 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 import com.iqser.red.pdftronlogic.commons.InvisibleElementRemovalService;
 import com.iqser.red.pdftronlogic.commons.WatermarkRemovalService;
+import com.knecon.fforesight.lifecyclecommons.LifecycleAutoconfiguration;
 import com.knecon.fforesight.service.ocr.processor.OcrServiceProcessorConfiguration;
 import com.knecon.fforesight.service.ocr.v1.server.queue.MessagingConfiguration;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration;
+import com.knecon.fforesight.tracing.OpenTelemetryConfig;
 
 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;
 
 @EnableAsync
-@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class})
+@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class, LifecycleAutoconfiguration.class})
 @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
-@Import({MessagingConfiguration.class, StorageAutoConfiguration.class, OcrServiceProcessorConfiguration.class})
+@Import({MessagingConfiguration.class, StorageAutoConfiguration.class, OcrServiceProcessorConfiguration.class, OpenTelemetryConfig.class})
+@EnableAspectJAutoProxy
 public class Application {
 
     /**

ocr-service-v1/ocr-service-server/src/main/resources/Aptfile

@@ -1,5 +1,5 @@
 # you can list packages
-ghostscript
+ghostscript=9.55.0~dfsg1-0ubuntu5.9
 pkg-config
 zip
 unzip
@@ -11,6 +11,7 @@ libk5crypto3
 libkrb5support0
 libkeyutils1
 libkrb5-3
+libbrotli1
 
 # or include links to specific .deb files
 # http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb

ocr-service-v1/ocr-service-server/src/main/resources/application.yml

@@ -12,6 +12,9 @@ project.version: 1.0-SNAPSHOT
 server:
   port: 8080
 
+lifecycle:
+  base-package: com.knecon.fforesight.service.ocr
+
 spring:
   application:
     name: ocr-service

ocr-service-v1/ocr-service-server/src/test/resources/application.yml

@@ -15,3 +15,10 @@ management:
     health.enabled: true
   endpoints.web.exposure.include: prometheus, health, metrics
   metrics.export.prometheus.enabled: true
+  tracing:
+    enabled: ${TRACING_ENABLED:false}
+    sampling:
+      probability: ${TRACING_PROBABILITY:1.0}
+  otlp:
+    tracing:
+      endpoint: ${OTLP_ENDPOINT:http://otel-collector-opentelemetry-collector.otel-collector:4318/v1/traces}

publish-custom-image.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
+
+set -e
+
 dir=${PWD##*/}
+
 gradle assemble
 
 # Get the current Git branch
@@ -11,5 +15,32 @@ commit_hash=$(git rev-parse --short=5 HEAD)
 # Combine branch and commit hash
 buildName="${USER}-${branch}-${commit_hash}"
 
-gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName
-echo "nexus.knecon.com:5001/ff/${dir}-server:$buildName"
+gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${buildName}
+
+newImageName="nexus.knecon.com:5001/ff/ocr-service-server:$buildName"
+
+echo "full image name:"
+echo ${newImageName}
+echo ""
+
+if [ -z "$1" ]; then
+    exit 0
+fi
+
+namespace=${1}
+deployment_name="ocr-service-v1"
+
+echo "deploying to ${namespace}"
+
+oldImageName=$(rancher kubectl -n ${namespace} get deployment ${deployment_name} -o=jsonpath='{.spec.template.spec.containers[*].image}')
+
+if [ "${newImageName}" = "${oldImageName}" ]; then
+    echo "Image tag did not change, redeploying..."
+    rancher kubectl rollout restart deployment ${deployment_name} -n ${namespace}
+else
+    echo "upgrading the image tag..."
+    rancher kubectl set image deployment/${deployment_name} ${deployment_name}=${newImageName} -n ${namespace}
+fi
+rancher kubectl rollout status deployment ${deployment_name} -n ${namespace}
+echo "Built ${deployment_name}:${buildName} and deployed to ${namespace}"
+