Fixed issue which is appending "Custom Metrics" to the specified prefix

Author: satish-m

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.appdynamics.extensions</groupId>
     <artifactId>sql-monitoring-extension</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
     <packaging>jar</packaging>
     <name>sql-monitoring-extension</name>
     <url>http://maven.apache.org</url>
@@ -155,7 +155,7 @@
                                              includes="${project.artifactId}.${project.packaging}"/>
                                 </copy>
                                 <zip destfile="${target.dir}-${project.version}.zip">
-                                    <zipfileset dir="${target.dir}" filemode="755" prefix="SqlMonitor/"/>
+                                    <zipfileset dir="${target.dir}" filemode="755" prefix="SQLMonitor/"/>
                                 </zip>
                                 <delete dir="${target.dir}"/>
                             </target>

src/main/java/com/appdynamics/monitors/sql/SQLMonitor.java

@@ -94,7 +94,7 @@ private String executeCommands(Configuration config, String status) {
                         int counter = 1;
                         logger.info("sql statement: " + counter++);
                         String statement = command.getCommand();
-                        String displayPrefix = server.getDisplayName()+"|"+command.getDisplayPrefix();
+                        String displayPrefix = server.getDisplayName() + "|" + command.getDisplayPrefix();
                         if (statement != null) {
                             statement = statement.trim();
                             // parse into statement and roll up
@@ -136,9 +136,6 @@ private void processMetricPrefix(String metricPrefix) {
         if (!metricPrefix.endsWith("|")) {
             metricPrefix = metricPrefix + "|";
         }
-        if (!metricPrefix.startsWith("Custom Metrics|")) {
-            metricPrefix = "Custom Metrics|" + metricPrefix;
-        }
 
         this.metricPrefix = metricPrefix;
     }

src/main/resources/conf/config.yml

@@ -41,6 +41,6 @@ servers:
 
 # Make sure the metric prefix ends with a |
 #This will create this metric in all the tiers, under this path.
-metricPrefix: "Custom Metrics|SQL|"
+#metricPrefix: "Custom Metrics|SQL|"
 #This will create it in specific Tier. Replace <ComponentID> with TierID
-#metricPrefix: "Server|Component:<ComponentID>|Custom Metrics|SQL|"
+metricPrefix: "Server|Component:<ComponentID>|Custom Metrics|SQL|"