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

Fixed a lot of checkstyle warnings'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-10-01 12:29:33 +02:00
parent 6f5ef23674
commit 99d38afc69
268 changed files with 6488 additions and 4456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleBackground.java
View File

@@ -31,6 +31,7 @@ public class SampleBackground {
@Autowired
private Tracer tracer;
private Random random = new Random();
@Async

21
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java
View File

@@ -34,26 +34,30 @@ import org.springframework.web.client.RestTemplate;
* @author Spencer Gibb
*/
@RestController
public class SampleController implements
ApplicationListener<ServletWebServerInitializedEvent> {
public class SampleController
implements ApplicationListener<ServletWebServerInitializedEvent> {
private static final Log log = LogFactory.getLog(SampleController.class);
@Autowired
private RestTemplate restTemplate;
@Autowired
private Tracer tracer;
@Autowired
private SampleBackground controller;
private Random random = new Random();
private int port;
@RequestMapping("/")
public String hi() throws InterruptedException {
Thread.sleep(this.random.nextInt(1000));
log.info("Home page");
String s = this.restTemplate.getForObject("http://localhost:" + this.port
+ "/hi2", String.class);
String s = this.restTemplate
.getForObject("http://localhost:" + this.port + "/hi2", String.class);
return "hi/" + s;
}
@@ -95,8 +99,8 @@ ApplicationListener<ServletWebServerInitializedEvent> {
Thread.sleep(millis);
this.tracer.currentSpan().tag("random-sleep-millis", String.valueOf(millis));
String s = this.restTemplate.getForObject("http://localhost:" + this.port
+ "/call", String.class);
String s = this.restTemplate
.getForObject("http://localhost:" + this.port + "/call", String.class);
span.finish();
return "traced/" + s;
}
@@ -107,8 +111,8 @@ ApplicationListener<ServletWebServerInitializedEvent> {
log.info(String.format("Sleeping for [%d] millis", millis));
Thread.sleep(millis);
this.tracer.currentSpan().tag("random-sleep-millis", String.valueOf(millis));
String s = this.restTemplate.getForObject("http://localhost:" + this.port
+ "/call", String.class);
String s = this.restTemplate
.getForObject("http://localhost:" + this.port + "/call", String.class);
return "start/" + s;
}
@@ -116,4 +120,5 @@ ApplicationListener<ServletWebServerInitializedEvent> {
public void onApplicationEvent(ServletWebServerInitializedEvent event) {
this.port = event.getSource().getPort();
}
}

71
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java
View File

@@ -50,17 +50,23 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.BDDAssertions.then;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = { WaitUntilZipkinIsUpConfig.class, SampleZipkinApplication.class },
webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@TestPropertySource(properties = {"sample.zipkin.enabled=true"})
@SpringBootTest(classes = { WaitUntilZipkinIsUpConfig.class,
SampleZipkinApplication.class }, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@TestPropertySource(properties = { "sample.zipkin.enabled=true" })
public class ZipkinTests extends AbstractIntegrationTest {
@ClassRule public static final MockWebServer zipkin = new MockWebServer();
@ClassRule
public static final MockWebServer zipkin = new MockWebServer();
private static final String APP_NAME = "testsleuthzipkin";
@Value("${local.server.port}")
private int port = 3380;
private String sampleAppUrl = "http://localhost:" + this.port;
@Autowired ZipkinProperties zipkinProperties;
@Autowired
ZipkinProperties zipkinProperties;
@Test
public void should_propagate_spans_to_zipkin() throws Exception {
@@ -68,15 +74,14 @@ public class ZipkinTests extends AbstractIntegrationTest {
long traceId = new Random().nextLong();
await().atMost(10, SECONDS).untilAsserted(() ->
httpMessageWithTraceIdInHeadersIsSuccessfullySent(
this.sampleAppUrl + "/hi2", traceId).run()
);
await().atMost(10, SECONDS)
.untilAsserted(() -> httpMessageWithTraceIdInHeadersIsSuccessfullySent(
this.sampleAppUrl + "/hi2", traceId).run());
spansSentToZipkin(zipkin, traceId);
}
String getAppName() {
String getAppName() {
return APP_NAME;
}
@@ -91,21 +96,27 @@ public class ZipkinTests extends AbstractIntegrationTest {
return zipkinProperties;
}
@Bean Sampler sampler() {
@Bean
Sampler sampler() {
return Sampler.ALWAYS_SAMPLE;
}
}
void spansSentToZipkin(MockWebServer zipkin, long traceId)
throws InterruptedException {
RecordedRequest request = zipkin.takeRequest();
List<Span> spans = SpanBytesDecoder.JSON_V2.decodeList(request.getBody().readByteArray());
List<Span> spans = SpanBytesDecoder.JSON_V2
.decodeList(request.getBody().readByteArray());
List<String> traceIdsNotFoundInZipkin = traceIdsNotFoundInZipkin(spans, traceId);
List<String> serviceNamesNotFoundInZipkin = serviceNamesNotFoundInZipkin(spans);
List<String> tagsNotFoundInZipkin = hasRequiredTag(spans);
log.info(String.format("The following trace IDs were not found in Zipkin [%s]", traceIdsNotFoundInZipkin));
log.info(String.format("The following services were not found in Zipkin [%s]", serviceNamesNotFoundInZipkin));
log.info(String.format("The following tags were not found in Zipkin [%s]", tagsNotFoundInZipkin));
log.info(String.format("The following trace IDs were not found in Zipkin [%s]",
traceIdsNotFoundInZipkin));
log.info(String.format("The following services were not found in Zipkin [%s]",
serviceNamesNotFoundInZipkin));
log.info(String.format("The following tags were not found in Zipkin [%s]",
tagsNotFoundInZipkin));
then(traceIdsNotFoundInZipkin).isEmpty();
then(serviceNamesNotFoundInZipkin).isEmpty();
then(tagsNotFoundInZipkin).isEmpty();
@@ -114,24 +125,17 @@ public class ZipkinTests extends AbstractIntegrationTest {
List<String> traceIdsNotFoundInZipkin(List<Span> spans, long traceId) {
String traceIdString = SpanUtil.idToHex(traceId);
Optional<String> traceIds = spans.stream()
.map(Span::traceId)
.filter(traceIdString::equals)
.findFirst();
return traceIds.isPresent() ? Collections.emptyList() : Collections.singletonList(traceIdString);
Optional<String> traceIds = spans.stream().map(Span::traceId)
.filter(traceIdString::equals).findFirst();
return traceIds.isPresent() ? Collections.emptyList()
: Collections.singletonList(traceIdString);
}
List<String> serviceNamesNotFoundInZipkin(List<Span> spans) {
List<String> localServiceNames = spans.stream()
.map(Span::localServiceName)
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
List<String> remoteServiceNames = spans.stream()
.map(Span::remoteServiceName)
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
List<String> localServiceNames = spans.stream().map(Span::localServiceName)
.filter(Objects::nonNull).distinct().collect(Collectors.toList());
List<String> remoteServiceNames = spans.stream().map(Span::remoteServiceName)
.filter(Objects::nonNull).distinct().collect(Collectors.toList());
List<String> names = new ArrayList<>();
names.addAll(localServiceNames);
names.addAll(remoteServiceNames);
@@ -141,13 +145,14 @@ public class ZipkinTests extends AbstractIntegrationTest {
List<String> hasRequiredTag(List<Span> spans) {
String key = getRequiredTagKey();
Optional<String> keys = spans.stream()
.flatMap(span -> span.tags().keySet().stream())
.filter(key::equals)
.flatMap(span -> span.tags().keySet().stream()).filter(key::equals)
.findFirst();
return keys.isPresent() ? Collections.emptyList() : Collections.singletonList(key);
return keys.isPresent() ? Collections.emptyList()
: Collections.singletonList(key);
}
String getRequiredTagKey() {
return "random-sleep-millis";
}
}