Ref #34717: fix ProxySharing Metrics

See micrometer-metrics/micrometer@c727411

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/proxysharing/ProxySharingDispatcher.java

@@ -46,7 +46,7 @@
 import eu.openanalytics.containerproxy.util.MathUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
@@ -88,8 +88,8 @@ public class ProxySharingDispatcher implements IProxyDispatcher {
     private IProxyStore proxyStore;
     @Inject
     private Environment environment;
-    @Autowired(required = false)
-    private ProxySharingMicrometer proxySharingMicrometer = null;
+    @Inject
+    private ObjectProvider<ProxySharingMicrometer> proxySharingMicrometer;
 
     public ProxySharingDispatcher(ProxySpec proxySpec, IDelegateProxyStore delegateProxyStore, ISeatStore seatStore) {
         this.proxySpec = proxySpec;
@@ -162,9 +162,7 @@ public Proxy startProxy(Authentication user, Proxy proxy, ProxySpec spec, ProxyS
         info(proxy, seat, "Seat claimed");
         applicationEventPublisher.publishEvent(new SeatClaimedEvent(spec.getId(), proxy.getId()));
         LocalDateTime endTime = LocalDateTime.now();
-        if (proxySharingMicrometer != null) {
-            proxySharingMicrometer.registerSeatWaitTime(spec.getId(), Duration.between(startTime, endTime));
-        }
+        proxySharingMicrometer.ifAvailable(p -> p.registerSeatWaitTime(spec.getId(), Duration.between(startTime, endTime)));
 
         Proxy delegateProxy = delegateProxyStore.getDelegateProxy(seat.getDelegateProxyId()).getProxy();
 

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/proxysharing/ProxySharingMicrometer.java

@@ -128,7 +128,7 @@ public void onNewProxyEvent(NewProxyEvent event) {
         }
         if (specIds.contains(event.getSpecId())) {
             recentProxies.put(event.getProxyId(), event.getProxyId());
-            registry.gauge("delegate_app_info",
+            registry.gauge("delegate.app.info",
                 Tags.of(
                     "spec.id", event.getSpecId(),
                     "proxy.id", event.getProxyId(),
@@ -163,7 +163,7 @@ private void updateDelegateAppInfo() {
                         continue;
                     }
 
-                    registry.gauge("delegate_app_info",
+                    registry.gauge("delegate.app.info",
                         Tags.of(
                             "spec.id", specId,
                             "proxy.id", proxy.getId(),
@@ -181,7 +181,7 @@ private void updateDelegateAppInfo() {
                     // when the TTL of this proxy in recentProxies expires, the gauge will be removed
                     // this waiting period allows the metric system to pick up that the proxy is being removed
                     registry.remove(gauge);
-                    registry.gauge("delegate_app_info",
+                    registry.gauge("delegate.app.info",
                         Tags.of(
                             "spec.id", gauge.getId().getTag("spec.id"),
                             "proxy.id", gauge.getId().getTag("proxy.id"),
@@ -203,7 +203,7 @@ private void updateDelegateAppInfo() {
 
     private Map<String, Gauge> getDelegateAppInfoGauges() {
         try {
-            return new HashMap<>(registry.get("delegate_app_info").gauges().stream()
+            return new HashMap<>(registry.get("delegate.app.info").gauges().stream()
                 .collect(Collectors.toMap(g -> g.getId().getTag("proxy.id"), g -> g)));
         } catch (MeterNotFoundException ignored) {
             return new HashMap<>();