Merge branch 'foxlegend-feat/metrics'

worldline · Jul 1, 2024 · e8262be · e8262be
2 parents 0e48240 + 32c5030
commit e8262be
Show file tree

Hide file tree

Showing 8 changed files with 1,370 additions and 37 deletions.
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -3,8 +3,10 @@ image:
 
 vscode:
   extensions:
-    - "vscjava.vscode-java-pack"
-    - "vscjava.vscode-gradle"
+    - vscjava.vscode-java-pack
+    - vscjava.vscode-gradle
+    - vmware.vscode-boot-dev-pack
+    - ms-azuretools.vscode-docker
 
 tasks:
   - name: Download Grafana OpenTelemetry Java agent
@@ -15,4 +17,4 @@ tasks:
     init: gp sync-await agent && gp sync-await gradle
     env:
       COMPOSE_PARALLEL_LIMIT: 1
-    command: docker compose up -d --build
+    command: docker compose up -d --build
diff --git a/config-server/src/main/docker/Dockerfile b/config-server/src/main/docker/Dockerfile
@@ -21,6 +21,8 @@ ENV LOGS_DIRECTORY=/logs/
 ARG UID=1000
 ARG GID=1000
 
+RUN apk add --no-cache curl
+
 RUN addgroup --system --gid ${GID} javauser && adduser -S -s /usr/sbin/nologin --uid ${UID} -G javauser javauser
 
 ARG DEPENDENCY=/workspace/app/${SERVICE}/build/dependency
@@ -30,8 +32,6 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
 
 RUN chown -R javauser:javauser /app
 
-RUN apk add --no-cache curl
-
 USER javauser
 
 COPY instrumentation/grafana-opentelemetry-java.jar /app/grafana-opentelemetry-java.jar

diff --git a/config-server/src/main/resources/application.properties b/config-server/src/main/resources/application.properties
@@ -10,4 +10,4 @@ spring.cloud.config.server.native.searchLocations=classpath:/config-server
 management.server.port=8890
 management.endpoints.web.exposure.include=*
 
-logging.file.name=${LOGS_DIRECTORY:../logs}/${spring.application.instance:${spring.application.name:spring}}.log
+logging.file.name=${LOGS_DIRECTORY:../logs}/${spring.application.name:spring}.log
diff --git a/config-server/src/main/resources/config-server/application.yml b/config-server/src/main/resources/config-server/application.yml
@@ -37,19 +37,27 @@ management:
       application: ${spring.application.name}
       instance: ${spring.application.instance}
       namespace: local
-      metrics:
     distribution:
       percentiles-histogram:
         http:
           server:
             requests: true
+      percentiles:
+        http:
+          server:
+            requests:
+              - 0.5
+              - 0.9
+              - 0.95
+              - 0.99
+              - 0.999
 
 logging:
   level:
     org.springframework: INFO
 
   file:
-    name: ${LOGS_DIRECTORY:../logs}/${spring.application.instance:${spring.application.name:spring}}.log
+    name: ${LOGS_DIRECTORY:../logs}/${spring.application.name:spring}.log
 
 ---