Merge pull request #10 from pagopa/PAGOPA-2258-issue-log-verbose-biz-service

feat(springboot 2): Add support for springboot v2

Author: jacopocarlini

Diff for: .github/workflows/release.yml

@@ -9,6 +9,7 @@ on:
       - 'CODEOWNERS'
       - '**.md'
       - '.**'
+  workflow_dispatch:
 
 jobs:
   release:

Diff for: Dockerfile

@@ -1,11 +1,11 @@
 FROM eclipse-temurin:17-jre@sha256:0adcf8486107fbd706de4b4fdde64c2d2e3ead4c689b2fb7ae4947010e1f00b4
 
-RUN addgroup spring
-RUN useradd -g spring spring
+RUN addgroup spring && useradd -g spring spring
 USER spring:spring
 
 # https://github.com/microsoft/ApplicationInsights-Java/releases
-ADD --chown=spring:spring https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.19/applicationinsights-agent-3.4.19.jar /applicationinsights-agent.jar
+ADD --chown=spring:spring https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.6.0/applicationinsights-agent-3.6.0.jar /applicationinsights-agent.jar
+
 COPY --chown=spring:spring docker/applicationinsights.json ./applicationinsights.json
 
 EXPOSE 8080

Diff for: docker/applicationinsights.json

@@ -2,5 +2,18 @@
   "selfDiagnostics": {
     "destination": "console",
     "level": "INFO"
+  },
+  "sampling": {
+    "percentage": 5,
+    "overrides": [
+      {
+        "telemetryType": "exception",
+        "percentage": 100
+      },
+      {
+        "telemetryType": "request",
+        "percentage": 100
+      }
+    ]
   }
 }

Diff for: docker/run.sh

@@ -1,3 +1,11 @@
 #!/bin/sh
 
-exec java -javaagent:/applicationinsights-agent.jar ${JAVA_OPTS} org.springframework.boot.loader.launch.JarLauncher "$@"
+spring_boot_version=$(cat ./META-INF/MANIFEST.MF | grep 'Spring-Boot-Version:' | cut -d ' ' -f 2)
+major_version=$(echo "$spring_boot_version" | cut -d '.' -f 1)
+
+# Check if the major_version is 3
+if  [ "$major_version" -eq "3" ] ; then
+  exec java -javaagent:/applicationinsights-agent.jar ${JAVA_OPTS} org.springframework.boot.loader.launch.JarLauncher "$@"
+else
+   exec java -javaagent:/applicationinsights-agent.jar ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher "$@"
+fi