GEOMESA-3499 Consolidate converter metric tags (#3433)

Author: elahrvivaz

geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/validators/CqlValidatorFactory.scala

@@ -41,7 +41,7 @@ object CqlValidatorFactory {
     private val attributes = FilterHelper.propertyNames(filter).sorted.mkString(",")
 
     private val success = successCounter("cql", attributes, tags)
-    private val failure = failureCounter("cql", attributes, "filter", tags)
+    private val failure = failureCounter("cql", attributes, "filtered", tags)
     private val error = s"failed filter: $ecql"
 
     override def validate(sf: SimpleFeature): String = {

geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/validators/package.scala

@@ -23,25 +23,25 @@ package object validators {
    * @return
    */
   def successCounter(validator: String, attribute: String, tags: Tags): Counter =
-    Metrics.counter(ConverterMetrics.name("validate"), tags.and(this.tags(validator, attribute, "pass", "")))
+    Metrics.counter(ConverterMetrics.name("validate"), tags.and(this.tags(validator, attribute, "pass")))
 
   /**
    * Create a counter for failed validations
    *
    * @param validator validator name
    * @param attribute attribute name
-   * @param reason reason tag
+   * @param result result tag
    * @param tags common tags
    * @return
    */
-  def failureCounter(validator: String, attribute: String, reason: String, tags: Tags): Counter =
-    Metrics.counter(ConverterMetrics.name("validate"), tags.and(this.tags(validator, attribute, "fail", reason)))
+  def failureCounter(validator: String, attribute: String, result: String, tags: Tags): Counter =
+    Metrics.counter(ConverterMetrics.name("validate"), tags.and(this.tags(validator, attribute, result)))
 
   /**
    * Standardized tags
    */
-  private def tags(validator: String, attribute: String, result: String, reason: String): Tags =
-    Tags.of("validator", validator, "attribute", attribute, "result", result, "reason", reason)
+  private def tags(validator: String, attribute: String, result: String): Tags =
+    Tags.of("validator", validator, "attribute", attribute, "result", result)
 
   /**
    * Holder for an attribute name + index

geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala

@@ -1478,8 +1478,8 @@ class JsonConverterTest extends Specification {
         }
         val countPass = getCounter("geomesa.converter.count", Tags.of("result", "success")).orNull
         val countFail = getCounter("geomesa.converter.count", Tags.of("result", "failure")).orNull
-        val validateNullGeom = getCounter("geomesa.converter.validate", Tags.of("result", "fail", "attribute", "geom", "reason", "null")).orNull
-        val validateBoundsGeom = getCounter("geomesa.converter.validate", Tags.of("result", "fail", "attribute", "geom", "reason", "invalid.bounds")).orNull
+        val validateNullGeom = getCounter("geomesa.converter.validate", Tags.of("result", "null", "attribute", "geom")).orNull
+        val validateBoundsGeom = getCounter("geomesa.converter.validate", Tags.of("result", "invalid.bounds", "attribute", "geom")).orNull
 
         countPass must not(beNull)
         countFail must not(beNull)