chore: Update dependencies

Signed-off-by: Thomas Vitale <[email protected]>
ThomasVitale · Apr 17, 2024 · 1f9caec · 1f9caec
1 parent 0d74a7e
commit 1f9caec
Show file tree

Hide file tree

Showing 16 changed files with 5,126 additions and 4,346 deletions.
diff --git a/chat-service/build.gradle b/chat-service/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.2.2'
+    id 'org.springframework.boot' version '3.2.4'
     id 'io.spring.dependency-management' version '1.1.4'
     id 'org.cyclonedx.bom' version '1.8.2'
 }
@@ -16,7 +16,7 @@ java {
 
 repositories {
     mavenCentral()
-    maven { url 'https://repo.spring.io/snapshot' }
+    maven { url 'https://repo.spring.io/milestone' }
 }
 
 dependencies {
@@ -25,11 +25,11 @@ dependencies {
     implementation 'io.micrometer:micrometer-tracing-bridge-otel'
     implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
 
-    implementation 'org.springframework.ai:spring-ai-ollama-spring-boot-starter:0.8.0-SNAPSHOT'
-    implementation 'org.springframework.ai:spring-ai-chroma-store-spring-boot-starter:0.8.0-SNAPSHOT'
+    implementation 'org.springframework.ai:spring-ai-ollama-spring-boot-starter:0.8.1'
+    implementation 'org.springframework.ai:spring-ai-chroma-store-spring-boot-starter:0.8.1'
 
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
-    runtimeOnly 'com.github.loki4j:loki-logback-appender:1.5.0-m1'
+    runtimeOnly 'com.github.loki4j:loki-logback-appender:1.5.1'
 
     testAndDevelopmentOnly 'org.springframework.boot:spring-boot-devtools'
 

diff --git a/chat-service/gradle/wrapper/gradle-wrapper.jar b/chat-service/gradle/wrapper/gradle-wrapper.jar
diff --git a/chat-service/gradle/wrapper/gradle-wrapper.properties b/chat-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/compose.yml b/compose.yml
@@ -3,11 +3,11 @@ services:
   # Applications
 
   keycloak:
-    image: quay.io/keycloak/keycloak:23.0
+    image: quay.io/keycloak/keycloak:24.0
     container_name: keycloak
     command: start-dev --import-realm --metrics-enabled=true
     depends_on:
-      - grafana-agent
+      - alloy
     volumes:
       - ./platform/keycloak:/opt/keycloak/data/import
     environment:
@@ -19,10 +19,10 @@ services:
   # Data
 
   chroma:
-    image: ghcr.io/chroma-core/chroma:0.4.22
+    image: ghcr.io/chroma-core/chroma:0.4.24
     container_name: chroma
     depends_on:
-      - grafana-agent
+      - alloy
     ports:
       - 8000:8000
     environment:
@@ -32,10 +32,10 @@ services:
       - ANONYMIZED_TELEMETRY=False
 
   postgres:
-    image: docker.io/library/postgres:15.5
+    image: docker.io/library/postgres:16.2
     container_name: postgres
     depends_on:
-      - grafana-agent
+      - alloy
     environment:
       - POSTGRES_USER=user
       - POSTGRES_PASSWORD=password
@@ -47,7 +47,7 @@ services:
   # Observability
 
   grafana:
-    image: docker.io/grafana/grafana-oss:10.3.1
+    image: docker.io/grafana/grafana-oss:10.4.2
     container_name: grafana
     depends_on:
       - loki
@@ -71,7 +71,7 @@ services:
     restart: unless-stopped
 
   loki:
-    image: docker.io/grafana/loki:2.9.4
+    image: docker.io/grafana/loki:2.9.7
     container_name: loki
     command: -config.file=/etc/config/loki.yml
     ports:
@@ -82,7 +82,7 @@ services:
     restart: unless-stopped
 
   prometheus:
-    image: quay.io/prometheus/prometheus:v2.49.1
+    image: quay.io/prometheus/prometheus:v2.51.2
     container_name: prometheus
     command:
       - "--config.file=/etc/config/prometheus.yml"
@@ -97,7 +97,7 @@ services:
     restart: unless-stopped
 
   tempo:
-    image: docker.io/grafana/tempo:2.3.1
+    image: docker.io/grafana/tempo:2.4.1
     container_name: tempo
     command: -config.file /etc/tempo-config.yml
     ports:
@@ -110,22 +110,21 @@ services:
       - ./platform/tempo/tempo.yml:/etc/tempo-config.yml
     restart: unless-stopped
 
-  grafana-agent:
-    image: docker.io/grafana/agent:v0.39.1
-    container_name: grafana-agent
+  alloy:
+    image: docker.io/grafana/alloy:v1.0.0
+    container_name: alloy
     command:
       - "run"
       - "--server.http.listen-addr=0.0.0.0:12345"
-      - "--storage.path=/data-agent"
+      - "--storage.path=/data-alloy"
       - "--disable-reporting"
-      - "/etc/agent/config.river"
+      - "/etc/alloy/config.alloy"
     depends_on:
       - loki
       - prometheus
       - tempo
     hostname: ${HOST_NAME:-localhost}
     environment:
-      - AGENT_MODE=flow
       - ENVIRONMENT=dev
       - LOKI_URL=http://loki:3100/loki/api/v1/push
       - PROMETHEUS_URL=http://prometheus:9090/api/v1/write
@@ -137,12 +136,12 @@ services:
       - "4317:4317"
       - "4318:4318"
     volumes:
-      - ./platform/agent/agent.river:/etc/agent/config.river
+      - ./platform/alloy/config.alloy:/etc/alloy/config.alloy
       - /var/run/docker.sock:/var/run/docker.sock
-      - grafana-agent-data:/data-agent
+      - alloy-data:/data-alloy
     restart: unless-stopped
 
 volumes:
-  grafana-agent-data: { }
+  alloy-data: { }
   grafana-data: { }
   postgres-data: { }
diff --git a/edge-service/build.gradle b/edge-service/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.2.2'
+	id 'org.springframework.boot' version '3.2.4'
 	id 'io.spring.dependency-management' version '1.1.4'
 	id 'org.cyclonedx.bom' version '1.8.2'
 }
@@ -25,7 +25,7 @@ repositories {
 }
 
 ext {
-	set('springCloudVersion', "2023.0.0")
+	set('springCloudVersion', "2023.0.1")
 }
 
 dependencies {
@@ -37,7 +37,7 @@ dependencies {
     implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
 
 	runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
-    runtimeOnly 'com.github.loki4j:loki-logback-appender:1.5.0-m1'
+    runtimeOnly 'com.github.loki4j:loki-logback-appender:1.5.1'
 
 	// Only on Apple Silicon. Why it's necessary: https://github.com/netty/netty/issues/11020
 	runtimeOnly 'io.netty:netty-resolver-dns-native-macos:4.1.105.Final:osx-aarch_64'

diff --git a/edge-service/gradle/wrapper/gradle-wrapper.jar b/edge-service/gradle/wrapper/gradle-wrapper.jar
diff --git a/edge-service/gradle/wrapper/gradle-wrapper.properties b/edge-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/instrument-service/build.gradle b/instrument-service/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.2.2'
+	id 'org.springframework.boot' version '3.2.4'
 	id 'io.spring.dependency-management' version '1.1.4'
 	id 'org.cyclonedx.bom' version '1.8.2'
 }
@@ -38,7 +38,7 @@ dependencies {
 
 	runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
 	runtimeOnly 'org.postgresql:postgresql'
-	runtimeOnly 'com.github.loki4j:loki-logback-appender:1.5.0-m1'
+	runtimeOnly 'com.github.loki4j:loki-logback-appender:1.5.1'
 
 	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 

diff --git a/instrument-service/gradle/wrapper/gradle-wrapper.jar b/instrument-service/gradle/wrapper/gradle-wrapper.jar
diff --git a/instrument-service/gradle/wrapper/gradle-wrapper.properties b/instrument-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/...ce/src/test/java/com/thomasvitale/instrumentservice/TestInstrumentServiceApplication.java b/...ce/src/test/java/com/thomasvitale/instrumentservice/TestInstrumentServiceApplication.java
@@ -14,7 +14,7 @@ public class TestInstrumentServiceApplication {
     @RestartScope
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:15.5");
+        return new PostgreSQLContainer<>("postgres:15.6");
     }
 
     public static void main(String[] args) {

diff --git a/platform/agent/agent.river → platform/alloy/config.alloy b/platform/agent/agent.river → platform/alloy/config.alloy
@@ -1,5 +1,5 @@
 /********************************************
- * Agent
+ * Alloy
  ********************************************/
 
 logging {
@@ -16,7 +16,7 @@ tracing {
  * Metrics
  ********************************************/
 
-prometheus.exporter.agent "default" {}
+prometheus.exporter.self "default" {}
 
 prometheus.exporter.postgres "default" {
   data_source_names = [
@@ -26,7 +26,7 @@ prometheus.exporter.postgres "default" {
 
 prometheus.scrape "exporters" {
   targets = concat(
-    prometheus.exporter.agent.default.targets,
+    prometheus.exporter.self.default.targets,
     prometheus.exporter.postgres.default.targets,
   )
 
@@ -39,27 +39,27 @@ prometheus.scrape "exporters" {
 
 prometheus.scrape "services" {
   targets = [
-    {
-      __address__       = "host.docker.internal:80",
-      __metrics_path__  = "/actuator/prometheus",
-      job               = "services/spring-boot",
-    },
-    {
-      __address__       = "host.docker.internal:8181",
-      __metrics_path__  = "/actuator/prometheus",
-      job               = "services/spring-boot",
-    },
-    {
-      __address__       = "host.docker.internal:8282",
-      __metrics_path__  = "/actuator/prometheus",
-      job               = "services/spring-boot",
-    },
-    {
-      __address__       = "host.docker.internal:8080",
-      __metrics_path__  = "/metrics",
-      job               = "services/quarkus",
-      application       = "keycloak",
-    },
+      {
+        __address__       = "host.docker.internal:80",
+        __metrics_path__  = "/actuator/prometheus",
+        job               = "services/spring-boot",
+      },
+      {
+        __address__       = "host.docker.internal:8181",
+        __metrics_path__  = "/actuator/prometheus",
+        job               = "services/spring-boot",
+      },
+      {
+        __address__       = "host.docker.internal:8282",
+        __metrics_path__  = "/actuator/prometheus",
+        job               = "services/spring-boot",
+      },
+      {
+        __address__       = "host.docker.internal:8080",
+        __metrics_path__  = "/metrics",
+        job               = "services/quarkus",
+        application       = "keycloak",
+      },
   ]
 
   job_name        = "services"
@@ -102,11 +102,11 @@ discovery.relabel "containers" {
   }
 
   rule {
-      action        = "replace"
-      source_labels = ["__meta_docker_container_label_org_opencontainers_image_version"]
-      regex         = "/(.*)"
-      target_label  = "version"
-    }
+    action        = "replace"
+    source_labels = ["__meta_docker_container_label_org_opencontainers_image_version"]
+    regex         = "/(.*)"
+    target_label  = "version"
+  }
 }
 
 loki.source.docker "services" {
@@ -116,10 +116,10 @@ loki.source.docker "services" {
 }
 
 loki.write "default" {
-	endpoint {
-		url = env("LOKI_URL")
-	}
-	external_labels = {
+  endpoint {
+	url = env("LOKI_URL")
+  }
+  external_labels = {
     environment = env("ENVIRONMENT"),
     hostname    = env("HOSTNAME"),
   }