chore(infra): minor updates to run the project

Author: jonathanmdr

.github/workflows/docker.yml

@@ -14,7 +14,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - name: Run tests
         run: |
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME

.github/workflows/maven.yml

@@ -13,12 +13,12 @@ jobs:
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
-      - name: Configure Azul Zulu OpenJDK 21
-        uses: actions/setup-java@v2
+      - name: Configure Azul Zulu OpenJDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: "21"
+          java-version: "25"
           distribution: "zulu"
 
       - name: Maven build

.github/workflows/vulnerability_scan.yml

@@ -22,23 +22,23 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
 
-    - name: Configure Configure Azul Zulu OpenJDK 21
-      uses: actions/setup-java@v2
+    - name: Configure Configure Azul Zulu OpenJDK 25
+      uses: actions/setup-java@v5
       with:
-        java-version: "21"
+        java-version: "25"
         distribution: "zulu"
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v4
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

otel-dev/ds-prometheus.yaml .otel/ds-prometheus.yamlotel-dev/ds-prometheus.yaml renamed to .otel/ds-prometheus.yaml

@@ -1,30 +1,27 @@
-FROM maven:3.9.4-amazoncorretto-21 AS build
+FROM maven:3.9.11-eclipse-temurin-25-alpine AS build
 
 COPY pom.xml .
 RUN mvn dependency:go-offline
 
 COPY src src
 RUN mvn package -DskipTests
 
-FROM azul/zulu-openjdk:21 AS release
+FROM eclipse-temurin:25-jre-alpine-3.22 AS release
 
-ARG OTEL_AGENT_VERSION=v1.33.3
+ARG OTEL_AGENT_VERSION=v1.58.0
 
 WORKDIR /
 
 COPY --from=build /target/*.jar app.jar
-
 COPY docker-entrypoint.sh .
+COPY .otel/otel.jar .
 
-RUN useradd billionaire && \
+RUN addgroup -S billionaire && \
+    adduser -S -G billionaire billionaire && \
     chmod +x docker-entrypoint.sh && \
-    apt-get update && \
-    apt-get install -y curl && \
-    curl -fsSL -o opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/${OTEL_AGENT_VERSION}/opentelemetry-javaagent.jar && \
-    apt-get purge -y --auto-remove curl && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
 
-USER billionaire
+USER billionaire:billionaire
 
 EXPOSE 8080
 

otel-dev/otel-collector.yaml .otel/otel-collector.yamlotel-dev/otel-collector.yaml renamed to .otel/otel-collector.yaml

@@ -1,4 +1,4 @@
-.PHONY: clean install test version up down restart upgrade_otel_agent
+.PHONY: clean install test version up down restart otel-agent
 
 clean:
 	@mvn clean
@@ -25,8 +25,10 @@ down:
 restart:
 	@docker-compose restart
 
-upgrade_otel_agent:
-	@echo "Download the OTEL Java Agent..."
-	@mkdir -p agents
-	@curl -o agents/opentelemetry-javaagent.jar -L https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.33.3/opentelemetry-javaagent.jar
-	@rm -rf agents/version.txt
+otel-agent:
+	@echo "Update local version for OTEL Java Agent..."
+	@mkdir -p .otel
+	@curl -o .otel/otel.jar -L https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
+	@curl --progress-bar -sL https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases | grep -oE 'releases/tag/v[0-9]+\.[0-9]+\.[0-9]+' | cut -d'/' -f3 | sort -V | tail -n 1 > .otel/version.txt
+	@VERSION=$$(cat .otel/version.txt) && echo "OTEL Java Agent local was updated to $$VERSION"
+	@rm -rf .otel/version.txt

agents/opentelemetry-javaagent.jar .otel/otel.jaragents/opentelemetry-javaagent.jar renamed to .otel/otel.jar

@@ -16,8 +16,8 @@ Esta arquitetura consiste em diminuir a concorrência entre transações da API
 </br>
 </br>
 
-[![node](https://img.shields.io/badge/Azul_Zulu_OpenJDK-21-red.svg)](https://www.azul.com/downloads/?package=jdk#zulu)
-[![node](https://img.shields.io/badge/Spring_Boot-3.4.0-green.svg)](https://spring.io/)
+[![node](https://img.shields.io/badge/Azul_Zulu_OpenJDK-25-red.svg)](https://www.azul.com/downloads/?package=jdk#zulu)
+[![node](https://img.shields.io/badge/Spring_Boot-3.5.10-green.svg)](https://spring.io/)
 [![node](https://img.shields.io/badge/MySQL-8.0.28-blue.svg)](https://www.mysql.com/)
 
 
@@ -57,5 +57,5 @@ OTEL_SERVICE_NAME=billionaire-api
 
 Argumentos de VM:
 ```shell
--javaagent:./agents/opentelemetry-javaagent.jar
+-javaagent:.otel/otel.jar
 ```