From c0620c410c6f712b115681b22ab57205f2beccd6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 18 Feb 2016 11:23:09 +0100 Subject: [PATCH] [#160] Removed unnecessary Slf4j loggers fixes #160 --- .../SleuthHystrixConcurrencyStrategy.java | 6 ++--- .../TraceRestClientRibbonCommandFactory.java | 11 ++++----- .../cloud/sleuth/assertions/SpanAssert.java | 5 ++-- .../web/common/MockServerConfiguration.java | 6 ++--- .../src/main/java/sample/SampleService.java | 6 ++--- .../main/java/sample/SampleTransformer.java | 6 ++--- .../main/java/sample/SampleController.java | 10 ++++---- .../java/tools/AbstractIntegrationTest.java | 24 ++++++++++--------- .../java/tools/AssertingRestTemplate.java | 6 ++--- .../java/tools/RequestSendingRunnable.java | 10 ++++---- .../main/java/sample/GreetingController.java | 6 ++--- .../main/java/sample/SampleController.java | 10 ++++---- .../java/sample/SampleZipkinApplication.java | 8 +++---- .../test/java/integration/ZipkinTests.java | 6 ++--- .../main/java/sample/SampleController.java | 10 ++++---- .../zipkin/FallbackHavingEndpointLocator.java | 7 +++--- 16 files changed, 69 insertions(+), 68 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategy.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategy.java index 8394b3b19..32ffa9598 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategy.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategy.java @@ -5,7 +5,8 @@ import java.util.concurrent.Callable; import com.netflix.hystrix.strategy.HystrixPlugins; import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.cloud.sleuth.Span; import org.springframework.cloud.sleuth.Tracer; import org.springframework.cloud.sleuth.instrument.TraceKeys; @@ -13,8 +14,7 @@ import org.springframework.cloud.sleuth.instrument.TraceKeys; public class SleuthHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy { private static final String HYSTRIX_COMPONENT = "hystrix"; - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(SleuthHystrixConcurrencyStrategy.class); + private static final Log log = LogFactory.getLog(SleuthHystrixConcurrencyStrategy.class); private final Tracer tracer; private final TraceKeys traceKeys; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java index c7ee1749d..d6023ae37 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java @@ -19,7 +19,10 @@ package org.springframework.cloud.sleuth.instrument.zuul; import java.io.InputStream; import java.net.URISyntaxException; -import org.slf4j.Logger; +import com.netflix.client.http.HttpRequest; +import com.netflix.niws.client.http.RestClient; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonCommand; import org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonCommandFactory; @@ -32,17 +35,13 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.util.MultiValueMap; -import com.netflix.client.http.HttpRequest; -import com.netflix.niws.client.http.RestClient; - /** * @author Spencer Gibb */ public class TraceRestClientRibbonCommandFactory extends RestClientRibbonCommandFactory implements ApplicationEventPublisherAware { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(TraceRestClientRibbonCommandFactory.class); + private static final Log log = LogFactory.getLog(TraceRestClientRibbonCommandFactory.class); private ApplicationEventPublisher publisher; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/SpanAssert.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/SpanAssert.java index 5489204bf..e5e9a773e 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/SpanAssert.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/SpanAssert.java @@ -18,13 +18,14 @@ package org.springframework.cloud.sleuth.assertions; import java.util.Objects; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.assertj.core.api.AbstractAssert; -import org.slf4j.Logger; import org.springframework.cloud.sleuth.Span; public class SpanAssert extends AbstractAssert { - private static final Logger log = org.slf4j.LoggerFactory.getLogger(SpanAssert.class); + private static final Log log = LogFactory.getLog(SpanAssert.class); public SpanAssert(Span actual) { super(actual, SpanAssert.class); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MockServerConfiguration.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MockServerConfiguration.java index b3220b13a..27d03d1b0 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MockServerConfiguration.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MockServerConfiguration.java @@ -1,6 +1,7 @@ package org.springframework.cloud.sleuth.instrument.web.common; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.SocketUtils; @@ -8,8 +9,7 @@ import org.springframework.util.SocketUtils; @Configuration public class MockServerConfiguration { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(MockServerConfiguration.class); + private static final Log log = LogFactory.getLog(MockServerConfiguration.class); @Bean(destroyMethod = "shutdownServer") HttpMockServer httpMockServer() { diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleService.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleService.java index 7d6bc0055..d51f3c453 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleService.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleService.java @@ -16,7 +16,8 @@ package sample; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; import org.springframework.context.ApplicationListener; @@ -31,8 +32,7 @@ import org.springframework.web.client.RestTemplate; */ @MessageEndpoint public class SampleService implements ApplicationListener { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(SampleService.class); + private static final Log log = LogFactory.getLog(SampleService.class); @Autowired private RestTemplate restTemplate; private int port; diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleTransformer.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleTransformer.java index 26ea6e261..640d9911c 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleTransformer.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleTransformer.java @@ -16,7 +16,8 @@ package sample; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; @@ -29,8 +30,7 @@ import org.springframework.messaging.Message; @MessageEndpoint public class SampleTransformer { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(SampleTransformer.class); + private static final Log log = LogFactory.getLog(SampleTransformer.class); @Autowired SampleBackground background; diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java index e57cf500d..f53f58628 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java @@ -19,7 +19,8 @@ package sample; import java.util.Random; import java.util.concurrent.Callable; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; import org.springframework.cloud.sleuth.Span; @@ -37,8 +38,7 @@ import org.springframework.web.client.RestTemplate; @RestController public class SampleController implements ApplicationListener { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(SampleController.class); + private static final Log log = LogFactory.getLog(SampleController.class); @Autowired private RestTemplate restTemplate; @@ -94,7 +94,7 @@ ApplicationListener { Span span = this.tracer.startTrace("http:customTraceEndpoint", new AlwaysSampler()); int millis = this.random.nextInt(1000); - log.info("Sleeping for {} millis", millis); + log.info(String.format("Sleeping for [%d] millis", millis)); Thread.sleep(millis); this.tracer.addTag("random-sleep-millis", String.valueOf(millis)); @@ -107,7 +107,7 @@ ApplicationListener { @RequestMapping("/start") public String start() throws InterruptedException { int millis = this.random.nextInt(1000); - log.info("Sleeping for {} millis", millis); + log.info(String.format("Sleeping for [%d] millis", millis)); Thread.sleep(millis); this.tracer.addTag("random-sleep-millis", String.valueOf(millis)); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java index bd2cfe4e2..561beec1a 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java @@ -23,9 +23,10 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; -import org.slf4j.Logger; import org.springframework.cloud.sleuth.trace.IntegrationTestSpanContextHolder; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -48,8 +49,7 @@ import static org.assertj.core.api.BDDAssertions.then; */ public abstract class AbstractIntegrationTest { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(AbstractIntegrationTest.class); + private static final Log log = LogFactory.getLog(AbstractIntegrationTest.class); protected static int pollInterval = 1; protected static int timeout = 20; @@ -80,9 +80,9 @@ public abstract class AbstractIntegrationTest { protected Runnable checkServerHealth(String appName, RequestExchanger requestExchanger) { return () -> { ResponseEntity response = requestExchanger.exchange(); - log.info("Response from the [{}] health endpoint is [{}]", appName, response); + log.info(String.format("Response from the [%s] health endpoint is [%s]", appName, response)); then(response.getStatusCode()).isEqualTo(HttpStatus.OK); - log.info("[{}] is up!", appName); + log.info(String.format("[%s] is up!", appName)); }; } @@ -92,13 +92,13 @@ public abstract class AbstractIntegrationTest { protected ResponseEntity endpointToCheckZipkinQueryHealth() { URI uri = URI.create(getZipkinServicesQueryUrl()); - log.info("Sending request to the Zipkin query service [{}]", uri); + log.info(String.format("Sending request to the Zipkin query service [%s]", uri)); return exchangeRequest(uri); } protected ResponseEntity endpointToCheckZipkinServerHealth() { URI uri = URI.create("http://localhost:" +getZipkinServerPort()+"/health"); - log.info("Sending request to the Zipkin Server [{}]", uri); + log.info(String.format("Sending request to the Zipkin Server [%s]", uri)); return exchangeRequest(uri); } @@ -108,7 +108,8 @@ public abstract class AbstractIntegrationTest { protected ResponseEntity checkStateOfTheTraceId(long traceId) { URI uri = URI.create(getZipkinTraceQueryUrl() + Long.toHexString(traceId)); - log.info("Sending request to the Zipkin query service [{}]. Checking presence of trace id [{}]", uri, traceId); + log.info(String.format("Sending request to the Zipkin query service [%s]. " + + "Checking presence of trace id [%d]", uri, traceId)); return exchangeRequest(uri); } @@ -137,14 +138,15 @@ public abstract class AbstractIntegrationTest { protected Runnable allSpansWereRegisteredInZipkinWithTraceIdEqualTo(long traceId) { return () -> { ResponseEntity response = checkStateOfTheTraceId(traceId); - log.info("Response from the Zipkin query service about the trace id [{}] for trace with id [{}]", response, traceId); + log.info(String.format("Response from the Zipkin query service about the " + + "trace id [%s] for trace with id [%d]", response, traceId)); then(response.getStatusCode()).isEqualTo(HttpStatus.OK); then(response.hasBody()).isTrue(); List spans = Codec.JSON.readSpans(response.getBody().getBytes()); List serviceNamesNotFoundInZipkin = serviceNamesNotFoundInZipkin(spans); List spanNamesNotFoundInZipkin = annotationsNotFoundInZipkin(spans); - log.info("The following services were not found in Zipkin {}", serviceNamesNotFoundInZipkin); - log.info("The following annotations were not found in Zipkin {}", spanNamesNotFoundInZipkin); + log.info(String.format("The following services were not found in Zipkin [%s]", serviceNamesNotFoundInZipkin)); + log.info(String.format("The following annotations were not found in Zipkin [%s]", spanNamesNotFoundInZipkin)); then(serviceNamesNotFoundInZipkin).isEmpty(); then(spanNamesNotFoundInZipkin).isEmpty(); log.info("Zipkin tracing is working! Sleuth is working! Let's be happy!"); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AssertingRestTemplate.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AssertingRestTemplate.java index 5bb2e8f3c..34c9c3b81 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AssertingRestTemplate.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AssertingRestTemplate.java @@ -18,7 +18,8 @@ package tools; import java.io.IOException; import java.net.URI; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; @@ -35,8 +36,7 @@ import org.springframework.web.client.RestTemplate; */ public class AssertingRestTemplate extends RestTemplate { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(AssertingRestTemplate.class); + private static final Log log = LogFactory.getLog(AssertingRestTemplate.class); public AssertingRestTemplate() { setErrorHandler(new DefaultResponseErrorHandler() { diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/RequestSendingRunnable.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/RequestSendingRunnable.java index 6042a9140..d20f842b1 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/RequestSendingRunnable.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/RequestSendingRunnable.java @@ -18,7 +18,8 @@ package tools; import java.net.URI; import java.util.Random; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.cloud.sleuth.Span; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -37,8 +38,7 @@ import static org.assertj.core.api.BDDAssertions.then; */ public class RequestSendingRunnable implements Runnable { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(RequestSendingRunnable.class); + private static final Log log = LogFactory.getLog(RequestSendingRunnable.class); private final RestTemplate restTemplate; private final String url; @@ -56,11 +56,11 @@ public class RequestSendingRunnable implements Runnable { @Override public void run() { - log.info("Sending the request to url [{}] with trace id in headers [{}]", this.url, this.traceId); + log.info(String.format("Sending the request to url [%s] with trace id in headers [%d]", this.url, this.traceId)); ResponseEntity responseEntity = this.restTemplate.exchange(requestWithTraceId(), String.class); then(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - log.info("Received the following response [{}]", responseEntity); + log.info(String.format("Received the following response [%s]", responseEntity)); } private RequestEntity requestWithTraceId() { diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/java/sample/GreetingController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/java/sample/GreetingController.java index 0a6d8adb5..600ba6c99 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/java/sample/GreetingController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/java/sample/GreetingController.java @@ -1,7 +1,7 @@ package sample; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.messaging.handler.annotation.MessageMapping; import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.stereotype.Controller; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Controller; @Controller public class GreetingController { - private static Logger log = LoggerFactory.getLogger(GreetingController.class); + private static final Log log = LogFactory.getLog(GreetingController.class); @MessageMapping("/hello") @SendTo("/topic/greetings") diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java index 172ffa97a..b7f1ee912 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java @@ -19,7 +19,8 @@ package sample; import java.util.Random; import java.util.concurrent.Callable; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; import org.springframework.cloud.sleuth.Span; @@ -38,8 +39,7 @@ import org.springframework.web.client.RestTemplate; public class SampleController implements ApplicationListener { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(SampleController.class); + private static final Log log = LogFactory.getLog(SampleController.class); @Autowired private RestTemplate restTemplate; @@ -97,7 +97,7 @@ ApplicationListener { Span span = this.tracer.startTrace("http:customTraceEndpoint", new AlwaysSampler()); int millis = this.random.nextInt(1000); - log.info("Sleeping for {} millis", millis); + log.info(String.format("Sleeping for [%d] millis", millis)); Thread.sleep(millis); this.tracer.addTag("random-sleep-millis", String.valueOf(millis)); @@ -110,7 +110,7 @@ ApplicationListener { @RequestMapping("/start") public String start() throws InterruptedException { int millis = this.random.nextInt(1000); - log.info("Sleeping for {} millis", millis); + log.info(String.format("Sleeping for [%d] millis", millis)); Thread.sleep(millis); this.tracer.addTag("random-sleep-millis", String.valueOf(millis)); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java index ed1207401..eda007698 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java @@ -16,7 +16,8 @@ package sample; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -33,8 +34,7 @@ import org.springframework.scheduling.annotation.EnableAsync; @EnableAsync public class SampleZipkinApplication { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(SampleZipkinApplication.class); + private static final Log log = LogFactory.getLog(SampleZipkinApplication.class); public static void main(String[] args) { SpringApplication.run(SampleZipkinApplication.class, args); @@ -47,7 +47,7 @@ public class SampleZipkinApplication { return new ZipkinSpanReporter() { @Override public void report(zipkin.Span span) { - log.info("Reporting span [{}]", span); + log.info(String.format("Reporting span [%s]", span)); } }; } diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java index baaa2a5b1..b775e4431 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java @@ -17,10 +17,11 @@ package integration; import java.util.Random; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -76,8 +77,7 @@ public class ZipkinTests extends AbstractIntegrationTest { @Configuration public static class WaitUntilZipkinIsUpConfig { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(WaitUntilZipkinIsUpConfig.class); + private static final Log log = LogFactory.getLog(WaitUntilZipkinIsUpConfig.class); @Bean public ZipkinSpanReporter spanCollector(final ZipkinProperties zipkin, diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java index 30f0e493b..61dccb0ff 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java @@ -19,7 +19,8 @@ package sample; import java.util.Random; import java.util.concurrent.Callable; -import org.slf4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; import org.springframework.cloud.sleuth.Span; @@ -37,8 +38,7 @@ import org.springframework.web.client.RestTemplate; @RestController public class SampleController implements ApplicationListener { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(SampleController.class); + private static final Log log = LogFactory.getLog(SampleController.class); @Autowired private RestTemplate restTemplate; @Autowired @@ -93,7 +93,7 @@ ApplicationListener { Span span = this.tracer.startTrace("http:customTraceEndpoint", new AlwaysSampler()); int millis = this.random.nextInt(1000); - log.info("Sleeping for {} millis", millis); + log.info(String.format("Sleeping for [%d] millis", millis)); Thread.sleep(millis); this.tracer.addTag("random-sleep-millis", String.valueOf(millis)); @@ -106,7 +106,7 @@ ApplicationListener { @RequestMapping("/start") public String start() throws InterruptedException { int millis = this.random.nextInt(1000); - log.info("Sleeping for {} millis", millis); + log.info(String.format("Sleeping for [%d] millis", millis)); Thread.sleep(millis); this.tracer.addTag("random-sleep-millis", String.valueOf(millis)); diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocator.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocator.java index 8505fe839..f22c04314 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocator.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocator.java @@ -1,7 +1,7 @@ package org.springframework.cloud.sleuth.zipkin; -import org.slf4j.Logger; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import zipkin.Endpoint; /** @@ -10,8 +10,7 @@ import zipkin.Endpoint; */ public class FallbackHavingEndpointLocator implements EndpointLocator { - private static final Logger log = org.slf4j.LoggerFactory - .getLogger(FallbackHavingEndpointLocator.class); + private static final Log log = LogFactory.getLog(FallbackHavingEndpointLocator.class); private final DiscoveryClientEndpointLocator discoveryClientEndpointLocator; private final ServerPropertiesEndpointLocator serverPropertiesEndpointLocator;