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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Adrian Cole
2020-05-16 16:31:42 +08:00
parent 8ae5e13d31 c1a83aa5bb
commit eca5ea6db0
16 changed files with 16 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java
View File

@@ -25,11 +25,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* @author Spencer Gibb
* @since 1.0.0
* @deprecated This type should have never been public and will be hidden or removed in
* 3.0
*/
@Deprecated
@ConfigurationProperties("spring.zipkin")
// TODO: Hide in 3.x, if it isn't already deleted
public class ZipkinProperties {
/**

1
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinSenderProperties.java
View File

@@ -25,6 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @since 1.3.1
*/
@ConfigurationProperties("spring.zipkin.sender")
// TODO: Hide in 3.x, if it isn't already deleted
public class ZipkinSenderProperties {
/**