SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1863 port over default-logging-pattern-enabled flag to v3 (#2196)

Browse Source 
* 1863: port over default-logging-pattern-enabled flag to v3
https://github.com/spring-cloud/spring-cloud-sleuth/issues/1863

* #1863 fix logic + add tests

Co-authored-by: lertlub <ben.lertlumprasertkul@ig.com>
This commit is contained in:
Ben Lertlumprasertkul
2022-08-30 16:33:26 +01:00
committed by GitHub
parent e438bc61b1
commit 64a0be4944
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceEnvironmentPostProcessor.java
View File

@@ -44,8 +44,11 @@ class TraceEnvironmentPostProcessor implements EnvironmentPostProcessor {
// This doesn't work with all logging systems but it's a useful default so you see
// traces in logs without having to configure it.
if (Boolean.parseBoolean(environment.getProperty("spring.sleuth.enabled", "true"))) {
map.put("logging.pattern.level",
"%5p [${spring.zipkin.service.name:" + "${spring.application.name:}},%X{traceId:-},%X{spanId:-}]");
if (Boolean
.parseBoolean(environment.getProperty("spring.sleuth.default-logging-pattern-enabled", "true"))) {
map.put("logging.pattern.level", "%5p [${spring.zipkin.service.name:"
+ "${spring.application.name:}},%X{traceId:-},%X{spanId:-}]");
}
String neverRefereshables = environment.getProperty("spring.cloud.refresh.never-refreshable",
"com.zaxxer.hikari.HikariDataSource");
map.put("spring.cloud.refresh.never-refreshable",

10
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceEnvironmentPostProcessorTests.java
View File

@@ -54,4 +54,14 @@ class TraceEnvironmentPostProcessorTests {
"com.zaxxer.hikari.HikariDataSource,org.springframework.cloud.sleuth.instrument.jdbc.DataSourceWrapper");
}
@Test
void should_not_set_logging_pattern_level_when_config_is_disabled() {
this.mockEnvironment.setProperty("spring.sleuth.enabled", "true");
this.mockEnvironment.setProperty("spring.sleuth.default-logging-pattern-enabled", "false");
new TraceEnvironmentPostProcessor().postProcessEnvironment(this.mockEnvironment, null);
then(this.mockEnvironment.getProperty("logging.pattern.level")).isNullOrEmpty();
}
}