Rebase on merged ObservationOrTimer changes

micrometer-metrics · Aug 22, 2022 · 93166ee · 93166ee
1 parent c8dc986
commit 93166ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 113 deletions.
diff --git a/...va/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java b/...va/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java
@@ -21,7 +21,7 @@
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.Timer;
-import io.micrometer.core.instrument.observation.ObservationOrTimer;
+import io.micrometer.core.instrument.observation.ObservationOrTimerCompatibleInstrumentation;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
 import org.apache.http.HttpClientConnection;
@@ -108,9 +108,10 @@ public static Builder builder(MeterRegistry registry) {
     @Override
     public HttpResponse execute(HttpRequest request, HttpClientConnection conn, HttpContext context)
             throws IOException, HttpException {
-        ObservationOrTimer<ApacheHttpClientContext> sample = ObservationOrTimer.start(registry, observationRegistry,
-                () -> new ApacheHttpClientContext(request, context, uriMapper, exportTagsForRoute), convention,
-                DefaultApacheHttpClientObservationConvention.INSTANCE);
+        ObservationOrTimerCompatibleInstrumentation<ApacheHttpClientContext> sample = ObservationOrTimerCompatibleInstrumentation
+                .start(registry, observationRegistry,
+                        () -> new ApacheHttpClientContext(request, context, uriMapper, exportTagsForRoute), convention,
+                        DefaultApacheHttpClientObservationConvention.INSTANCE);
         String statusCodeOrError = "UNKNOWN";
 
         try {

diff --git a/...eter-core/src/main/java/io/micrometer/core/instrument/observation/ObservationOrTimer.java b/...eter-core/src/main/java/io/micrometer/core/instrument/observation/ObservationOrTimer.java