Merge pull request #31 from pagopa/PAGOPA-1215-afm-calculator-creare-…

…dashboard-elk Pagopa 1215 afm calculator creare dashboard elk
pagopa · Oct 10, 2023 · 964e356 · 964e356
2 parents f2ee0f9 + 953886e
commit 964e356
Show file tree

Hide file tree

Showing 18 changed files with 879 additions and 775 deletions.
diff --git a/.github/workflows/deploy_with_github_runner.yml b/.github/workflows/deploy_with_github_runner.yml
@@ -42,7 +42,6 @@ jobs:
  container_app_environment_name: ${{ vars.CONTAINER_APP_ENVIRONMENT_NAME }}
  resource_group_name: ${{ vars.CONTAINER_APP_ENVIRONMENT_RESOURCE_GROUP_NAME }} # RG of the runner
  pat_token: ${{ secrets.BOT_TOKEN_GITHUB }}
- self_hosted_runner_image_tag: "v1.4.1"
 
  deploy:
  needs: [ create_runner ]

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,8 +9,3 @@ repos:
  - id: ggshield
  language_version: python3
  stages: [ commit ]
-
- - repo: https://github.com/maltzj/google-style-precommit-hook
- rev: b7e9e7fcba4a5aea463e72fe9964c14877bd8130
- hooks:
- - id: google-style-java
diff --git a/Dockerfile b/Dockerfile
@@ -13,11 +13,15 @@ RUN java -Djarmode=layertools -jar application.jar extract
 
 
 FROM ghcr.io/pagopa/docker-base-springboot-openjdk11:v1.0.1@sha256:bbbe948e91efa0a3e66d8f308047ec255f64898e7f9250bdb63985efd3a95dbf
+ADD --chown=spring:spring https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar .
+
 COPY --chown=spring:spring --from=builder dependencies/ ./
 COPY --chown=spring:spring --from=builder snapshot-dependencies/ ./
 # 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
+EXPOSE 8080
+
+ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-afm-utils
 description: Utility microservice for pagoPA AFM
 type: application
-version: 0.8.0
-appVersion: 0.6.2
+version: 0.13.0
+appVersion: 0.6.2-5-PAGOPA-1215-afm-calculator-creare-dashboard-elk
 dependencies:
  - name: microservice-chart
  version: 1.21.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
  fullnameOverride: ""
  image:
  repository: ghcr.io/pagopa/pagopa-afm-utils
- tag: "0.6.2"
+ tag: "0.6.2-5-PAGOPA-1215-afm-calculator-creare-dashboard-elk"
  pullPolicy: Always
  livenessProbe:
  httpGet:
@@ -65,10 +65,16 @@ microservice-chart:
  COSMOS_DATABASE: 'db'
  COSMOS_QUERY_METRICS: 'false'
  CDI_CONTAINER_NAME: 'cdis'
+ OTEL_SERVICE_NAME: "pagopa-afm-utils"
+ OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=dev"
+ OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+ OTEL_LOGS_EXPORTER: none
+ OTEL_TRACES_SAMPLER: "always_on"
  envSecret:
  APPLICATIONINSIGHTS_CONNECTION_STRING: ai-d-connection-string
  AFM_MARKETPLACE_SUBSCRIPTION_KEY: afm-marketplace-subscription-key
  COSMOS_KEY: afm-marketplace-d-cosmos-pkey
+ OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
  keyvault:
  name: "pagopa-d-afm-kv"
  tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
@@ -84,7 +90,7 @@ microservice-chart:
  values:
  - user
  canaryDelivery:
- create: true
+ create: false
  ingress:
  create: true
  canary:

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -4,7 +4,7 @@ microservice-chart:
  fullnameOverride: ""
  image:
  repository: ghcr.io/pagopa/pagopa-afm-utils
- tag: "0.6.2"
+ tag: "0.6.2-5-PAGOPA-1215-afm-calculator-creare-dashboard-elk"
  pullPolicy: Always
  livenessProbe:
  httpGet:
@@ -65,10 +65,16 @@ microservice-chart:
  COSMOS_DATABASE: 'db'
  COSMOS_QUERY_METRICS: 'false'
  CDI_CONTAINER_NAME: 'cdis'
+ OTEL_SERVICE_NAME: "pagopa-afm-utils"
+ OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=prod"
+ OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+ OTEL_LOGS_EXPORTER: none
+ OTEL_TRACES_SAMPLER: "always_on"
  envSecret:
  APPLICATIONINSIGHTS_CONNECTION_STRING: ai-p-connection-string
  AFM_MARKETPLACE_SUBSCRIPTION_KEY: afm-marketplace-subscription-key
  COSMOS_KEY: afm-marketplace-p-cosmos-pkey
+ OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
  keyvault:
  name: "pagopa-p-afm-kv"
  tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
@@ -84,7 +90,7 @@ microservice-chart:
  values:
  - user
  canaryDelivery:
- create: true
+ create: false
  ingress:
  create: true
  canary:

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -4,7 +4,7 @@ microservice-chart:
  fullnameOverride: ""
  image:
  repository: ghcr.io/pagopa/pagopa-afm-utils
- tag: "0.6.2"
+ tag: "0.6.2-5-PAGOPA-1215-afm-calculator-creare-dashboard-elk"
  pullPolicy: Always
  livenessProbe:
  httpGet:
@@ -65,10 +65,16 @@ microservice-chart:
  COSMOS_DATABASE: 'db'
  COSMOS_QUERY_METRICS: 'false'
  CDI_CONTAINER_NAME: 'cdis'
+ OTEL_SERVICE_NAME: "pagopa-afm-utils"
+ OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=uat"
+ OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+ OTEL_LOGS_EXPORTER: none
+ OTEL_TRACES_SAMPLER: "always_on"
  envSecret:
  APPLICATIONINSIGHTS_CONNECTION_STRING: ai-u-connection-string
  AFM_MARKETPLACE_SUBSCRIPTION_KEY: afm-marketplace-subscription-key
  COSMOS_KEY: afm-marketplace-u-cosmos-pkey
+ OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
  keyvault:
  name: "pagopa-u-afm-kv"
  tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
@@ -84,7 +90,7 @@ microservice-chart:
  values:
  - user
  canaryDelivery:
- create: true
+ create: false
  ingress:
  create: true
  canary: