Merge pull request #52 from pagopa/PRDP-172-add-app-insight-agent

[PRDP-172] feat: Add application insights agent
pagopa · Oct 19, 2023 · 5946ac9 · 5946ac9
2 parents 9a554f4 + c0e6d15
commit 5946ac9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/.github/maven_code_review/action.yml b/.github/maven_code_review/action.yml
@@ -93,7 +93,7 @@ runs:
  run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
  -Dsonar.organization=pagopa
  -Dsonar.projectKey=${{ env.PROJECT_KEY }}
- -Dsonar.coverage.jacoco.xmlReportPaths=./target/site/jacoco/jacoco.xml
+ -Dsonar.coverage.jacoco.xmlReportPaths=./target/jacoco-report/jacoco.xml
  -Dsonar.coverage.exclusions=${{inputs.coverage_exclusions}}
  -Dsonar.cpd.exclusions=${{inputs.cpd_exclusions}}
  -Dsonar.branch.name=${{ github.head_ref }}

diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,8 @@ RUN microdnf install -y wget
 # install jmx agent
 RUN cd /code && \
  wget https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.19.0/jmx_prometheus_javaagent-0.19.0.jar && \
- curl -o 'opentelemetry-javaagent.jar' -L 'https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar'
+ curl -o 'opentelemetry-javaagent.jar' -L 'https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar' && \
+ curl -o 'applicationinsights-agent.jar' -L 'https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.17/applicationinsights-agent-3.4.17.jar'
 
 # build the application
 RUN ./mvnw package -DskipTests=true -Dquarkus.application.name=$APP_NAME -Dquarkus.profile=$QUARKUS_PROFILE
@@ -28,6 +29,10 @@ RUN mkdir -p /code/target/otel && \
  chmod 777 /code/opentelemetry-javaagent.jar && \
  cp /code/opentelemetry-javaagent.jar /code/target/otel/opentelemetry-javaagent.jar
 
+RUN mkdir -p /code/target/appins && \
+ chmod 777 /code/applicationinsights-agent.jar && \
+ cp /code/applicationinsights-agent.jar /code/target/appins/applicationinsights-agent.jar
+
 RUN mkdir -p /code/target/jmx && \
  cp /code/agent/config.yaml /code/target/jmx/config.yaml
 
@@ -45,6 +50,7 @@ COPY --from=build /code/target/quarkus-app/app/ /deployments/app/
 COPY --from=build /code/target/quarkus-app/quarkus/ /deployments/quarkus/
 COPY --from=build /code/target/jmx/ /deployments/
 COPY --from=build /code/target/otel/ /deployments/
+COPY --from=build /code/target/appins/ /deployments/
 
 EXPOSE 8080
 EXPOSE 12345

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -92,7 +92,7 @@ microservice-chart:
  OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
  OTEL_LOGS_EXPORTER: none
  OTEL_TRACES_SAMPLER: "always_on"
- JAVA_TOOL_OPTIONS: "-javaagent:/deployments/jmx_prometheus_javaagent-0.19.0.jar=12345:/deployments/config.yaml -javaagent:/deployments/opentelemetry-javaagent.jar -Xmx1024m"
+ JAVA_TOOL_OPTIONS: "-javaagent:/deployments/jmx_prometheus_javaagent-0.19.0.jar=12345:/deployments/config.yaml -javaagent:/deployments/opentelemetry-javaagent.jar -javaagent:/deployments/applicationinsights-agent.jar -Xmx1024m"
  envFieldRef:
  envSecret:
  # required

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -92,7 +92,7 @@ microservice-chart:
  OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
  OTEL_LOGS_EXPORTER: none
  OTEL_TRACES_SAMPLER: "always_on"
- JAVA_TOOL_OPTIONS: "-javaagent:/deployments/jmx_prometheus_javaagent-0.19.0.jar=12345:/deployments/config.yaml -Xmx1024m"
+ JAVA_TOOL_OPTIONS: "-javaagent:/deployments/jmx_prometheus_javaagent-0.19.0.jar=12345:/deployments/config.yaml -javaagent:/deployments/opentelemetry-javaagent.jar -javaagent:/deployments/applicationinsights-agent.jar -Xmx1024m"
  envFieldRef:
  envSecret:
  # required

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -92,7 +92,7 @@ microservice-chart:
  OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
  OTEL_LOGS_EXPORTER: none
  OTEL_TRACES_SAMPLER: "always_on"
- JAVA_TOOL_OPTIONS: "-javaagent:/deployments/jmx_prometheus_javaagent-0.19.0.jar=12345:/deployments/config.yaml -javaagent:/deployments/opentelemetry-javaagent.jar -Xmx1024m"
+ JAVA_TOOL_OPTIONS: "-javaagent:/deployments/jmx_prometheus_javaagent-0.19.0.jar=12345:/deployments/config.yaml -javaagent:/deployments/opentelemetry-javaagent.jar -javaagent:/deployments/applicationinsights-agent.jar -Xmx1024m"
  envFieldRef:
  envSecret:
  # required