Merge branch 'main' into queue-tracing

pagopa · Jul 18, 2023 · 811ebba · 811ebba
2 parents 29739bc + 82f988a
commit 811ebba
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 36 deletions.
diff --git a/.devops/deploy-pipelines.yml b/.devops/deploy-pipelines.yml
@@ -435,7 +435,7 @@ stages:
           eq(dependencies.Prod_WaitForApproval.result, 'Succeeded')
         )
     ${{ if eq(parameters['PROD_SKIP_BLUE_DEPLOYMENT'], False) }}:
-      dependsOn: Blue_PROD_deployment
+      dependsOn: Deploy_PROD_Blue
     variables:
       release_url: $[ stageDependencies.Release.make_release.outputs['chart_current_version.releaseUrl'] ]
     jobs:

diff --git a/.github/actions/check-pr-semver-labels/action.yml b/.github/actions/check-pr-semver-labels/action.yml
@@ -46,7 +46,7 @@ runs:
             }
             const commitMessage = mergeCommit.data.message;
             core.info(`Commit message: ${commitMessage}`);
-            const extractedPrNumber = commitMessage.match('\\(#(\\d{1,9})\\)'); 
+            const extractedPrNumber = commitMessage.match(/#(\d{1,9})/);
             if(extractedPrNumber ==null || extractedPrNumber.length <1){
                throw `Could not extract PR number from commit message ${commitMessage}`;
             }

diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,7 @@ WORKDIR /app/
 ARG EXTRACTED=/workspace/app/target/extracted
 
 # ELK apm agent
-ADD --chown=user https://search.maven.org/remotecontent?filepath=co/elastic/apm/elastic-apm-agent/1.38.0/elastic-apm-agent-1.38.0.jar ./apm-elk-agent.jar
+ADD --chown=user https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar .
 
 COPY --from=build --chown=user ${EXTRACTED}/dependencies/ ./
 RUN true
@@ -37,4 +37,4 @@ COPY --from=build --chown=user ${EXTRACTED}/application/ ./
 RUN true
 
 
-ENTRYPOINT ["java","-javaagent:apm-elk-agent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
+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-ecommerce-transactions-scheduler-service
 description: Microservice that perform scheduled operations on pending transactions
 type: application
-version: 0.2.8
-appVersion: 0.2.8
+version: 0.3.0
+appVersion: 0.3.0
 dependencies:
   - name: microservice-chart
     version: 2.3.1

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: "pagopaecommercetxschedulerservice-microservice-chart"
   image:
     repository: pagopadcommonacr.azurecr.io/pagopaecommercetransactionsschedulerservice
-    tag: "0.2.8"
+    tag: "0.3.0"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -81,16 +81,16 @@ microservice-chart:
     PENDING_TRANSACTIONS_MAX_TRANSACTIONS_PER_PAGE: "5"
     PENDING_TRANSACTIONS_PAGE_ANALYSIS_DELAY_SECONDS: "1"
     PENDING_TRANSACTIONS_SEND_PAYMENT_RESULT_TIMEOUT_SECONDS: "3900"
-    ELASTIC_APM_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service
-    ELASTIC_APM_APPLICATION_PACKAGES: it.pagopa.ecommerce.transactions.scheduler
-    ELASTIC_APM_SERVER_URL: http://quickstart-apm-http.elastic-system.svc:8200
-    ELASTIC_APM_LOG_SENDING: "false"
+    OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopa-ecommerce-transactions-scheduler-service,service.deployment.environment=dev"
+    OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+    OTEL_LOGS_EXPORTER: none
+    OTEL_TRACES_SAMPLER: "always_on"
     ECS_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service
     ECS_SERVICE_ENVIRONMENT: "dev"
   envSecret:
     MONGO_PASSWORD: mongo-ecommerce-password
     QUEUE_TRANSIENT_CONNECTION_STRING: ecommerce-storage-transient-connection-string
-    ELASTIC_APM_SECRET_TOKEN: elastic-apm-secret-token
+    OTEL_EXPORTER_OTLP_HEADERS: elastic-otel-token-header
   keyvault:
     name: "pagopa-d-ecommerce-kv"
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -30,19 +30,19 @@ microservice-chart:
       PENDING_TRANSACTIONS_PAGE_ANALYSIS_DELAY_SECONDS: "1"
       PENDING_TRANSACTIONS_SEND_PAYMENT_RESULT_TIMEOUT_SECONDS: "3900"
       TRANSIENT_QUEUES_TTL_SECONDS: "2592000"
-      ELASTIC_APM_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service-blue
-      ELASTIC_APM_APPLICATION_PACKAGES: it.pagopa.ecommerce.transactions.scheduler
-      ELASTIC_APM_SERVER_URL: http://quickstart-apm-http.elastic-system.svc:8200
-      ELASTIC_APM_LOG_SENDING: "false"
+      OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopa-ecommerce-transactions-scheduler-service-blue,service.deployment.environment=prod"
+      OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+      OTEL_LOGS_EXPORTER: none
+      OTEL_TRACES_SAMPLER: "always_on"
       ECS_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service-blue
       ECS_SERVICE_ENVIRONMENT: "prod"
     envSecret:
       MONGO_PASSWORD: mongo-ecommerce-password
       QUEUE_TRANSIENT_CONNECTION_STRING: ecommerce-storage-transient-connection-string
-      ELASTIC_APM_SECRET_TOKEN: elastic-apm-secret-token
+      OTEL_EXPORTER_OTLP_HEADERS: elastic-otel-token-header
   image:
     repository: pagopapcommonacr.azurecr.io/pagopaecommercetransactionsschedulerservice
-    tag: "0.2.8"
+    tag: "0.3.0"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -120,16 +120,16 @@ microservice-chart:
     PENDING_TRANSACTIONS_PARALLEL_EVENTS_TO_PROCESS: "1"
     PENDING_TRANSACTIONS_SEND_PAYMENT_RESULT_TIMEOUT_SECONDS: "3900"
     TRANSIENT_QUEUES_TTL_SECONDS: "2592000"
-    ELASTIC_APM_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service
-    ELASTIC_APM_APPLICATION_PACKAGES: it.pagopa.ecommerce.transactions.scheduler
-    ELASTIC_APM_SERVER_URL: http://quickstart-apm-http.elastic-system.svc:8200
-    ELASTIC_APM_LOG_SENDING: "false"
+    OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopa-ecommerce-transactions-scheduler-service,service.deployment.environment=prod"
+    OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+    OTEL_LOGS_EXPORTER: none
+    OTEL_TRACES_SAMPLER: "always_on"
     ECS_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service
     ECS_SERVICE_ENVIRONMENT: "prod"
   envSecret:
     MONGO_PASSWORD: mongo-ecommerce-password
     QUEUE_TRANSIENT_CONNECTION_STRING: ecommerce-storage-transient-connection-string
-    ELASTIC_APM_SECRET_TOKEN: elastic-apm-secret-token
+    OTEL_EXPORTER_OTLP_HEADERS: elastic-otel-token-header
   keyvault:
     name: "pagopa-p-ecommerce-kv"
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -29,19 +29,19 @@ microservice-chart:
       PENDING_TRANSACTIONS_MAX_TRANSACTIONS_PER_PAGE: "5"
       PENDING_TRANSACTIONS_PAGE_ANALYSIS_DELAY_SECONDS: "1"
       PENDING_TRANSACTIONS_SEND_PAYMENT_RESULT_TIMEOUT_SECONDS: "3900"
-      ELASTIC_APM_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service-blue
-      ELASTIC_APM_APPLICATION_PACKAGES: it.pagopa.ecommerce.transactions.scheduler
-      ELASTIC_APM_SERVER_URL: http://quickstart-apm-http.elastic-system.svc:8200
-      ELASTIC_APM_LOG_SENDING: "false"
+      OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopa-ecommerce-transactions-scheduler-service-blue,service.deployment.environment=uat"
+      OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+      OTEL_LOGS_EXPORTER: none
+      OTEL_TRACES_SAMPLER: "always_on"
       ECS_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service-blue
       ECS_SERVICE_ENVIRONMENT: "uat"
     envSecret:
       MONGO_PASSWORD: mongo-ecommerce-password
       QUEUE_TRANSIENT_CONNECTION_STRING: ecommerce-storage-transient-connection-string
-      ELASTIC_APM_SECRET_TOKEN: elastic-apm-secret-token
+      OTEL_EXPORTER_OTLP_HEADERS: elastic-otel-token-header
   image:
     repository: pagopaucommonacr.azurecr.io/pagopaecommercetransactionsschedulerservice
-    tag: "0.2.8"
+    tag: "0.3.0"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -118,16 +118,16 @@ microservice-chart:
     PENDING_TRANSACTIONS_MAX_TRANSACTIONS_PER_PAGE: "5"
     PENDING_TRANSACTIONS_PAGE_ANALYSIS_DELAY_SECONDS: "1"
     PENDING_TRANSACTIONS_SEND_PAYMENT_RESULT_TIMEOUT_SECONDS: "3900"
-    ELASTIC_APM_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service
-    ELASTIC_APM_APPLICATION_PACKAGES: it.pagopa.ecommerce.transactions.scheduler
-    ELASTIC_APM_SERVER_URL: http://quickstart-apm-http.elastic-system.svc:8200
-    ELASTIC_APM_LOG_SENDING: "false"
+    OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopa-ecommerce-transactions-scheduler-service,service.deployment.environment=uat"
+    OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+    OTEL_LOGS_EXPORTER: none
+    OTEL_TRACES_SAMPLER: "always_on"
     ECS_SERVICE_NAME: pagopa-ecommerce-transactions-scheduler-service
     ECS_SERVICE_ENVIRONMENT: "uat"
   envSecret:
     MONGO_PASSWORD: mongo-ecommerce-password
     QUEUE_TRANSIENT_CONNECTION_STRING: ecommerce-storage-transient-connection-string
-    ELASTIC_APM_SECRET_TOKEN: elastic-apm-secret-token
+    OTEL_EXPORTER_OTLP_HEADERS: elastic-otel-token-header
   keyvault:
     name: "pagopa-u-ecommerce-kv"
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>it.pagopa.ecommerce</groupId>
     <artifactId>pagopa-ecommerce-transactions-scheduler-service</artifactId>
-    <version>0.2.8</version>
+    <version>0.3.0</version>
     <name>pagopa-ecommerce-transactions-scheduler-service</name>
     <description>pagoPA ecommerce microservice to check perform scheduled operations on transactions such as analyze
         pending transactions
@@ -20,7 +20,7 @@
         <java.version>17</java.version>
         <azure.functions.java.library.version>3.0.0</azure.functions.java.library.version>
         <spring.cloud.azure.dependencies>4.0.0</spring.cloud.azure.dependencies>
-        <pagopa-ecommerce-commons.version>0.18.3</pagopa-ecommerce-commons.version>
+        <pagopa-ecommerce-commons.version>0.19.0</pagopa-ecommerce-commons.version>
         <spotless.version>2.28.0</spotless.version>
         <jacoco.version>0.8.8</jacoco.version>
         <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>