[GitHub] asfgit closed pull request #2: GERONIMO-6658 - application/json doesn't return correct payload

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[GitHub] asfgit closed pull request #2: GERONIMO-6658 - application/json doesn't return correct payload

GitBox
asfgit closed pull request #2: GERONIMO-6658 - application/json doesn't return correct payload
URL: https://github.com/apache/geronimo-metrics/pull/2
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/geronimo-metrics-common/src/main/java/org/apache/geronimo/microprofile/metrics/common/jaxrs/MetricsEndpoints.java b/geronimo-metrics-common/src/main/java/org/apache/geronimo/microprofile/metrics/common/jaxrs/MetricsEndpoints.java
index 4293fd5..ddda156 100644
--- a/geronimo-metrics-common/src/main/java/org/apache/geronimo/microprofile/metrics/common/jaxrs/MetricsEndpoints.java
+++ b/geronimo-metrics-common/src/main/java/org/apache/geronimo/microprofile/metrics/common/jaxrs/MetricsEndpoints.java
@@ -19,11 +19,13 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
 import static java.util.Optional.ofNullable;
+import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toMap;
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import javax.ws.rs.GET;
@@ -133,7 +135,7 @@ public Object getJson(@PathParam("registry") final String registry,
                           @Context final SecurityContext securityContext,
                           @Context final UriInfo uriInfo) {
         securityValidator.checkSecurity(securityContext, uriInfo);
-        return singleEntry(name, findRegistry(registry));
+        return singleEntry(name, findRegistry(registry), this::map);
     }
 
     @GET
@@ -147,8 +149,7 @@ public String getText(@PathParam("registry") final String registry,
         final MetricRegistry metricRegistry = findRegistry(registry);
         return prometheus.toText(
                 metricRegistry, registry,
-                singleEntry(name, metricRegistry))
-                .toString();
+                singleEntry(name, metricRegistry, identity())).toString();
     }
 
     @OPTIONS
@@ -175,9 +176,10 @@ public Object getMetadata(@PathParam("registry") final String registry,
                 .collect(toMap(Map.Entry::getKey, e -> mapMeta(e.getValue())));
     }
 
-    private Map<String, Metric> singleEntry(final String name, final MetricRegistry metricRegistry) {
+    private <T> Map<String, T> singleEntry(final String name, final MetricRegistry metricRegistry,
+                                           final Function<Metric, T> metricMapper) {
         return ofNullable(metricRegistry.getMetrics().get(name))
-                .map(metric -> singletonMap(name, metric))
+                .map(metric -> singletonMap(name, metricMapper.apply(metric)))
                 .orElseGet(Collections::emptyMap);
     }
 
diff --git a/geronimo-metrics-common/src/test/java/org/apache/geronimo/microprofile/metrics/common/json/JsonMetricTest.java b/geronimo-metrics-common/src/test/java/org/apache/geronimo/microprofile/metrics/common/json/JsonMetricTest.java
new file mode 100644
index 0000000..554f6ac
--- /dev/null
+++ b/geronimo-metrics-common/src/test/java/org/apache/geronimo/microprofile/metrics/common/json/JsonMetricTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.microprofile.metrics.common.json;
+
+import org.apache.geronimo.microprofile.metrics.common.RegistryImpl;
+import org.apache.geronimo.microprofile.metrics.common.jaxrs.MetricsEndpoints;
+import org.apache.geronimo.microprofile.metrics.common.jaxrs.SecurityValidator;
+import org.apache.geronimo.microprofile.metrics.common.prometheus.PrometheusFormatter;
+import org.eclipse.microprofile.metrics.Gauge;
+import org.junit.Test;
+
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+
+import static java.util.Collections.singletonMap;
+import static org.junit.Assert.assertEquals;
+
+public class JsonMetricTest {
+
+    @Test
+    public void testJsonGaugeValue() {
+        final RegistryImpl registry = new RegistryImpl();
+        registry.register("foo", (Gauge<Long>) () -> 1L);
+
+        final MetricsEndpoints endpoints = new MetricsEndpoints();
+        endpoints.setApplicationRegistry(registry);
+        endpoints.setPrometheus(new PrometheusFormatter());
+        endpoints.setSecurityValidator(new SecurityValidator() {
+            @Override
+            public void checkSecurity(final SecurityContext securityContext, final UriInfo uriInfo) {
+                // no-op
+            }
+        });
+        final Object json = endpoints.getJson("application", "foo", null, null);
+        assertEquals(singletonMap("foo", 1L), json);
+    }
+}


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[hidden email]


With regards,
Apache Git Services