Merge pull request #152 from wolfiabot/bump-metrics

Bump metrics

.github/workflows/build.yaml

@@ -9,12 +9,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
 
       - name: Gradle Wrapper Verification
-        uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1.0.5
+        uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v4.1.0
 
       - name: Set up env
         env:
@@ -40,13 +40,13 @@ jobs:
           echo "GIT_HASH_TAG=$IMAGE_BASE:$GIT_HASH_SHORT" >> "$GITHUB_ENV"
 
       - name: Login to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Setup JDK
-        uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b # v3.9.0
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
         with:
           distribution: "temurin"
           java-version: 21
@@ -56,20 +56,20 @@ jobs:
         run: java -Xmx32m --version
 
       - name: Gradle Assemble
-        uses: burrunan/gradle-cache-action@f9ec73cf67dd8ed9a057978212c988945b2f0405 # v1.15
+        uses: burrunan/gradle-cache-action@c15634bb25b7284dc084f38dff4e838048b7feaf # v1.22
         with:
           arguments: assemble --info -Pprod
 
       - name: Sonar
-        uses: burrunan/gradle-cache-action@f9ec73cf67dd8ed9a057978212c988945b2f0405 # v1.15
+        uses: burrunan/gradle-cache-action@c15634bb25b7284dc084f38dff4e838048b7feaf # v1.22
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
           arguments: check sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=wolfiabot -Dsonar.login=${{ env.SONAR_TOKEN }}
 
       - name: Gradle BootJar
-        uses: burrunan/gradle-cache-action@f9ec73cf67dd8ed9a057978212c988945b2f0405 # v1.15
+        uses: burrunan/gradle-cache-action@c15634bb25b7284dc084f38dff4e838048b7feaf # v1.22
         with:
           arguments: bootJar --info -Pprod
 

DEVELOPING.md

