Merge pull request #110 from pagopa/sampling

chore(sampling): bump image Dockerfile

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"]

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

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:

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"

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:

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": [
  {

pom.xml

@@ -13,7 +13,7 @@
 
  <groupId>it.gov.pagopa</groupId>
  <artifactId>payments</artifactId>
- <version>0.12.29</version>
+ <version>0.12.29-3-sampling</version>
  <name>Payments</name>
  <description>Payments</description>
 

src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java

@@ -91,13 +91,7 @@ private static Map<String, String> 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,15 +135,17 @@ public Object logApiInvocation(ProceedingJoinPoint joinPoint) throws Throwable {
  Map<String, String> 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();
 
  MDC.put(STATUS, "OK");
  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;
+ }
 }