From 9e3191dabde613fda9667f90ec55a42e1bff51f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?=
 <dominique.eiflaender@knecon.com>
Date: Tue, 12 Dec 2023 15:05:18 +0100
Subject: [PATCH] RED-5223: Fixed not working tracing when comes from queue,
 upgraded ocr service

---
 .../persistence-service-processor-v1/build.gradle.kts      | 2 +-
 .../management/v1/processor/service/FileStatusService.java | 3 ++-
 .../red/service/peristence/v1/server/Application.java      | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
index 9ddc51767..a8c6ea634 100644
--- a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
+++ b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     api("com.knecon.fforesight:layoutparser-service-internal-api:0.74.0")
     api("com.iqser.red.service:search-service-api-v1:2.71.0")
     api("com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:0.4.0")
-    api("com.iqser.red.service:ocr-service-api-v1:3.10.0")
+    api("com.knecon.fforesight.service:ocr-service-api:4.5.0")
     api("org.springframework.security:spring-security-acl:6.0.2")
     api("org.springframework.boot:spring-boot-starter-mail:${springBootStarterVersion}")
     api("org.springframework.boot:spring-boot-starter-data-jpa:${springBootStarterVersion}")
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
index 7b2fcd128..46e66825f 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
@@ -47,6 +47,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ProcessingStatus;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
 import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
+import com.knecon.fforesight.service.ocr.v1.api.model.DocumentRequest;
 
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
@@ -415,7 +416,7 @@ public class FileStatusService {
 
     private void addToOcrQueue(String dossierId, String fileId, int priority) {
 
-        rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_QUEUE, new com.iqser.red.service.ocr.v1.api.model.DocumentRequest(dossierId, fileId), message -> {
+        rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_QUEUE, new DocumentRequest(dossierId, fileId), message -> {
             message.getMessageProperties().setPriority(priority);
             return message;
         });
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/Application.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/Application.java
index accf2aff2..f8926aab3 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/Application.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/Application.java
@@ -3,6 +3,7 @@ package com.iqser.red.service.peristence.v1.server;
 import java.util.Map;
 import java.util.Optional;
 
+import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
@@ -55,6 +56,7 @@ import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.observation.ObservationRegistry;
 import lombok.extern.slf4j.Slf4j;
+import com.knecon.fforesight.tenantcommons.SimpleMessageListenerContainerCustomizer;
 
 @Slf4j
 @EnableAsync
@@ -85,6 +87,11 @@ public class Application implements ApplicationContextAware {
     }
 
 
+    @Bean
+    public SimpleMessageListenerContainerCustomizer messageListenerContainerCustomizer(){
+       return simpleMessageListenerContainer -> simpleMessageListenerContainer.setObservationEnabled(true);
+    }
+
     @Bean
     @ConditionalOnProperty(value = "cors.enabled", havingValue = "true")
     public WebMvcConfigurer corsConfigurer() {
-- 
2.47.2