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

polish

Browse Source
This commit is contained in:
Spencer Gibb
2015-12-10 10:33:21 -07:00
parent 2f35fc7966
commit 2d0ff8f436
18 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Trace.java
View File

@@ -45,7 +45,7 @@ public class Trace {
SPAN_NAME_NAME, PARENT_ID_NAME, PROCESS_ID_NAME, NOT_SAMPLED_NAME);
/**
* the span for this scope
* the span for this trace
*/
private final Span span;

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/TraceDelegate.java
View File

@@ -33,8 +33,8 @@ public abstract class TraceDelegate<T> {
private final String name;
private final Span parent;
public TraceDelegate(TraceManager trace, T delegate) {
this(trace, delegate, null);
public TraceDelegate(TraceManager traceManager, T delegate) {
this(traceManager, delegate, null);
}
public TraceDelegate(TraceManager traceManager, T delegate, String name) {

10
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java
View File

@@ -34,7 +34,7 @@ import org.springframework.messaging.support.ChannelInterceptorAdapter;
*/
public class TraceChannelInterceptor extends ChannelInterceptorAdapter {
private ThreadLocal<Trace> traceManagerScopeHolder = new ThreadLocal<Trace>();
private ThreadLocal<Trace> traceHolder = new ThreadLocal<>();
private final TraceManager traceManager;
@@ -44,9 +44,9 @@ public class TraceChannelInterceptor extends ChannelInterceptorAdapter {
@Override
public void postSend(Message<?> message, MessageChannel channel, boolean sent) {
Trace traceManagerScope = this.traceManagerScopeHolder.get();
this.traceManager.close(traceManagerScope);
this.traceManagerScopeHolder.remove();
Trace trace = this.traceHolder.get();
this.traceManager.close(trace);
this.traceHolder.remove();
}
@Override
@@ -83,7 +83,7 @@ public class TraceChannelInterceptor extends ChannelInterceptorAdapter {
else {
trace = this.traceManager.startSpan(name);
}
this.traceManagerScopeHolder.set(trace);
this.traceHolder.set(trace);
return SpanMessageHeaders.addSpanHeaders(message, trace.getSpan());
}

10
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java
View File

@@ -38,20 +38,20 @@ import org.springframework.scheduling.annotation.Scheduled;
@Aspect
public class TraceSchedulingAspect {
private final TraceManager trace;
private final TraceManager traceManager;
public TraceSchedulingAspect(TraceManager trace) {
this.trace = trace;
public TraceSchedulingAspect(TraceManager traceManager) {
this.traceManager = traceManager;
}
@Around("execution (@org.springframework.scheduling.annotation.Scheduled * *.*(..))")
public Object traceBackgroundThread(final ProceedingJoinPoint pjp) throws Throwable {
Trace scope = this.trace.startSpan(pjp.toShortString());
Trace trace = this.traceManager.startSpan(pjp.toShortString());
try {
return pjp.proceed();
}
finally {
this.trace.close(scope);
this.traceManager.close(trace);
}
}

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java
View File

@@ -48,8 +48,8 @@ public class TraceSchedulingAutoConfiguration {
@ConditionalOnClass(ProceedingJoinPoint.class)
@Bean
public TraceSchedulingAspect traceSchedulingAspect(TraceManager trace) {
return new TraceSchedulingAspect(trace);
public TraceSchedulingAspect traceSchedulingAspect(TraceManager traceManager) {
return new TraceSchedulingAspect(traceManager);
}
}

2
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHandlerInterceptor.java
View File

@@ -29,7 +29,7 @@ import org.springframework.web.servlet.ModelAndView;
*/
public class TraceHandlerInterceptor implements HandlerInterceptor {
private static final String ATTR_NAME = "__CURRENT_TRACE_HANDLER_TRACE_SCOPE_ATTR___";
private static final String ATTR_NAME = "__CURRENT_TRACE_HANDLER_TRACE_ATTR___";
private final TraceManager traceManager;

2
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceCallback.java
View File

@@ -19,5 +19,5 @@ package org.springframework.cloud.sleuth.template;
import org.springframework.cloud.sleuth.Trace;
public interface TraceCallback<T> {
T doInTrace(Trace traceScope);
T doInTrace(Trace trace);
}

10
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceTemplate.java
View File

@@ -36,11 +36,11 @@ public class TraceTemplate implements TraceOperations {
public <T> T trace(final TraceCallback<T> callback) {
if (TraceContextHolder.isTracing()) {
DelegateCallback<T> delegate = new DelegateCallback<>(this.traceManager);
Trace traceScope = delegate.startSpan();
Trace trace = delegate.startSpan();
try {
return callback.doInTrace(traceScope);
return callback.doInTrace(trace);
} finally {
this.traceManager.close(traceScope);
this.traceManager.close(trace);
}
} else {
return callback.doInTrace(null);
@@ -49,8 +49,8 @@ public class TraceTemplate implements TraceOperations {
class DelegateCallback<T> extends TraceDelegate<TraceCallback<T>> {
public DelegateCallback(TraceManager trace) {
super(trace, null);
public DelegateCallback(TraceManager traceManager) {
super(traceManager, null);
}
@Override

2
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTraceManager.java
View File

@@ -165,7 +165,7 @@ public class DefaultTraceManager implements TraceManager {
@Override
public Trace continueSpan(Span span) {
// Return an empty TraceScope that does nothing on close
// Return an empty Trace that does nothing on close
if (span == null) {
return NullTrace.INSTANCE;
}