Merge pull request #35 from labbsr0x/dependency_regex

Dependency error regex

Author: gilliardmacedo

src/main/java/br/com/labbs/monitor/MonitorMetrics.java

@@ -62,14 +62,17 @@ public enum MonitorMetrics {
     private boolean noBuckets = false;
     private boolean initialized;
 
+    private String dependencyErrorRegex;
+    
     /**
      * Initialize metric collectors
      *
      * @param collectJvmMetrics  collect or not JVM metrics
      * @param applicationVersion which version of your app handled the request
+     * @param dependencyErrorRegex 
      * @param buckets            the numbers of buckets if defined
      */
-    public void init(boolean collectJvmMetrics, String applicationVersion, double... buckets) {
+    public void init(boolean collectJvmMetrics, String applicationVersion, String dependencyErrorRegex, double... buckets) {
         if (initialized) {
             throw new IllegalStateException("The MonitorMetrics instance has already been initialized. "
                     + "The MonitorMetrics.INSTANCE.init method must be executed only once");
@@ -106,6 +109,7 @@ public void init(boolean collectJvmMetrics, String applicationVersion, double...
             DefaultExports.register(collectorRegistry);
         }
 
+        this.dependencyErrorRegex = dependencyErrorRegex;
         initialized = true;
     }
 
@@ -162,12 +166,24 @@ public void collectSize(String type, String status, String method, String addr,
     public void collectDependencyTime(String name, String type, String status, String method, String addr,
             boolean isError, String errorMessage, double elapsedSeconds) {
         if (initialized && !noBuckets) {
-            dependencyRequestSeconds.labels(name, type, status, method, addr, Boolean.toString(isError), errorMessage)
+        	String errorToWrite = errorMessage;
+        	if (dependencyErrorRegex != null) {
+        		errorToWrite = sanitizeError(errorMessage);
+        	}
+            dependencyRequestSeconds.labels(name, type, status, method, addr, Boolean.toString(isError), errorToWrite)
                     .observe(elapsedSeconds);
         }
     }
 
-    /**
+	private String sanitizeError(String errorMessage) {
+		try {
+            return errorMessage.replaceAll(this.dependencyErrorRegex, "");
+        } catch (Exception e) {
+            return "#ERROR INVALID REGEX#";
+        }
+	}
+
+	/**
      * Cancel all scheduled dependency checkers and terminates the executor timer.
      */
     public void cancelAllDependencyCheckers() {

src/main/java/br/com/labbs/monitor/filter/MetricsCollectorFilter.java

@@ -1,7 +1,11 @@
 package br.com.labbs.monitor.filter;
 
-import br.com.labbs.monitor.MonitorMetrics;
-import io.prometheus.client.SimpleTimer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Logger;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -12,15 +16,9 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import br.com.labbs.monitor.MonitorMetrics;
+import io.prometheus.client.SimpleTimer;
 /**
  * The MetricsFilter class provides a high-level filter that enables collection of (latency, amount and response
  * size metrics) for Servlet performance, based on schema, status code, HTTP method and URI path.
@@ -62,11 +60,13 @@ public class MetricsCollectorFilter implements Filter {
     private static final String APPLICATION_VERSION = "application-version";
     private static final String DEFAULT_FILTER_REGEX = "[^A-zÀ-ú .,]+";
     private static final String FILTER_REGEX_PARAM = "error-info-regex";
+    private static final String ENABLE_ERROR_REGEX_DEPENDENCY = "enable-error-regex-dependency";
     private static final String FILTER_MAX_SIZE_PARAM = "error-info-max-size";
     private static final Logger LOGGER = Logger.getLogger(MetricsCollectorFilter.class.getName());
     private final List<String> exclusions = new ArrayList<String>();
     private int filter_max_size = 50;
     private String filter_regex = "";
+    private boolean enableErrorDependencyRegex = true; //defaut
 
 
     private int pathDepth = 0;
@@ -118,6 +118,12 @@ public void init(FilterConfig filterConfig) {
             if (isNotEmpty(exportJvmMetricsStr)) {
                 exportJvmMetrics = Boolean.parseBoolean(exportJvmMetricsStr);
             }
+            
+            String enableErrorRegexDependencyParam = filterConfig.getInitParameter(ENABLE_ERROR_REGEX_DEPENDENCY);
+            if ("false".equalsIgnoreCase(enableErrorRegexDependencyParam)) {
+                enableErrorDependencyRegex = false;
+            }
+            
             exportApplicationVersion = filterConfig.getInitParameter(APPLICATION_VERSION);
 
             filter_max_size = filterConfig.getInitParameter(FILTER_MAX_SIZE_PARAM) != null ?
@@ -128,8 +134,13 @@ public void init(FilterConfig filterConfig) {
         String version = isNotEmpty(exportApplicationVersion) ? exportApplicationVersion : getApplicationVersionFromPropertiesFile();
         // Allow users to capture error messages
         errorMessageParam = filterConfig.getInitParameter(ERROR_MESSAGE_PARAM);
-
-        MonitorMetrics.INSTANCE.init(exportJvmMetrics, version, buckets);
+        
+        String dependencyErrorRegex = null;
+        if (enableErrorDependencyRegex) {
+        	dependencyErrorRegex = filter_regex;
+        }
+        
+        MonitorMetrics.INSTANCE.init(exportJvmMetrics, version, dependencyErrorRegex, buckets);
     }
 
     /**