Upgrade spring boot 4.x

server/README.md

@@ -102,14 +102,6 @@ docker compose -p extender down
 ```
 if docker compose was run in detached mode (e.g. '-d' flag was passed to `docker compose up` command).
 
-In case of usage `metrics` profile you also need to add `influx` profile to service command (see `./server/docker/common-service.yml` and `./server/docker/docker-compose.yml`). For example, for common remote builder definition should looks like (`./server/docker/common-service.yml`):
-```yml
-  remote_builder:
-    extends: common_builder
-    command: ["--spring.config.location=classpath:./,file:/etc/defold/extender/", "--spring.profiles.active=local-dev,metrics,influx${STRUCTURED_LOGGING+,logging}"]
-
-```
-
 ## Structured logging
 If you want to see logs in structured form you need to execute docker compose with `STRUCTURED_LOGGING=1` environment variable. For example
 ```sh

server/build.gradle

@@ -6,14 +6,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.5.5'
+        classpath 'org.springframework.boot:spring-boot-gradle-plugin:4.0.2'
     }
 }
 
 plugins {
     id 'java'
     id 'idea'
-    id 'org.springframework.boot' version '3.5.7'
+    id 'org.springframework.boot' version '4.0.2'
     id 'jacoco'
 }
 
@@ -39,7 +39,7 @@ dependencies {
     implementation(platform("com.google.cloud:spring-cloud-gcp-dependencies:7.4.0"))
     testImplementation(platform("org.junit:junit-bom:6.0.1"))
 
-    implementation('org.springframework.boot:spring-boot-starter-web') {
+    implementation('org.springframework.boot:spring-boot-starter-webmvc') {
         exclude module: 'spring-boot-starter-tomcat'
     }
 
@@ -52,6 +52,7 @@ dependencies {
     implementation('com.google.cloud:google-cloud-compute:1.90.0')
     implementation('com.samskivert:jmustache:1.16')
     implementation('commons-chain:commons-chain:1.2')
+    implementation('tools.jackson.core:jackson-databind:3.0.4')
     implementation('org.apache.commons:commons-fileupload2-jakarta:2.0.0-M1')
     implementation('org.apache.commons:commons-fileupload2-core:2.0.0-M4')
     implementation('org.apache.commons:commons-text:1.14.0')
@@ -62,16 +63,16 @@ dependencies {
     implementation('org.springframework.boot:spring-boot-starter-actuator')
     implementation('org.springframework.boot:spring-boot-starter-jetty')
     implementation('org.springframework.boot:spring-boot-starter-security')
-    implementation('io.micrometer:micrometer-core:1.15.3')
-    implementation('io.micrometer:micrometer-tracing:1.6.0')
-    implementation('io.micrometer:micrometer-tracing-bridge-otel:1.6.0')
+    implementation('org.springframework.boot:spring-boot-starter-micrometer-metrics')
+    implementation('org.springframework.boot:spring-boot-micrometer-tracing')
+    implementation('org.springframework.boot:spring-boot-micrometer-tracing-brave')
+    implementation('io.micrometer:micrometer-tracing-bridge-brave')
 
     implementation('org.projectlombok:lombok:1.18.42')
     annotationProcessor('org.projectlombok:lombok:1.18.42')
 
     runtimeOnly('net.logstash.logback:logstash-logback-encoder:8.1')
-    runtimeOnly('io.micrometer:micrometer-registry-influx:1.15.3')
-    runtimeOnly('io.micrometer:micrometer-registry-prometheus:1.15.3') {
+    runtimeOnly('io.micrometer:micrometer-registry-prometheus') {
         exclude group: 'org.junit.jupiter'
     }
 

server/configs/application-prometheus.yml

@@ -0,0 +1 @@
+management.endpoints.web.exposure.include: health,prometheus

server/docker/common-services.yml

@@ -33,7 +33,7 @@ services:
       - DM_DEBUG_JOB_UPLOAD
   remote_builder:
     extends: common_builder
-    command: ["--spring.config.location=classpath:./,file:/etc/defold/extender/", "--spring.profiles.active=local-dev${STRUCTURED_LOGGING+,logging}"]
+    command: ["--spring.config.location=classpath:./,file:/etc/defold/extender/", "--spring.profiles.active=local-dev,prometheus${STRUCTURED_LOGGING+,logging}"]
   test_remote_builder:
     extends: test_builder
     command: ["--spring.config.location=classpath:./,file:/etc/defold/extender/", "--spring.profiles.active=local-dev"]

server/docker/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     extends:
       file: common-services.yml
       service: common_builder
-    command: ["--spring.config.location=classpath:./,file:/etc/defold/extender/", "--spring.profiles.active=local-dev-app${STRUCTURED_LOGGING+,logging}"]
+    command: ["--spring.config.location=classpath:./,file:/etc/defold/extender/", "--spring.profiles.active=local-dev-app,prometheus${STRUCTURED_LOGGING+,logging}"]
     environment:
       - INSTANCE_ID=frontend-local
     expose:
@@ -329,6 +329,9 @@ services:
       - 8428:8428
     volumes:
       - ./victoria-metrics-data:/victoria-metrics-data
+      - ./prometheus-scrape.yml:/etc/prometheus/prometheus.yml:ro
+    command:
+      - -promscrape.config=/etc/prometheus/prometheus.yml
     profiles:
       - metrics
     networks:

server/docker/prometheus-scrape.yml

@@ -0,0 +1,18 @@
+scrape_configs:
+  - job_name: extender
+    scrape_interval: 15s
+    metrics_path: /actuator/prometheus
+    static_configs:
+      - targets:
+          - frontend:9000
+          - linux:9000
+          - linux-arm64:9000
+          - android-ndk25:9000
+          - android-ndk25_sdk36:9000
+          - emsdk-3165:9000
+          - emsdk-406:9000
+          - nssdk-2143:9000
+          - ps4-12500:9000
+          - ps5-12000:9000
+          - winsdk-2022:9000
+          - xbox-251001:9000

server/manifestmergetool/build.gradle

@@ -82,6 +82,8 @@ dependencies {
     implementation('org.apache.commons:commons-configuration2:2.11.0')
     implementation('commons-codec:commons-codec:1.19.0')
 
+    testImplementation(platform('org.junit:junit-bom:6.0.1'))
+    testRuntimeOnly('org.junit.platform:junit-platform-launcher')
     testImplementation('commons-io:commons-io:2.21.0')
     testImplementation('org.junit.jupiter:junit-jupiter-engine:5.13.4')
 }

server/src/main/java/com/defold/extender/cache/info/CacheInfoFileParser.java

@@ -1,6 +1,6 @@
 package com.defold.extender.cache.info;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Service;
 
 import java.io.File;

server/src/main/java/com/defold/extender/cache/info/CacheInfoFileWriter.java

@@ -1,7 +1,7 @@
 package com.defold.extender.cache.info;
 
 import com.defold.extender.cache.CacheEntry;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;

server/src/main/resources/application.yml

@@ -85,11 +85,6 @@ management:
             path: /
             threshold: 1073741824 #1024mb
 
-    influx:
-        metrics:
-            export:
-                enabled: false
-
 spring.cloud.gcp:
     core.enabled: false
     storage.enabled: false

server/src/test/java/com/defold/extender/cache/info/CacheInfoFileWriterTest.java

@@ -8,6 +8,8 @@
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 
+import org.json.simple.parser.JSONParser;
+import org.json.simple.JSONObject;
 import org.junit.jupiter.api.Test;
 
 public class CacheInfoFileWriterTest {
@@ -31,6 +33,10 @@ public void write() throws Exception {
         byte[] buffer = new byte[inputStream.available()];
         inputStream.read(buffer, 0, inputStream.available());
 
-        assertEquals(JSON, new String(buffer));
+        JSONParser parser = new JSONParser();
+        JSONObject expected = (JSONObject)parser.parse(JSON);
+
+        JSONObject result = (JSONObject)parser.parse(new String(buffer));
+        assertEquals(expected, result);
     }
 }