merge

Dockerfile

@@ -14,12 +14,18 @@ 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 eclipse-temurin:17-jre@sha256:0adcf8486107fbd706de4b4fdde64c2d2e3ead4c689b2fb7ae4947010e1f00b4
+
+VOLUME /tmp
+WORKDIR /app
+
+# https://github.com/microsoft/ApplicationInsights-Java/releases
+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
+COPY --chown=spring:spring docker/run.sh ./run.sh
 
 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
@@ -28,4 +34,5 @@ COPY --chown=spring:spring  --from=builder application/ ./
 
 EXPOSE 8080
 
-#ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
+RUN chmod +x ./run.sh
+ENTRYPOINT ["./run.sh"]

docker/applicationinsights.json

@@ -4,16 +4,16 @@
     "level": "INFO"
   },
   "sampling": {
-    "requestsPerSecond": 5
-  },
-  "preview": {
-    "sampling": {
-      "overrides": [
-        {
-          "telemetryKind": "exception",
-          "percentage": 100
-        }
-      ]
-    }
+    "percentage": 5,
+    "overrides": [
+      {
+        "telemetryType": "exception",
+        "percentage": 100
+      },
+      {
+        "telemetryType": "request",
+        "percentage": 100
+      }
+    ]
   }
 }

docker/run.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+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