undeprecate the entry-level zipkin things as they are documented

This commit is contained in:
Adrian Cole
2020-05-17 20:25:47 +08:00
parent 60bf5ce497
commit 048227806a
3 changed files with 3 additions and 6 deletions

View File

@@ -60,10 +60,7 @@ import org.springframework.web.client.RestTemplate;
* @since 1.0.0
* @see ZipkinRestTemplateCustomizer
* @see DefaultZipkinRestTemplateCustomizer
* @deprecated This type should have never been public and will be hidden or removed in
* 3.0
*/
@Deprecated
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(ZipkinProperties.class)
@ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" },
@@ -72,6 +69,7 @@ import org.springframework.web.client.RestTemplate;
@AutoConfigureAfter(
name = "org.springframework.cloud.autoconfigure.RefreshAutoConfiguration")
@Import(ZipkinSenderConfigurationImportSelector.class)
// public because the constant REPORTER_BEAN_NAME was documented
public class ZipkinAutoConfiguration {
private static final Log log = LogFactory.getLog(ZipkinAutoConfiguration.class);

View File

@@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @since 1.0.0
*/
@ConfigurationProperties("spring.zipkin")
// TODO: Hide in 3.x, if it isn't already deleted
// public as the senders that use this are in another package
public class ZipkinProperties {
/**

View File

@@ -39,8 +39,7 @@ import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(
webEnvironment = SpringBootTest.WebEnvironment.NONE,
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
classes = { TraceAsyncIntegrationTests.TraceAsyncITestConfiguration.class })
public class TraceAsyncIntegrationTests {