From 821ef265fe5d896205edc4a8f86b2fdbcd6859e3 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Wed, 15 May 2024 10:40:31 +0300 Subject: [PATCH] RED-9157 - Update tracing --- ocr-service-v1/ocr-service-server/build.gradle.kts | 2 +- .../fforesight/service/ocr/v1/server/Application.java | 3 ++- .../ocr-service-server/src/test/resources/application.yml | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ocr-service-v1/ocr-service-server/build.gradle.kts b/ocr-service-v1/ocr-service-server/build.gradle.kts index 4e9f89a..a7ba1d5 100644 --- a/ocr-service-v1/ocr-service-server/build.gradle.kts +++ b/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}") diff --git a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/Application.java b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/Application.java index 41c6259..9998824 100644 --- a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/Application.java +++ b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/Application.java @@ -15,6 +15,7 @@ import com.knecon.fforesight.service.ocr.processor.OcrServiceProcessorConfigurat 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; @@ -22,7 +23,7 @@ import io.micrometer.core.instrument.MeterRegistry; @EnableAsync @ImportAutoConfiguration({MultiTenancyAutoConfiguration.class}) @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class}) -@Import({MessagingConfiguration.class, StorageAutoConfiguration.class, OcrServiceProcessorConfiguration.class}) +@Import({MessagingConfiguration.class, StorageAutoConfiguration.class, OcrServiceProcessorConfiguration.class, OpenTelemetryConfig.class}) public class Application { /** diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/application.yml b/ocr-service-v1/ocr-service-server/src/test/resources/application.yml index f724bd2..e9992bc 100644 --- a/ocr-service-v1/ocr-service-server/src/test/resources/application.yml +++ b/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} \ No newline at end of file