fix local config

Signed-off-by: Peter Siegmund <developer@mars3142.org>

Dockerfile

@@ -14,6 +14,8 @@ COPY --chown=app ./gradle/ ./gradle
 COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./app.json ./
 COPY --chown=app ./src ./src
 
+RUN curl -OL https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
+
 # Build the production package
 RUN ./gradlew clean build -x test
 
@@ -24,6 +26,11 @@ RUN useradd -m app
 USER app
 
 COPY --chown=app --from=build /usr/src/app/build/libs/*-SNAPSHOT.jar /usr/app/config.jar
+COPY --chown=app --from=build /usr/src/app/opentelemetry-javaagent.jar /usr/app/opentelemetry-javaagent.jar
+
+ENV JAVA_TOOL_OPTIONS="-javaagent:/usr/app/opentelemetry-javaagent.jar"
+ENV OTEL_SERVICE_NAME="config-service"
+ENV OTEL_EXPORTER_OTLP_ENDPOINT="http://opentelemetry-collector.web:4318"
 
 HEALTHCHECK CMD curl --fail http://localhost:5000/actuator/health || exit 1
 

build.gradle

@@ -1,8 +1,7 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.3.4'
+	id 'org.springframework.boot' version '3.4.0'
 	id 'io.spring.dependency-management' version '1.1.6'
-	id "io.sentry.jvm.gradle" version "4.11.0"
 }
 
 group = 'dev.mars3142.fhq'
@@ -25,7 +24,7 @@ repositories {
 }
 
 ext {
-	set('springCloudVersion', "2023.0.3")
+	set('springCloudVersion', "2024.0.0")
 }
 
 dependencies {

src/main/resources/application.yml

@@ -17,11 +17,9 @@ spring:
         native:
           search-locations: classpath:/configurations
         git:
-          uri: https://github.com/${GIT_USER}/configuration.git
+          uri: https://github.com/${GIT_USER}/remote-config.git
           username: ${GIT_USER}
           password: ${GIT_TOKEN}
-          clone-on-start: true
           default-label: main
-          searchPaths: configurations
   profiles:
     active: native

src/main/resources/configurations/application.yml

@@ -14,15 +14,16 @@ info:
 
 logging:
   level:
-    com:
-      netflix:
-        discovery: off
+    com.netflix.discovery: off
 
 management:
   endpoint:
     health:
       probes:
         enabled: true
+    web:
+      exposure:
+        include: refresh, bus-refresh, beans, env
 
 sentry:
   dsn: https://354321d371291036cffcdb5b1a72fd6e@o394865.ingest.us.sentry.io/4507718826262528

src/main/resources/configurations/edge-service.yml

@@ -1,6 +1,25 @@
 server:
   port: ${PORT:8080}
 
+springdoc:
+  enable-native-support: true
+  api-docs:
+    enabled: true
+  swagger-ui:
+    enabled: true
+    path: /swagger-ui.html
+    config-url: /v3/api-docs/swagger-config
+    urls:
+      - url: /v3/api-docs
+        name: API Gateway Service
+        primaryName: API Gateway Service
+      - url: /timezone-service/v3/api-docs
+        name: Timezone Service
+        primaryName: Timezone Service
+      - url: /google-service/v3/api-docs
+        name: Google Service
+        primaryName: Google Service
+
 spring:
   cloud:
     gateway:
@@ -18,33 +37,26 @@ spring:
         locator:
           enabled: false
       routes:
-        - id: edge
-          uri: lb://edge-service
-          predicates:
-            - Path=/v3/api-docs/**
-          filters:
-            - RewritePath=/v3/api-docs/(?<path>.*), /$\{path}/v3/api-docs
-
         - id: timezone-service
           uri: lb://timezone-service
           predicates:
-            - Path=/v1/timezone/**, /health/timezone, /timezone/v3/api-docs
+            - Path=/v1/timezone/**, /health/timezone, /timezone-service/v3/api-docs
           filters:
             - RewritePath=/health/timezone, /actuator/health
-            - RewritePath=/timezone/(?<segment>.*), /$\{segment}
+            - RewritePath=/timezone-service/(?<segment>.*), /$\{segment}
 
         - id: google-service
           uri: ${GOOGLE_SERVICE_URI:http://google-service.web:8080}
           predicates:
-            - Path=/v1/account/**, /health/google, /google/v3/api-docs
+            - Path=/v1/account/**, /health/google, /google-service/v3/api-docs
           filters:
             - RewritePath=/health/google, /actuator/health
-            - RewritePath=/google/(?<segment>.*), /$\{segment}
+            - RewritePath=/google-service/(?<segment>.*), /$\{segment}
 
         - id: token-service
           uri: ${BACKEND_SERVICE_URI:http://backend-service.web:8080}
           predicates:
-            - Path=/v1/token/**, /health/backend, /token/v3/api-docs
+            - Path=/v1/token/**, /health/backend, /token-service/v3/api-docs
           filters:
             - RewritePath=/health/backend, /actuator/health
-            - RewritePath=/token/(?<segment>.*), /$\{segment}
+            - RewritePath=/token-service/(?<segment>.*), /$\{segment}