Merge remote-tracking branch 'origin/main' into resolve-sonar-issues

Author: rjeberhard

.github/workflows/build.yml

@@ -31,6 +31,6 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
       - name: Build and analyze
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          GITHUB_TOKEN: ${{ secrets.ECNJ_GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=oracle_weblogic-monitoring-exporter

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

@@ -197,6 +197,14 @@ void generateLeafMetricsWhileAccumulatingQualifiers() {
                    hasMetric("servlet_invocationTotalCount{webapp=\"wls\",servletName=\"JspServlet\"}", 0));
     }
 
+    @Test
+    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);