From e0bb3db457bacdece56f402b7354b13471fb7d11 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Fri, 28 Nov 2025 17:35:43 +0900 Subject: [PATCH 1/3] =?UTF-8?q?ci:=20=EB=A1=9C=EA=B9=85=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20zipkin=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 ++ src/main/resources/application-dev.yml | 16 ++++++++---- src/main/resources/logback-dev.xml | 36 ++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/logback-dev.xml diff --git a/build.gradle b/build.gradle index 623b8ad..d74d5ee 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,8 @@ dependencies { implementation 'me.paulschwarz:spring-dotenv:4.0.0' implementation 'org.springframework.security:spring-security-crypto' implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'io.micrometer:micrometer-tracing-bridge-brave' + implementation 'io.zipkin.reporter2:zipkin-reporter-brave' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.mysql:mysql-connector-j' diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9b30ee1..b75f732 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -13,6 +13,7 @@ spring: hibernate: format_sql: true dialect: org.hibernate.dialect.MySQL8Dialect + config: activate: on-profile: dev @@ -21,12 +22,17 @@ server: port: 9000 logging: - level: - org.springframework.security: DEBUG - org.hibernate.SQL: DEBUG - org.hibernate.type.descriptor.sql.BasicBinder: TRACE + config: classpath:logback-dev.xml auth: jwt: private-key-path: ${JWT_PRIVATE_KEY_PATH} - public-key-path: ${JWT_PUBLIC_KEY_PATH} \ No newline at end of file + public-key-path: ${JWT_PUBLIC_KEY_PATH} + +management: + tracing: + sampling: + probability: 1.0 + zipkin: + tracing: + endpoint: ${ZIPKIN_URL}/api/v2/spans \ No newline at end of file diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml new file mode 100644 index 0000000..c5faf7b --- /dev/null +++ b/src/main/resources/logback-dev.xml @@ -0,0 +1,36 @@ + + + + + + + + ${LOG_PATTERN} + + + + + + ${ACTIVE_LOG} + true + + + + logs/application.%d{yyyy-MM-dd}.%i.log + 100MB + + 512MB + + 3 + + + ${LOG_PATTERN} + + + + + + + + \ No newline at end of file From a7bbda580244d1c188c67318ddbaa3732675be8b Mon Sep 17 00:00:00 2001 From: Jeyong Date: Fri, 28 Nov 2025 17:36:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?ci:=20=EC=9E=84=EC=8B=9C=20=ED=8A=B8?= =?UTF-8?q?=EB=A6=AC=EA=B1=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index efc4e90..0a7d0c3 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -1,6 +1,9 @@ name: CD-Dev on: + pull_request: + branches: + - "main" push: branches: ["main"] From 1e86427ce4053691b3cfe740dbd97e2a8cea2e30 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Fri, 28 Nov 2025 18:24:23 +0900 Subject: [PATCH 3/3] =?UTF-8?q?ci:=20=EC=9E=84=EC=8B=9C=20=ED=8A=B8?= =?UTF-8?q?=EB=A6=AC=EA=B1=B0=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 0a7d0c3..efc4e90 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -1,9 +1,6 @@ name: CD-Dev on: - pull_request: - branches: - - "main" push: branches: ["main"]