diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/DefaultOkHttpObservationConvention.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/DefaultOkHttpObservationConvention.java index fea1e19554..0bf1892529 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/DefaultOkHttpObservationConvention.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/DefaultOkHttpObservationConvention.java @@ -163,14 +163,4 @@ public String getName() { return this.metricName; } - @Nullable - @Override - public String getContextualName(OkHttpContext context) { - Request request = context.getOriginalRequest(); - if (request == null) { - return null; - } - return request.method(); - } - } diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpContext.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpContext.java index ab6aa57741..fdd410f615 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpContext.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpContext.java @@ -43,13 +43,11 @@ public class OkHttpContext extends RequestReplySenderContext urlMapper, Iterable extraTags, Iterable> contextSpecificTags, - Iterable unknownRequestTags, boolean includeHostTag, Request originalRequest) { + Iterable unknownRequestTags, boolean includeHostTag) { super((carrier, key, value) -> { if (carrier != null) { carrier.header(key, value); @@ -60,7 +58,6 @@ public OkHttpContext(Function urlMapper, Iterable ext this.contextSpecificTags = contextSpecificTags; this.unknownRequestTags = unknownRequestTags; this.includeHostTag = includeHostTag; - this.originalRequest = originalRequest; } public void setState(OkHttpObservationInterceptor.CallState state) { @@ -91,8 +88,4 @@ public boolean isIncludeHostTag() { return includeHostTag; } - public Request getOriginalRequest() { - return originalRequest; - } - } diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpObservationInterceptor.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpObservationInterceptor.java index 6537f7881d..3dfc3094d4 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpObservationInterceptor.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpObservationInterceptor.java @@ -83,11 +83,15 @@ public Response intercept(@NonNull Chain chain) throws IOException { Request request = chain.request(); Request.Builder newRequestBuilder = request.newBuilder(); OkHttpContext okHttpContext = new OkHttpContext(this.urlMapper, this.extraTags, this.contextSpecificTags, - this.unknownRequestTags, this.includeHostTag, request); + this.unknownRequestTags, this.includeHostTag); okHttpContext.setCarrier(newRequestBuilder); okHttpContext.setState(new CallState(newRequestBuilder.build())); - Observation observation = OkHttpDocumentedObservation.DEFAULT.observation(this.observationConvention, - new DefaultOkHttpObservationConvention(requestMetricName), okHttpContext, this.registry).start(); + Observation observation = OkHttpDocumentedObservation.DEFAULT + .observation(this.observationConvention, new DefaultOkHttpObservationConvention(requestMetricName), + okHttpContext, this.registry) + .contextualName(request.method()) // TODO: This would have to be set + // either here or in a tracing handler + .start(); Request newRequest = newRequestBuilder.build(); OkHttpObservationInterceptor.CallState callState = new CallState(newRequest); okHttpContext.setState(callState);