fix formating

Author: arturobernalg

httpclient5-observation/src/main/java/org/apache/hc/client5/http/observation/MetricConfig.java

@@ -122,7 +122,9 @@ public Builder addCommonTag(final String k, final String v) {
         }
 
         public Builder addCommonTags(final Iterable<Tag> tags) {
-            for (final Tag t : tags) this.commonTags.add(t);
+            for (final Tag t : tags) {
+                this.commonTags.add(t);
+            }
             return this;
         }
 

httpclient5-observation/src/main/java/org/apache/hc/client5/http/observation/impl/ObservationClassicExecInterceptor.java

@@ -37,6 +37,7 @@
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Classic (blocking) execution interceptor that emits Micrometer {@link Observation}s
@@ -55,8 +56,8 @@ public final class ObservationClassicExecInterceptor implements ExecChainHandler
 
     public ObservationClassicExecInterceptor(final ObservationRegistry registry,
                                              final ObservingOptions opts) {
-        this.registry = registry;
-        this.opts = opts;
+        this.registry = Args.notNull(registry, "observationRegistry");
+        this.opts = opts != null ? opts : ObservingOptions.DEFAULT;
     }
 
     @Override
@@ -69,17 +70,16 @@ public ClassicHttpResponse execute(final ClassicHttpRequest request,
             return chain.proceed(request, scope);
         }
 
-        final Observation obs;
-        try {
-            obs = Observation
-                    .createNotStarted("http.client.request", registry)
-                    .contextualName(request.getMethod() + " " + request.getUri())
-                    .lowCardinalityKeyValue("http.method", request.getMethod())
-                    .lowCardinalityKeyValue("net.peer.name", request.getAuthority().getHostName())
-                    .start();
-        } catch (final URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
+        final String method = request.getMethod();
+        final String uriForName = safeUriForName(request);
+        final String peer = request.getAuthority().getHostName();
+
+        final Observation obs = Observation
+                .createNotStarted("http.client.request", registry)
+                .contextualName(method + " " + uriForName)
+                .lowCardinalityKeyValue("http.method", method)
+                .lowCardinalityKeyValue("net.peer.name", peer)
+                .start();
 
         ClassicHttpResponse response = null;
         Throwable error = null;
@@ -93,10 +93,22 @@ public ClassicHttpResponse execute(final ClassicHttpRequest request,
             if (response != null) {
                 obs.lowCardinalityKeyValue("http.status_code", Integer.toString(response.getCode()));
             }
+            if (opts.tagLevel == ObservingOptions.TagLevel.EXTENDED) {
+                obs.lowCardinalityKeyValue("http.scheme", scope.route.getTargetHost().getSchemeName())
+                        .lowCardinalityKeyValue("net.peer.name", scope.route.getTargetHost().getHostName());
+            }
             if (error != null) {
                 obs.error(error);
             }
             obs.stop();
         }
     }
+
+    private static String safeUriForName(final ClassicHttpRequest req) {
+        try {
+            return req.getUri().toString();
+        } catch (final URISyntaxException e) {
+            return req.getRequestUri();
+        }
+    }
 }

httpclient5-observation/src/main/java/org/apache/hc/client5/http/observation/interceptors/AsyncTimerExec.java

@@ -75,8 +75,11 @@ public AsyncTimerExec(final MeterRegistry reg, final ObservingOptions opts, fina
         this.opts = Args.notNull(opts, "options");
         this.mc = mc != null ? mc : MetricConfig.builder().build();
 
-        // Guard: only register the inflight gauge once.
-        if (registry.find(this.mc.prefix + ".inflight").gauge() == null) {
+        // Tag-aware guard: only register once per (name + tags)
+        if (registry.find(this.mc.prefix + ".inflight")
+                .tags("kind", "async")
+                .tags(this.mc.commonTags)
+                .gauge() == null) {
             Gauge.builder(this.mc.prefix + ".inflight", inflight, AtomicInteger::doubleValue)
                     .tag("kind", "async")
                     .tags(this.mc.commonTags)

httpclient5-observation/src/main/java/org/apache/hc/client5/http/observation/interceptors/TimerExec.java

@@ -73,32 +73,37 @@ public final class TimerExec implements ExecChainHandler {
 
     private final AtomicInteger inflight = new AtomicInteger(0);
 
-    /** Back-compat: two-arg ctor. */
+    /**
+     * Back-compat: two-arg ctor.
+     */
     public TimerExec(final MeterRegistry reg, final ObservingOptions cfg) {
         this(reg, cfg, null);
     }
 
-    /** Preferred: honors {@link MetricConfig}. */
+    /**
+     * Preferred: honors {@link MetricConfig}.
+     */
     public TimerExec(final MeterRegistry reg, final ObservingOptions cfg, final MetricConfig mc) {
         this.registry = Args.notNull(reg, "registry");
         this.cfg = Args.notNull(cfg, "config");
         this.mc = mc != null ? mc : MetricConfig.builder().build();
 
         final String base = this.mc.prefix + ".";
-        this.timerBuilder = Timer.builder(base + "request")
-                .tags(this.mc.commonTags);
+        this.timerBuilder = Timer.builder(base + "request").tags(this.mc.commonTags);
         if (this.mc.percentiles != null && this.mc.percentiles.length > 0) {
             this.timerBuilder.publishPercentiles(this.mc.percentiles);
         }
         if (this.mc.slo != null) {
             this.timerBuilder.serviceLevelObjectives(this.mc.slo);
         }
 
-        this.counterBuilder = Counter.builder(base + "response")
-                .tags(this.mc.commonTags);
+        this.counterBuilder = Counter.builder(base + "response").tags(this.mc.commonTags);
 
-        // Guard: only register the inflight gauge once.
-        if (registry.find(this.mc.prefix + ".inflight").gauge() == null) {
+        // Tag-aware guard: only register once per (name + tags)
+        if (registry.find(this.mc.prefix + ".inflight")
+                .tags("kind", "classic")
+                .tags(this.mc.commonTags)
+                .gauge() == null) {
             Gauge.builder(this.mc.prefix + ".inflight", inflight, AtomicInteger::doubleValue)
                     .tag("kind", "classic")
                     .tags(this.mc.commonTags)

httpclient5-observation/src/test/java/org/apache/hc/client5/http/observation/impl/MeteredTlsStrategyTest.java

@@ -107,7 +107,9 @@ public void upgrade(final TransportSecurityLayer sessionLayer,
                             final Timeout handshakeTimeout,
                             final FutureCallback<TransportSecurityLayer> callback) {
             // immediately complete
-            if (callback != null) callback.completed(sessionLayer);
+            if (callback != null) {
+                callback.completed(sessionLayer);
+            }
         }
 
         @Deprecated
@@ -129,7 +131,9 @@ public void upgrade(final TransportSecurityLayer sessionLayer,
                             final Object attachment,
                             final Timeout handshakeTimeout,
                             final FutureCallback<TransportSecurityLayer> callback) {
-            if (callback != null) callback.failed(new RuntimeException("boom"));
+            if (callback != null) {
+                callback.failed(new RuntimeException("boom"));
+            }
         }
 
         @Deprecated

httpclient5-observation/src/test/java/org/apache/hc/client5/http/observation/impl/ObservationAsyncExecInterceptorTest.java

@@ -79,7 +79,9 @@ public void onStop(final Observation.Context c) {
 
     @AfterEach
     void tearDown() {
-        if (server != null) server.close(CloseMode.GRACEFUL);
+        if (server != null) {
+            server.close(CloseMode.GRACEFUL);
+        }
     }
 
     @Test