diff --git a/Dockerfile b/Dockerfile index 0cb58758..fd05ebef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,18 +14,12 @@ COPY --from=buildtime /build/target/*.jar application.jar RUN java -Djarmode=layertools -jar application.jar extract -FROM ghcr.io/pagopa/docker-base-springboot-openjdk17:v1.1.0@sha256:6fa320d452fa22066441f1ef292d15eb06f944bc8bca293e1a91ea460d30a613 -#ADD --chown=spring:spring https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar . +FROM ghcr.io/pagopa/docker-base-springboot-openjdk17:v2.1.1@sha256:a2864e6ba9c6b7ebf9804f57a23d416d6f217d2f5b3ec2a48b5c95bf488ec20c COPY --chown=spring:spring --from=builder dependencies/ ./ COPY --chown=spring:spring --from=builder snapshot-dependencies/ ./ -COPY --chown=spring:spring docker/applicationinsights.json ./applicationinsights.json # https://github.com/moby/moby/issues/37965#issuecomment-426853382 RUN true COPY --chown=spring:spring --from=builder spring-boot-loader/ ./ COPY --chown=spring:spring --from=builder application/ ./ - -EXPOSE 8080 - -#ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"] \ No newline at end of file diff --git a/docker/applicationinsights.json b/docker/applicationinsights.json deleted file mode 100644 index 312fe75f..00000000 --- a/docker/applicationinsights.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "selfDiagnostics": { - "destination": "console", - "level": "INFO" - }, - "sampling": { - "requestsPerSecond": 5 - }, - "preview": { - "sampling": { - "overrides": [ - { - "telemetryKind": "exception", - "percentage": 100 - } - ] - } - } -} \ No newline at end of file diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 9be076fd..d3fbbffb 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-gpd-payments description: Microservice that exposes API for payment receipts retrieving and other operations type: application -version: 0.113.0 -appVersion: 0.12.29 +version: 0.116.0 +appVersion: 0.12.29-3-sampling dependencies: - name: microservice-chart version: 2.4.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 32507483..6e188f9d 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-gpd-payments - tag: "0.12.29" + tag: "0.12.29-3-sampling" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 02d8fe46..56373a7e 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-gpd-payments - tag: "0.12.29" + tag: "0.12.29-3-sampling" pullPolicy: Always livenessProbe: httpGet: @@ -45,7 +45,7 @@ microservice-chart: resources: requests: memory: "512Mi" - cpu: "0.25" + cpu: "0.3" limits: memory: "768Mi" cpu: "0.5" diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 2d168e5b..251ef146 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-gpd-payments - tag: "0.12.29" + tag: "0.12.29-3-sampling" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index 35954fb4..396b70f9 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "title": "PagoPA API Payments", "description": "Payments", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.12.29" + "version": "0.12.29-3-sampling" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 385e1ace..bca7cf85 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ it.gov.pagopa payments - 0.12.29 + 0.12.29-3-sampling Payments Payments diff --git a/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java b/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java index 646e4b88..5842a315 100644 --- a/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java +++ b/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java @@ -91,13 +91,7 @@ private static Map getParams(ProceedingJoinPoint joinPoint) { for (var parameter : method.getParameters()) { var paramName = parameter.getName(); var arg = joinPoint.getArgs()[i++]; - if (arg instanceof JAXBElement) { - try { - arg = new ObjectMapper().writer().writeValueAsString(arg); - } catch (JsonProcessingException e) { - arg = "unreadable!"; - } - } + arg = jaxToString(arg); params.put(paramName, deNull(arg)); } return params; @@ -141,7 +135,7 @@ public Object logApiInvocation(ProceedingJoinPoint joinPoint) throws Throwable { Map params = getParams(joinPoint); MDC.put(ARGS, params.toString()); - log.info("Invoking API operation {} - args: {}", joinPoint.getSignature().getName(), params); + log.debug("Invoking API operation {} - args: {}", joinPoint.getSignature().getName(), params); Object result = joinPoint.proceed(); @@ -149,7 +143,9 @@ public Object logApiInvocation(ProceedingJoinPoint joinPoint) throws Throwable { MDC.put(CODE, String.valueOf(httpResponse.getStatus())); MDC.put(RESPONSE_TIME, getExecutionTime()); log.info( - "Successful API operation {} - result: {}", joinPoint.getSignature().getName(), result); + "Successful API operation {} - result: {}", + joinPoint.getSignature().getName(), + jaxToString(result)); MDC.remove(STATUS); MDC.remove(CODE); MDC.remove(RESPONSE_TIME); @@ -176,4 +172,15 @@ public Object logTrace(ProceedingJoinPoint joinPoint) throws Throwable { log.debug("Return method {} - result: {}", joinPoint.getSignature().toShortString(), result); return result; } + + private static Object jaxToString(Object arg) { + if (arg instanceof JAXBElement) { + try { + arg = new ObjectMapper().writer().writeValueAsString(arg); + } catch (JsonProcessingException e) { + arg = "unreadable!"; + } + } + return arg; + } }