Skip to content

Commit

Permalink
feat: Add otel cfg
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincenzo Ingenito authored and Vincenzo Ingenito committed Mar 13, 2024
1 parent 3913402 commit d3767ea
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 45 deletions.
27 changes: 25 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,24 @@

<!-- TRACING -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-sleuth</artifactId>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-sleuth</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-brave</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
</dependency>
<!-- Dipendenze per OpenTelemetry -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>1.0.1</version>
</dependency>

<!-- PDF -->
Expand Down Expand Up @@ -188,6 +204,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
<version>1.1.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
42 changes: 26 additions & 16 deletions .../finanze/sanita/fse2/ms/gtw/dispatcher/controller/handler/ControllerExceptionHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@
*/
package it.finanze.sanita.fse2.ms.gtw.dispatcher.controller.handler;

import brave.Tracer;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response.ErrorResponseDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response.LogTraceInfoDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response.ValidationErrorResponseDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.ErrorInstanceEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.RestExecutionResultEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.*;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.utility.StringUtility;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
Expand All @@ -32,18 +23,36 @@
import org.springframework.web.multipart.support.MissingServletRequestPartException;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;

import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response.ErrorResponseDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response.LogTraceInfoDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response.ValidationErrorResponseDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.ErrorInstanceEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.RestExecutionResultEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.BusinessException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.ConnectionRefusedException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.EdsException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.IniException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.MockEnabledException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.NoRecordFoundException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.ServerResponseException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.ValidationErrorException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.ValidationException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.ValidationPublicationErrorException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.utility.StringUtility;
import lombok.extern.slf4j.Slf4j;

/**
* Exceptions Handler.
*/
@ControllerAdvice
@Slf4j
public class ControllerExceptionHandler extends ResponseEntityExceptionHandler {

/**
* Tracker log.
*/
@Autowired
private Tracer tracer;
// /**
// * Tracker log.
// */
// @Autowired
// private Tracer tracer;

/**
* Management validation exception.
Expand Down Expand Up @@ -268,8 +277,9 @@ protected ResponseEntity<ErrorResponseDTO> handleValidationException(final Valid

private LogTraceInfoDTO getLogTraceInfo() {
return new LogTraceInfoDTO(
tracer.currentSpan().context().spanIdString(),
tracer.currentSpan().context().traceIdString());
"","");
// tracer.currentSpan().context().spanIdString(),
// tracer.currentSpan().context().traceIdString());
}

/**
Expand Down
90 changes: 63 additions & 27 deletions src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/controller/impl/AbstractCTL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,26 @@
*/
package it.finanze.sanita.fse2.ms.gtw.dispatcher.controller.impl;

import brave.Tracer;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Base64;
import java.util.List;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;

import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.parser.Parser;
import org.jsoup.select.Elements;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;

import it.finanze.sanita.fse2.ms.gtw.dispatcher.client.IValidatorClient;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.config.CDACFG;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.config.Constants.App;
Expand All @@ -21,10 +40,23 @@
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.JWTTokenDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.ValidationDataDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.ValidationInfoDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.*;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.PublicationCreateReplaceMetadataDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.PublicationCreateReplaceWiiDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.PublicationCreationReqDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.PublicationMetadataReqDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.PublicationUpdateReqDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.ValidationCDAReqDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response.ErrorResponseDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response.LogTraceInfoDTO;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.*;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.ActivityEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.DescriptionEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.ErrorInstanceEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.EventCodeEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.EventTypeEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.InjectionModeEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.RawValidationEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.RestExecutionResultEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.SubjectOrganizationEnum;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.BusinessException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.ConnectionRefusedException;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.exceptions.ValidationException;
Expand All @@ -33,33 +65,12 @@
import it.finanze.sanita.fse2.ms.gtw.dispatcher.utility.PDFUtility;
import it.finanze.sanita.fse2.ms.gtw.dispatcher.utility.StringUtility;
import lombok.extern.slf4j.Slf4j;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.parser.Parser;
import org.jsoup.select.Elements;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Base64;
import java.util.List;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Abstract controller.
*/
@Slf4j
public abstract class AbstractCTL {

@Autowired
private Tracer tracer;

@Autowired
private IValidatorClient validatorClient;
Expand All @@ -75,16 +86,41 @@ public abstract class AbstractCTL {

@Autowired
private IJwtSRV jwtSRV;


@Autowired
private org.springframework.cloud.sleuth.Tracer tracer;
protected LogTraceInfoDTO getLogTraceInfo() {
LogTraceInfoDTO out = new LogTraceInfoDTO(null, null);
if (tracer.currentSpan() != null) {
out = new LogTraceInfoDTO(
tracer.currentSpan().context().spanIdString(),
tracer.currentSpan().context().traceIdString());
tracer.currentSpan().context().spanId(),
tracer.currentSpan().context().traceId());
// tracer.currentSpan().context().spanIdString(),
// tracer.currentSpan().context().traceIdString());
}
return out;
}

// protected LogTraceInfoDTO getLogTraceInfo() {
// LogTraceInfoDTO out = new LogTraceInfoDTO(null, null);
// Tracer tracer = GlobalOpenTelemetry.getTracer("gtw-tracer");
////
//// // Inizia un nuovo span
//// Span span = tracer.spanBuilder("gtw-span").startSpan();
////
//// String traceId = "";
//// String spanId = "";
//// try (Scope scope = span.makeCurrent()) {
//// // Esegui le operazioni che desideri tracciare
//// // Includi il traceId nel tuo output
//// traceId = span.getSpanContext().getTraceId();
//// spanId = span.getSpanContext().getSpanId();
//// } finally {
//// span.end();
//// }
//// out = new LogTraceInfoDTO(spanId,traceId);
// return out;
// }

protected ValidationCDAReqDTO getAndValidateValidationReq(final String jsonREQ) {

Expand Down

0 comments on commit d3767ea

Please sign in to comment.