From 2d6f8564db0c1502206737d72f2f62f4831fd354 Mon Sep 17 00:00:00 2001 From: fishtailfu Date: Fri, 26 Sep 2025 11:15:39 +0800 Subject: [PATCH 1/2] fix: fix circuitbreaker-logger --- .../src/main/resources/polaris-log4j.xml | 4 ++-- .../src/main/resources/polaris-log4j2.xml | 6 +++--- .../src/main/resources/polaris-logback.xml | 6 +++--- .../src/main/resources/polaris-log4j.xml | 4 ++-- .../src/main/resources/polaris-log4j2.xml | 6 +++--- .../src/main/resources/polaris-logback.xml | 6 +++--- .../src/main/resources/polaris-log4j.xml | 4 ++-- .../src/main/resources/polaris-log4j2.xml | 6 +++--- .../src/main/resources/polaris-logback.xml | 6 +++--- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-log4j.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-log4j.xml index f338d38a..ba87029f 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-log4j.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-log4j.xml @@ -29,7 +29,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-log4j2.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-log4j2.xml index 81a556d3..2294d3ef 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-log4j2.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-log4j2.xml @@ -35,8 +35,8 @@ + fileName="${sys:polaris.log.home}/polaris-circuitbreaker.log" + filePattern="${sys:polaris.log.home}/polaris-circuitbreaker.log.%d{yyyy-MM-dd}.%i"> %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n @@ -113,7 +113,7 @@ additivity="false"> - diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-logback.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-logback.xml index b0768896..113a0fa7 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-logback.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/src/main/resources/polaris-logback.xml @@ -41,10 +41,10 @@ - ${polaris.log.home}/polaris-circuitbreaker-event.log + ${polaris.log.home}/polaris-circuitbreaker.log - ${polaris.log.home}/polaris-circuitbreaker-event.log.%i + ${polaris.log.home}/polaris-circuitbreaker.log.%i ${polaris.circuitbreaker.event.log.retain.count:-7} @@ -137,7 +137,7 @@ - diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-log4j.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-log4j.xml index f338d38a..ba87029f 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-log4j.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-log4j.xml @@ -29,7 +29,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-log4j2.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-log4j2.xml index 81a556d3..2294d3ef 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-log4j2.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-log4j2.xml @@ -35,8 +35,8 @@ + fileName="${sys:polaris.log.home}/polaris-circuitbreaker.log" + filePattern="${sys:polaris.log.home}/polaris-circuitbreaker.log.%d{yyyy-MM-dd}.%i"> %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n @@ -113,7 +113,7 @@ additivity="false"> - diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-logback.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-logback.xml index b0768896..113a0fa7 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-logback.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/resources/polaris-logback.xml @@ -41,10 +41,10 @@ - ${polaris.log.home}/polaris-circuitbreaker-event.log + ${polaris.log.home}/polaris-circuitbreaker.log - ${polaris.log.home}/polaris-circuitbreaker-event.log.%i + ${polaris.log.home}/polaris-circuitbreaker.log.%i ${polaris.circuitbreaker.event.log.retain.count:-7} @@ -137,7 +137,7 @@ - diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-log4j.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-log4j.xml index f338d38a..ba87029f 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-log4j.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-log4j.xml @@ -29,7 +29,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-log4j2.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-log4j2.xml index 81a556d3..2294d3ef 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-log4j2.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-log4j2.xml @@ -35,8 +35,8 @@ + fileName="${sys:polaris.log.home}/polaris-circuitbreaker.log" + filePattern="${sys:polaris.log.home}/polaris-circuitbreaker.log.%d{yyyy-MM-dd}.%i"> %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n @@ -113,7 +113,7 @@ additivity="false"> - diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-logback.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-logback.xml index b0768896..113a0fa7 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-logback.xml +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/polaris-logback.xml @@ -41,10 +41,10 @@ - ${polaris.log.home}/polaris-circuitbreaker-event.log + ${polaris.log.home}/polaris-circuitbreaker.log - ${polaris.log.home}/polaris-circuitbreaker-event.log.%i + ${polaris.log.home}/polaris-circuitbreaker.log.%i ${polaris.circuitbreaker.event.log.retain.count:-7} @@ -137,7 +137,7 @@ - From c9358dd73657cba86f37d5eaf5c782004881a1ba Mon Sep 17 00:00:00 2001 From: fishtailfu Date: Fri, 26 Sep 2025 11:42:53 +0800 Subject: [PATCH 2/2] fix: fix circuitbreaker-logger --- .../src/main/resources/polaris-log4j.xml | 103 +++++++++++ .../src/main/resources/polaris-log4j2.xml | 142 +++++++++++++++ .../src/main/resources/polaris-logback.xml | 163 ++++++++++++++++++ 3 files changed, 408 insertions(+) create mode 100644 polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-log4j.xml create mode 100644 polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-log4j2.xml create mode 100644 polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-logback.xml diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-log4j.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-log4j.xml new file mode 100644 index 00000000..3de7ee37 --- /dev/null +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-log4j.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-log4j2.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-log4j2.xml new file mode 100644 index 00000000..2294d3ef --- /dev/null +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-log4j2.xml @@ -0,0 +1,142 @@ + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n + + + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n + + + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n + + + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n + + + + + + + + + + + + + %m|%d{yyyy-MM-dd HH:mm:ss.SSS}%n + + + + + + + + + + + + + %m|%d{yyyy-MM-dd HH:mm:ss.SSS}%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-logback.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-logback.xml new file mode 100644 index 00000000..113a0fa7 --- /dev/null +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/src/main/resources/polaris-logback.xml @@ -0,0 +1,163 @@ + + + + polaris + + + + ${polaris.log.home}/polaris.log + + + ${polaris.log.home}/polaris.log.%i + ${polaris.log.retain.count:-7} + + + + ${polaris.log.file.size:-10MB} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n + + + + + ${polaris.log.home}/polaris-update-event.log + + + ${polaris.log.home}/polaris-update-event.log.%i + ${polaris.update.event.log.retain.count:-7} + + + + ${polaris.update.event.log.file.size:-10MB} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n + + + + + ${polaris.log.home}/polaris-circuitbreaker.log + + + ${polaris.log.home}/polaris-circuitbreaker.log.%i + + ${polaris.circuitbreaker.event.log.retain.count:-7} + + + + ${polaris.circuitbreaker.event.log.file.size:-10MB} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n + + + + + ${polaris.log.home}/polaris-healthcheck-event.log + + + ${polaris.log.home}/polaris-healthcheck-event.log.%i + + ${polaris.healthcheck.event.log.retain.count:-7} + + + + ${polaris.healthcheck.event.log.file.size:-10MB} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n + + + + + ${polaris.log.home}/polaris-lossless-event.log + + + ${polaris.log.home}/polaris-lossless-event.log.%i + + ${polaris.lossless.event.log.retain.count:-7} + + + + ${polaris.lossless.event.log.file.size:-10MB} + + + + %m|%d{yyyy-MM-dd HH:mm:ss.SSS}%n + + + + + ${polaris.log.home}/polaris-instance-heartbeat.log + + + ${polaris.log.home}/polaris-instance-heartbeat.log.%i + + ${polaris.instance.heartbeat.log.retain.count:-7} + + + + ${polaris.instance.heartbeat.log.file.size:-10MB} + + + + %m|%d{yyyy-MM-dd HH:mm:ss.SSS}%n + + + + + 0 + 512 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +