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

OkHttp: rearrange scope code a bit

This commit is contained in:
Nikolay Martynov 2019-04-04 15:45:48 -04:00
parent 1af7487201
commit 480a14b170
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ public class TracingCallFactory implements Call.Factory {
final Span span = GlobalTracer.get().buildSpan("okhttp.http").start(); final Span span = GlobalTracer.get().buildSpan("okhttp.http").start();
try (final Scope scope = GlobalTracer.get().scopeManager().activate(span, false)) { try (final Scope scope = GlobalTracer.get().scopeManager().activate(span, false)) {
DECORATE.afterStart(scope); DECORATE.afterStart(scope);
DECORATE.onRequest(scope.span(), request); DECORATE.onRequest(span, request);
/** In case of exception network interceptor is not called */ /** In case of exception network interceptor is not called */
final OkHttpClient.Builder okBuilder = okHttpClient.newBuilder(); final OkHttpClient.Builder okBuilder = okHttpClient.newBuilder();
@ -42,14 +42,13 @@ public class TracingCallFactory implements Call.Factory {
@Override @Override
public Response intercept(final Chain chain) throws IOException { public Response intercept(final Chain chain) throws IOException {
try (final Scope interceptorScope = try (final Scope interceptorScope =
GlobalTracer.get().scopeManager().activate(span, false)) { GlobalTracer.get().scopeManager().activate(span, true)) {
return chain.proceed(chain.request()); return chain.proceed(chain.request());
} catch (final Exception ex) { } catch (final Exception ex) {
DECORATE.onError(scope, ex); DECORATE.onError(scope, ex);
throw ex; throw ex;
} finally { } finally {
DECORATE.beforeFinish(span); DECORATE.beforeFinish(span);
span.finish();
} }
} }
}); });