@@ -41,7 +41,7 @@ development.
 
 #### PostgreSQL
 This project uses the [PostgreSQL](https://www.postgresql.org/) relational database to store and query important data.
-The currently used version can be found in the [databases' Dockerfile](docker/database/Dockerfile).
+The currently used version can be found in the [poggres repo](https://github.com/CapybaraLabs/poggres).
 Installing it is optional, running the development `docker-compose` is recommended instead:
 ```shell script
 docker-compose -f docker/dev/docker-compose.yaml up -d
@@ -94,11 +94,11 @@ We also use the [Bulma](https://bulma.io/) CSS framework, together with a [Bulma
 
 ##### PostgreSQL
 [PostgreSQL](https://www.postgresql.org/) is the main database.
-We deploy a customized [Docker image](docker/database/Dockerfile) that contains init scripts to set up required database
+We deploy a customized [Docker image](https://github.com/CapybaraLabs/poggres) that contains init scripts to set up required database
 extensions as well as backup scripts to back up the data to [Backblaze B2](https://www.backblaze.com/b2).
 
 ##### Flyway & jOOQ
-[Database schema migrations](src/main/resources/db/migrations) are handled by [Flyway](https://flywaydb.org/).
+[Database schema migrations](src/main/resources/db/migration) are handled by [Flyway](https://flywaydb.org/).
 
 [jOOQ](https://www.jooq.org/) is used for database querying.
 

build.gradle

@@ -31,6 +31,7 @@ buildscript {
     dependencies {
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
         classpath "gradle.plugin.org.flywaydb:gradle-plugin-publishing:$flywayVersion"
+        classpath "org.flywaydb:flyway-database-postgresql:$flywayVersion"
 
         classpath "gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:$gradleGitVersion"
         classpath "org.ajoberstar.grgit:grgit-gradle:$grGitVersion"
@@ -192,7 +193,6 @@ allprojects {
 
     dependencies {
         globalPlatforms platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion")
-        globalPlatforms platform("io.prometheus:simpleclient_bom:$prometheusVersion")
         globalPlatforms platform("io.sentry:sentry-bom:$sentryVersion")
     }
 }
@@ -286,16 +286,16 @@ dependencies {
     implementation(group: "io.netty", name: "netty-transport-native-epoll", classifier: "linux-x86_64")
     implementation(group: "io.netty", name: "netty-transport-native-kqueue", classifier: "osx-x86_64")
 
-    implementation "io.prometheus:simpleclient"
-    implementation "io.prometheus:simpleclient_hotspot"
-    implementation "io.prometheus:simpleclient_logback"
-    implementation "io.prometheus:simpleclient_common"
-    implementation "io.prometheus:simpleclient_caffeine"
-    implementation "space.npstr:prometheus_extensions:$promExtVersion"
+    // not part of v1.3.2 BOM for some reason
+    implementation "io.prometheus:prometheus-metrics-instrumentation-caffeine:$prometheusClientVersion"
+    implementation "io.prometheus:prometheus-metrics-instrumentation-jvm"
+    implementation "space.npstr:prometheus_extensions:$prometheusExtensionsVersion"
+    implementation "io.micrometer:micrometer-registry-prometheus"
 
     implementation "org.postgresql:postgresql"
     implementation "com.zaxxer:HikariCP"
     implementation "org.flywaydb:flyway-core:$flywayVersion"
+    implementation "org.flywaydb:flyway-database-postgresql:$flywayVersion"
     implementation "net.ttddyy:datasource-proxy:$dsProxyVersion"
 
     implementation "org.jooq:jooq:$jooqVersion"
@@ -314,9 +314,11 @@ dependencies {
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-undertow"
+    implementation "org.springframework.boot:spring-boot-starter-jdbc"
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.session:spring-session-data-redis"
     implementation "org.jetbrains.kotlin:kotlin-reflect"
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin"
@@ -440,7 +442,7 @@ class StopCodegenDbContainer extends DockerStopContainer {
     }
 }
 
-def migrationsInput = fileTree('src/main/resources/db/migrations')
+def migrationsInput = fileTree('src/main/resources/db/migration')
 def migrationsOutput = fileTree('build/classes/generated/java/space/npstr/wolfia/db/gen')
 
 flyway {
@@ -464,7 +466,7 @@ flyway {
     }
 
     url = "$codegenJdbcUrl"
-    locations = ['filesystem:src/main/resources/db/migrations']
+    locations = ['filesystem:src/main/resources/db/migration']
     configurations = ['flywayMigration']
 }
 

buildSrc/build.gradle

@@ -3,4 +3,7 @@ repositories {
 }
 dependencies {
 	implementation "com.bmuschko:gradle-docker-plugin:$dockerPluginVersion"
+
+    // https://stackoverflow.com/questions/78638699/bootjar-task-fails-with-gradle-8-5-and-spring-boot-3-3-0-caused-by-spring-boot
+    implementation("org.apache.commons:commons-compress:$apacheCompressVersion")
 }

buildscript-gradle.lockfile

@@ -7,6 +7,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.15.2=classpath
 com.fasterxml.jackson.core:jackson-core:2.15.2=classpath
 com.fasterxml.jackson.core:jackson-databind:2.15.2=classpath
 com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.15.2=classpath
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=classpath
 com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.2=classpath
 com.fasterxml.jackson:jackson-bom:2.15.2=classpath
 com.github.ben-manes:gradle-versions-plugin:0.51.0=classpath
@@ -15,7 +16,6 @@ com.github.docker-java:docker-java-core:3.2.13=classpath
 com.github.docker-java:docker-java-transport-httpclient5:3.2.13=classpath
 com.github.docker-java:docker-java-transport:3.2.13=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
-com.google.code.gson:gson:2.10.1=classpath
 com.google.guava:guava:19.0=classpath
 com.googlecode.javaewah:JavaEWAH:1.2.3=classpath
 com.squareup.moshi:moshi-kotlin:1.12.0=classpath
@@ -28,7 +28,7 @@ com.sun.istack:istack-commons-runtime:4.0.1=classpath
 commons-codec:commons-codec:1.17.0=classpath
 commons-io:commons-io:2.6=classpath
 gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:2.2.4=classpath
-gradle.plugin.org.flywaydb:gradle-plugin-publishing:9.22.3=classpath
+gradle.plugin.org.flywaydb:gradle-plugin-publishing:10.21.0=classpath
 io.r2dbc:r2dbc-spi:1.0.0.RELEASE=classpath
 io.spring.gradle:dependency-management-plugin:1.1.6=classpath
 jakarta.activation:jakarta.activation-api:2.1.0=classpath
@@ -40,16 +40,17 @@ nu.studer:gradle-jooq-plugin:9.0=classpath
 org.ajoberstar.grgit:grgit-core:5.3.0=classpath
 org.ajoberstar.grgit:grgit-gradle:5.3.0=classpath
 org.antlr:antlr4-runtime:4.7.2=classpath
-org.apache.commons:commons-compress:1.21=classpath
+org.apache.commons:commons-compress:1.25.0=classpath
 org.apache.commons:commons-lang3:3.12.0=classpath
-org.apache.httpcomponents.client5:httpclient5:5.2.3=classpath
+org.apache.httpcomponents.client5:httpclient5:5.3.1=classpath
 org.apache.httpcomponents.core5:httpcore5-h2:5.2.4=classpath
 org.apache.httpcomponents.core5:httpcore5:5.2.4=classpath
 org.bouncycastle:bcpkix-jdk15on:1.64=classpath
 org.bouncycastle:bcprov-jdk15on:1.64=classpath
 org.codehaus.groovy:groovy:3.0.22=classpath
 org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r=classpath
-org.flywaydb:flyway-core:9.22.3=classpath
+org.flywaydb:flyway-core:10.21.0=classpath
+org.flywaydb:flyway-database-postgresql:10.21.0=classpath
 org.fusesource.jansi:jansi:2.4.0=classpath
 org.glassfish.jaxb:jaxb-core:3.0.2=classpath
 org.glassfish.jaxb:jaxb-runtime:3.0.2=classpath
@@ -95,9 +96,9 @@ org.siouan:frontend-gradle-plugin-jdk11:6.0.0=classpath
 org.slf4j:slf4j-api:1.7.36=classpath
 org.sonarsource.scanner.api:sonar-scanner-api:2.16.2.588=classpath
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:5.1.0.4882=classpath
-org.springframework.boot:spring-boot-buildpack-platform:3.2.11=classpath
-org.springframework.boot:spring-boot-gradle-plugin:3.2.11=classpath
-org.springframework.boot:spring-boot-loader-tools:3.2.11=classpath
+org.springframework.boot:spring-boot-buildpack-platform:3.3.5=classpath
+org.springframework.boot:spring-boot-gradle-plugin:3.3.5=classpath
+org.springframework.boot:spring-boot-loader-tools:3.3.5=classpath
 org.springframework:spring-core:6.1.14=classpath
 org.springframework:spring-jcl:6.1.14=classpath
 org.tomlj:tomlj:1.0.0=classpath

frontend/yarn.lock

@@ -608,9 +608,9 @@ callsites@^3.0.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599:
-  version "1.0.30001613"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001613.tgz#dd84a547458df22c4d2435711a8c957ed88332b8"
-  integrity sha512-BNjJULJfOONQERivfxte7alLfeLW4QnwHvNW4wEcLEbXfV6VSCYvr+REbf2Sojv8tC1THpjPXBxWgDbq4NtLWg==
+  version "1.0.30001679"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz"
+  integrity sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==
 
 chalk@^4.0.0:
   version "4.1.2"