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

Added sleuth data source to the list of non refreshable beans

Browse Source 
fixes gh-2096
This commit is contained in:
Marcin Grzejszczak
2022-01-14 15:40:08 +01:00
parent d5c9cee5b9
commit e7850379e3
2 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ import org.springframework.core.env.PropertySource;
*/
class TraceEnvironmentPostProcessor implements EnvironmentPostProcessor {
private static final String PROPERTY_SOURCE_NAME = "defaultProperties";
static final String PROPERTY_SOURCE_NAME = "defaultProperties";
@Override
public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
@@ -46,6 +46,10 @@ class TraceEnvironmentPostProcessor implements EnvironmentPostProcessor {
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:-}]");
String neverRefereshables = environment.getProperty("spring.cloud.refresh.never-refreshable",
"com.zaxxer.hikari.HikariDataSource");
map.put("spring.cloud.refresh.never-refreshable",
neverRefereshables + ",org.springframework.cloud.sleuth.instrument.jdbc.DataSourceWrapper");
}
addOrReplace(environment.getPropertySources(), map);
}

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

@@ -0,0 +1,57 @@
/*
* Copyright 2013-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.sleuth.autoconfig;
import org.junit.jupiter.api.Test;
import org.springframework.mock.env.MockEnvironment;
import static org.assertj.core.api.BDDAssertions.then;
class TraceEnvironmentPostProcessorTests {
MockEnvironment mockEnvironment = new MockEnvironment();
@Test
void should_do_nothing_when_sleuth_disabled() {
this.mockEnvironment.setProperty("spring.sleuth.enabled", "false");
new TraceEnvironmentPostProcessor().postProcessEnvironment(this.mockEnvironment, null);
then(this.mockEnvironment.getProperty("logging.pattern.level")).isNullOrEmpty();
}
@Test
void should_set_trace_id_pattern_when_sleuth_enabled() {
this.mockEnvironment.setProperty("spring.sleuth.enabled", "true");
new TraceEnvironmentPostProcessor().postProcessEnvironment(this.mockEnvironment, null);
then(this.mockEnvironment.getProperty("logging.pattern.level")).contains("trace");
}
@Test
void should_set_default_non_refreshables_when_sleuth_enabled() {
this.mockEnvironment.setProperty("spring.sleuth.enabled", "true");
new TraceEnvironmentPostProcessor().postProcessEnvironment(this.mockEnvironment, null);
then(this.mockEnvironment.getProperty("spring.cloud.refresh.never-refreshable")).isEqualTo(
"com.zaxxer.hikari.HikariDataSource,org.springframework.cloud.sleuth.instrument.jdbc.DataSourceWrapper");
}
}