From 50a69b5895c26ea5338d3ba6791d8fa50c1b02e3 Mon Sep 17 00:00:00 2001 From: Jimin Lim <50178026+jimin3263@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:20:28 +0900 Subject: [PATCH] =?UTF-8?q?[feat=20#135]=20=ED=94=84=EB=A1=9C=EB=A9=94?= =?UTF-8?q?=ED=85=8C=EC=9A=B0=EC=8A=A4=20=EC=84=A4=EC=A0=95=20(#136)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 프로메테우스 설정 * chore: 프로메테우스 설정 --- .github/workflows/api-deploy.yml | 2 ++ adapters/in-web/build.gradle.kts | 1 + .../src/main/kotlin/com/pokit/auth/config/SecurityConfig.kt | 3 ++- .../kotlin/com/pokit/auth/filter/CustomAuthenticationFilter.kt | 3 ++- entry/web/src/main/kotlin/com/pokit/WebApplication.kt | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/api-deploy.yml b/.github/workflows/api-deploy.yml index 96691e25..d9722d69 100644 --- a/.github/workflows/api-deploy.yml +++ b/.github/workflows/api-deploy.yml @@ -44,6 +44,8 @@ jobs: echo "${{ secrets.OUT_WEB_YML }}" > ./adapters/out-web/src/main/resources/application-out-web.yml mkdir -p ./application/src/main/resources echo "${{ secrets.APPLICATION_CORE }}" > ./application/src/main/resources/application-core.yml + mkdir -p ./adapters/in-web/src/main/resources + echo "${{ secrets.APPLICATION_IN_WEB_YML }}" > ./application/src/main/resources/application-in-web.yml - name: Build with Gradle run: ./gradlew :entry:web:build --no-daemon diff --git a/adapters/in-web/build.gradle.kts b/adapters/in-web/build.gradle.kts index dcf3b52f..c09d6af0 100644 --- a/adapters/in-web/build.gradle.kts +++ b/adapters/in-web/build.gradle.kts @@ -14,6 +14,7 @@ dependencies { // 라이브러리 implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("io.micrometer:micrometer-registry-prometheus") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.data:spring-data-commons") implementation("org.springframework.boot:spring-boot-starter-validation") diff --git a/adapters/in-web/src/main/kotlin/com/pokit/auth/config/SecurityConfig.kt b/adapters/in-web/src/main/kotlin/com/pokit/auth/config/SecurityConfig.kt index a9bc2234..ee022b66 100644 --- a/adapters/in-web/src/main/kotlin/com/pokit/auth/config/SecurityConfig.kt +++ b/adapters/in-web/src/main/kotlin/com/pokit/auth/config/SecurityConfig.kt @@ -27,7 +27,8 @@ class SecurityConfig( "/swagger-ui/**", "/api-docs", "/api-docs/**", - "/v3/api-docs/**" + "/v3/api-docs/**", + "/actuator/prometheus", ) } diff --git a/adapters/in-web/src/main/kotlin/com/pokit/auth/filter/CustomAuthenticationFilter.kt b/adapters/in-web/src/main/kotlin/com/pokit/auth/filter/CustomAuthenticationFilter.kt index 30441511..947f8fb5 100644 --- a/adapters/in-web/src/main/kotlin/com/pokit/auth/filter/CustomAuthenticationFilter.kt +++ b/adapters/in-web/src/main/kotlin/com/pokit/auth/filter/CustomAuthenticationFilter.kt @@ -35,7 +35,8 @@ class CustomAuthenticationFilter( "/swagger-ui/**", "/api-docs", "/api-docs/**", - "/v3/api-docs/**" + "/v3/api-docs/**", + "/actuator/prometheus", ) val path = request.requestURI val shouldNotFilter = diff --git a/entry/web/src/main/kotlin/com/pokit/WebApplication.kt b/entry/web/src/main/kotlin/com/pokit/WebApplication.kt index 22470873..36d8aba1 100644 --- a/entry/web/src/main/kotlin/com/pokit/WebApplication.kt +++ b/entry/web/src/main/kotlin/com/pokit/WebApplication.kt @@ -9,6 +9,6 @@ import org.springframework.boot.runApplication class WebApplication fun main(args: Array) { - System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence") + System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-in-web") runApplication(*args) }