Merge pull request #172 from maksius13/maksius13

Fix doubling KeyName in answer of /metrics

Author: rjeberhard

wls-exporter-core/src/main/java/com/oracle/wls/exporter/domain/MetricsScraper.java

@@ -120,7 +120,7 @@ private String getItemQualifiers(JsonObject object, MBeanSelector beanSelector,
         String qualifiers = parentQualifiers;
         if (object.has(beanSelector.getKey())) {
             if (!isNullOrEmptyString(qualifiers)) qualifiers += ',';
-            qualifiers += (beanSelector.getKeyName() + '=' + asQuotedString(object.get(beanSelector.getKey())));
+            qualifiers += (beanSelector.getKeyName() + (parentQualifiers.startsWith(beanSelector.getKeyName()+'=') ? '2': "")+'=' + asQuotedString(object.get(beanSelector.getKey())));
         }
         return qualifiers;
     }

wls-exporter-core/src/test/java/com/oracle/wls/exporter/domain/MetricsScraperTest.java

@@ -20,7 +20,7 @@
 /**
  * @author Russell Gold
  */
-public class MetricsScraperTest {
+class MetricsScraperTest {
     private static final String RESPONSE =
             "{\"applicationRuntimes\": {\"items\": [\n" +
             "     {\n" +
@@ -150,7 +150,7 @@ public class MetricsScraperTest {
     private final MetricsScraper scraper = new MetricsScraper("");
 
     @Test
-    public void generateLeafMetrics() {
+    void generateLeafMetrics() {
         generateNestedMetrics(getServletsMap(), SERVLET_RESPONSE);
 
         assertThat(scraper.getMetrics(),
@@ -176,7 +176,7 @@ private JsonObject getJsonResponse(String jsonString) {
     }
 
     @Test
-    public void whenNoValuesSpecified_generateAllMetrics() {
+    void whenNoValuesSpecified_generateAllMetrics() {
         generateNestedMetrics(getAllValuesServletsMap(), SERVLET_RESPONSE);
 
         assertThat(scraper.getMetrics(),
@@ -190,15 +190,23 @@ private ImmutableMap<String, Object> getAllValuesServletsMap() {
     }
 
     @Test
-    public void generateLeafMetricsWhileAccumulatingQualifiers() {
+    void generateLeafMetricsWhileAccumulatingQualifiers() {
         generateNestedMetrics(getServletsMap(), SERVLET_RESPONSE, "webapp=\"wls\"");
 
         assertThat(scraper.getMetrics(),
                    hasMetric("servlet_invocationTotalCount{webapp=\"wls\",servletName=\"JspServlet\"}", 0));
     }
 
     @Test
-    public void generateLeafMetricsWithNoQualifiers() {
+    void generateLeafMetricsWhileResolvingDuplicateQualifiers() {
+        generateNestedMetrics(getServletsMap(), SERVLET_RESPONSE, "servletName=\"wls\"");
+
+        assertThat(scraper.getMetrics(),
+                   hasMetric("servlet_invocationTotalCount{servletName=\"wls\",servletName2=\"JspServlet\"}", 0));
+    }
+
+    @Test
+    void generateLeafMetricsWithNoQualifiers() {
         generateNestedMetrics(getServletsMapWithoutQualifierKey(), SINGLE_SERVLET_RESPONSE);
 
         assertThat(scraper.getMetrics(), hasMetric("servlet_invocationTotalCount", 0));
@@ -210,14 +218,14 @@ private ImmutableMap<String, Object> getServletsMapWithoutQualifierKey() {
     }
 
     @Test
-    public void generateLeafMetricsWithParentQualifiersOnly() {
+    void generateLeafMetricsWithParentQualifiersOnly() {
         generateNestedMetrics(getServletsMapWithoutQualifierKey(), SINGLE_SERVLET_RESPONSE, "webapp=\"wls\"");
 
         assertThat(scraper.getMetrics(), hasMetric("servlet_invocationTotalCount{webapp=\"wls\"}", 0));
     }
 
     @Test
-    public void whenKeyNameSpecified_useItRatherThanKey() {
+    void whenKeyNameSpecified_useItRatherThanKey() {
         generateNestedMetrics(getServletsMapWithKeyName("servlet"), SERVLET_RESPONSE);
 
         assertThat(scraper.getMetrics(), hasMetric("servlet_invocationTotalCount{servlet=\"JspServlet\"}", 0));
@@ -230,7 +238,7 @@ private Map<String, Object> getServletsMapWithKeyName(String keyName) {
     }
 
     @Test
-    public void whenValuesIncludesKey_ignoreIt() {
+    void whenValuesIncludesKey_ignoreIt() {
         generateNestedMetrics(getServletsMapWithKey("invocationId"), SINGLE_SERVLET_RESPONSE);
 
         assertThat(scraper.getMetrics(), not(hasMetric("servlet_invocationId{invocationId=\"23\"}", 23)));
@@ -243,56 +251,56 @@ private Map<String, Object> getServletsMapWithKey(String key) {
     }
 
     @Test
-    public void whenNullObjectInResponse_dontFail() {
+    void whenNullObjectInResponse_dontFail() {
         generateNestedMetrics(getServletsMapWithKey("invocationId"), RESPONSE_WITH_NULL);
 
         // todo add as comment
         assertThat(scraper.getMetrics(), not(hasMetric("servlet_invocationId{invocationId=\"23\"}", 23)));
     }
 
     @Test
-    public void whenGenerateHierarchicalMetrics_containsTopLevel() {
+    void whenGenerateHierarchicalMetrics_containsTopLevel() {
         generateNestedMetrics(twoLevelMap, TWO_LEVEL_RESPONSE);
 
         assertThat(scraper.getMetrics(), hasMetric("component_deploymentState{component=\"ejb30_weblogic\"}", 2));
     }
 
     @Test
-    public void whenNoPrefix_generateBareMetrics() {
+    void whenNoPrefix_generateBareMetrics() {
         generateNestedMetrics(noPrefixTwoLevelMap, TWO_LEVEL_RESPONSE);
 
         assertThat(scraper.getMetrics(), hasMetric("deploymentState{component=\"ejb30_weblogic\"}", 2));
     }
 
     @Test
-    public void whenGenerateHierarchicalMetrics_ignoresNonNumericValues() {
+    void whenGenerateHierarchicalMetrics_ignoresNonNumericValues() {
         generateNestedMetrics(twoLevelMap, TWO_LEVEL_RESPONSE);
 
         assertThat(scraper.getMetrics(), not(hasMetric("component_sourceInfo{component=\"ejb30_weblogic\"}", "weblogic.war")));
         assertThat(scraper.getMetrics(), not(hasMetric("component_internal{component=\"ejb30_weblogic\"}", "true")));
     }
 
     @Test
-    public void configurationQuery_acceptsStringValues() {
+    void configurationQuery_acceptsStringValues() {
         scraper.scrape(MBeanSelector.DOMAIN_NAME_SELECTOR, getJsonResponse(CONFIG_RESPONSE));
 
         assertThat(scraper.getMetrics(), hasMetric("name", "mydomain"));
     }
 
     @Test
-    public void whenGenerateHierarchicalMetrics_containsBottomLevel() {
+    void whenGenerateHierarchicalMetrics_containsBottomLevel() {
         generateNestedMetrics(twoLevelMap, TWO_LEVEL_RESPONSE);
 
         assertThat(scraper.getMetrics(), hasMetric("servlet_invocationTotalCount{component=\"ejb30_weblogic\",servletName=\"JspServlet\"}", 0));
     }
 
     @Test
-    public void whenResponseLacksServerRuntimes_generateEmptyMetrics() {
+    void whenResponseLacksServerRuntimes_generateEmptyMetrics() {
         assertThat(scraper.scrape(MBeanSelector.create(getFullMap()), getJsonResponse("{}")), anEmptyMap());
     }
 
     @Test
-    public void generateFromFullResponse() {
+    void generateFromFullResponse() {
         Map<String, Object> metrics = scraper.scrape(MBeanSelector.create(getFullMap()), getJsonResponse(RESPONSE));
 
         assertThat(metrics, hasMetric("component_deploymentState{application=\"weblogic\",component=\"ejb30_weblogic\"}", 2));
@@ -307,7 +315,7 @@ private Map<String, Object> getFullMap() {
 
 
     @Test
-    public void generateFromFullResponseUsingSnakeCase() {
+    void generateFromFullResponseUsingSnakeCase() {
         scraper.setMetricNameSnakeCase(true);
         Map<String, Object> metrics = scraper.scrape(MBeanSelector.create(getFullMap()), getJsonResponse(RESPONSE));
 
@@ -316,15 +324,15 @@ public void generateFromFullResponseUsingSnakeCase() {
     }
 
     @Test
-    public void whenTypeNotSpecified_includeAllComponents() {
+    void whenTypeNotSpecified_includeAllComponents() {
         Map<String, Object> metrics = scraper.scrape(MBeanSelector.create(getFullMap()), getJsonResponse(RESPONSE));
 
         assertThat(metrics, hasMetric("component_deploymentState{application=\"weblogic\",component=\"ejb30_weblogic\"}", 2));
         assertThat(metrics, hasMetric("component_deploymentState{application=\"mbeans\",component=\"EjbStatusBean\"}", 2));
     }
 
     @Test
-    public void selectOnlyWebApps() {
+    void selectOnlyWebApps() {
         componentMap.put(MBeanSelector.TYPE, "WebAppComponentRuntime");
         Map<String, Object> metrics = scraper.scrape(MBeanSelector.create(getFullMap()), getJsonResponse(RESPONSE));
 
@@ -333,7 +341,7 @@ public void selectOnlyWebApps() {
     }
 
     @Test
-    public void whenValuesAtTopLevel_scrapeThem() {
+    void whenValuesAtTopLevel_scrapeThem() {
         final MBeanSelector selector = MBeanSelector.create(getMetricsMap());
         final JsonObject jsonResponse = getJsonResponse(METRICS_RESPONSE);
         Map<String, Object> metrics = scraper.scrape(selector, jsonResponse);