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

[#124] Changes following review

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-02-11 11:00:20 +01:00
parent f772f50bbc
commit 8d8fb39db0
4 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/AbstractTraceHttpRequestInterceptor.java
View File

@@ -19,6 +19,7 @@ package org.springframework.cloud.sleuth.instrument.web.client;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.event.ClientReceivedEvent;
import org.springframework.cloud.sleuth.event.ClientSentEvent;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
@@ -31,13 +32,13 @@ import org.springframework.util.StringUtils;
*
* @author Marcin Grzejszczak
*/
public abstract class AbstractTraceHttpRequestInterceptor
abstract class AbstractTraceHttpRequestInterceptor
implements ApplicationEventPublisherAware {
private ApplicationEventPublisher publisher;
private final SpanAccessor accessor;
public AbstractTraceHttpRequestInterceptor(SpanAccessor accessor) {
protected AbstractTraceHttpRequestInterceptor(SpanAccessor accessor) {
this.accessor = accessor;
}
@@ -46,17 +47,14 @@ public abstract class AbstractTraceHttpRequestInterceptor
this.publisher = publisher;
}
/**
* Adds trace related headers from the span to the request
*/
public void enrichWithTraceHeaders(HttpRequest request, Span span) {
setHeader(request, Span.TRACE_ID_NAME, span.getTraceId());
setHeader(request, Span.SPAN_ID_NAME, span.getSpanId());
private void enrichWithTraceHeaders(HttpRequest request, Span span) {
setIdHeader(request, Span.TRACE_ID_NAME, span.getTraceId());
setIdHeader(request, Span.SPAN_ID_NAME, span.getSpanId());
if (!span.isExportable()) {
setHeader(request, Span.NOT_SAMPLED_NAME, "true");
}
setHeader(request, Span.SPAN_NAME_NAME, span.getName().toString());
setHeader(request, Span.PARENT_ID_NAME, getParentId(span));
setIdHeader(request, Span.PARENT_ID_NAME, getParentId(span));
setHeader(request, Span.PROCESS_ID_NAME, span.getProcessId());
}
@@ -64,36 +62,55 @@ public abstract class AbstractTraceHttpRequestInterceptor
return !span.getParents().isEmpty() ? span.getParents().get(0) : null;
}
public void setHeader(HttpRequest request, String name, String value) {
if (StringUtils.hasText(value) && !request.getHeaders().containsKey(name) && this.accessor.isTracing()) {
protected void doNotSampleThisSpan(HttpRequest request) {
setHeader(request, Span.NOT_SAMPLED_NAME, "true");
}
private void setHeader(HttpRequest request, String name, String value) {
if (StringUtils.hasText(value) && !request.getHeaders().containsKey(name) &&
this.accessor.isTracing()) {
request.getHeaders().add(name, value);
}
}
public void setHeader(HttpRequest request, String name, Long value) {
private void setIdHeader(HttpRequest request, String name, Long value) {
if (value != null) {
setHeader(request, name, Span.toHex(value));
}
}
/**
* Close the current span and emit the ClientReceivedEvent
* Enriches the request with proper headers and publishes
* the client sent event
*/
public void close() {
if (getCurrentSpan() == null) {
return;
}
publish(new ClientReceivedEvent(this, getCurrentSpan()));
protected void publishStartEvent(HttpRequest request) {
Span span = currentSpan();
enrichWithTraceHeaders(request, span);
publish(new ClientSentEvent(this, span));
}
protected void publish(ApplicationEvent event) {
/**
* Close the current span and emit the ClientReceivedEvent
*/
public void finish() {
if (!isTracing()) {
return;
}
publish(new ClientReceivedEvent(this, currentSpan()));
}
private void publish(ApplicationEvent event) {
if (this.publisher != null) {
this.publisher.publishEvent(event);
}
}
protected Span getCurrentSpan() {
private Span currentSpan() {
return this.accessor.getCurrentSpan();
}
protected boolean isTracing() {
return this.accessor.isTracing();
}
}

10
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceAsyncClientHttpRequestFactoryWrapper.java
View File

@@ -19,9 +19,7 @@ package org.springframework.cloud.sleuth.instrument.web.client;
import java.io.IOException;
import java.net.URI;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.event.ClientSentEvent;
import org.springframework.http.HttpMethod;
import org.springframework.http.client.AsyncClientHttpRequest;
import org.springframework.http.client.AsyncClientHttpRequestFactory;
@@ -50,13 +48,11 @@ public class TraceAsyncClientHttpRequestFactoryWrapper extends AbstractTraceHttp
public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod)
throws IOException {
AsyncClientHttpRequest request = this.delegate.createAsyncRequest(uri, httpMethod);
Span span = getCurrentSpan();
if (span == null) {
setHeader(request, Span.NOT_SAMPLED_NAME, "true");
if (!isTracing()) {
doNotSampleThisSpan(request);
return request;
}
enrichWithTraceHeaders(request, span);
publish(new ClientSentEvent(this, span));
publishStartEvent(request);
return request;
}
}

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

@@ -69,7 +69,7 @@ public class TraceHttpResponse implements ClientHttpResponse {
this.delegate.close();
}
finally {
this.interceptor.close();
this.interceptor.finish();
}
}
}

11
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceRestTemplateInterceptor.java
View File

@@ -17,9 +17,7 @@ package org.springframework.cloud.sleuth.instrument.web.client;
import java.io.IOException;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.event.ClientSentEvent;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -45,14 +43,13 @@ public class TraceRestTemplateInterceptor extends AbstractTraceHttpRequestInterc
@Override
public ClientHttpResponse intercept(HttpRequest request, byte[] body,
ClientHttpRequestExecution execution) throws IOException {
Span span = getCurrentSpan();
if (span == null) {
setHeader(request, Span.NOT_SAMPLED_NAME, "true");
if (!isTracing()) {
doNotSampleThisSpan(request);
return execution.execute(request, body);
}
enrichWithTraceHeaders(request, span);
publish(new ClientSentEvent(this, span));
publishStartEvent(request);
return new TraceHttpResponse(this, execution.execute(request, body));
}
}