open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use Slf4j annotation.

This commit is contained in:
Gary Huang 2018-08-07 16:49:51 -04:00 committed by gary.huang
parent abffe1779b
commit 2041d56de8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttpClientSpanDecorator.java
View File

@ -5,6 +5,7 @@ import static io.opentracing.log.Fields.ERROR_OBJECT;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.net.InetAddress;
import java.util.Collections; import java.util.Collections;
import okhttp3.Connection; import okhttp3.Connection;
import okhttp3.Request; import okhttp3.Request;
@ -70,16 +71,17 @@ public interface OkHttpClientSpanDecorator {
@Override @Override
public void onResponse( public void onResponse(
final Connection connection, final Response response, final Span span) { final Connection connection, final Response response, final Span span) {
final InetAddress inetAddress = connection.socket().getInetAddress();
Tags.HTTP_STATUS.set(span, response.code()); Tags.HTTP_STATUS.set(span, response.code());
Tags.PEER_HOSTNAME.set(span, connection.socket().getInetAddress().getHostName()); Tags.PEER_HOSTNAME.set(span, inetAddress.getHostName());
Tags.PEER_PORT.set(span, connection.socket().getPort()); Tags.PEER_PORT.set(span, connection.socket().getPort());
final String address = connection.socket().getInetAddress().getHostAddress();
String ipvKey = Tags.PEER_HOST_IPV4.getKey(); String ipvKey = Tags.PEER_HOST_IPV4.getKey();
if (connection.socket().getInetAddress() instanceof Inet6Address) { if (inetAddress instanceof Inet6Address) {
ipvKey = Tags.PEER_HOST_IPV6.getKey(); ipvKey = Tags.PEER_HOST_IPV6.getKey();
} }
span.setTag(ipvKey, address); span.setTag(ipvKey, inetAddress.getHostAddress());
} }
}; };
} }

6
dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java
View File

@ -12,12 +12,12 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import lombok.extern.slf4j.Slf4j;
import okhttp3.Dispatcher; import okhttp3.Dispatcher;
import okhttp3.Interceptor; import okhttp3.Interceptor;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.slf4j.LoggerFactory;
/** /**
* OkHttp interceptor to trace client requests. Interceptor adds span context into outgoing * OkHttp interceptor to trace client requests. Interceptor adds span context into outgoing
@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
* *
* @author Pavol Loffay * @author Pavol Loffay
*/ */
@Slf4j
public class TracingInterceptor implements Interceptor { public class TracingInterceptor implements Interceptor {
private final Tracer tracer; private final Tracer tracer;
@ -119,8 +120,7 @@ public class TracingInterceptor implements Interceptor {
tracer, tagWrapper.getSpan().context(), decorators) tracer, tagWrapper.getSpan().context(), decorators)
.intercept(chain); .intercept(chain);
} else { } else {
LoggerFactory.getLogger(TracingInterceptor.class.getName()) log.error("tag is null or not an instance of TagWrapper, skipping decorator onResponse()");
.error("tag is null or not an instance of TagWrapper, skipping decorator onResponse()");
} }
} }