diff options
author | Yngve Aasheim <yngveaasheim@users.noreply.github.com> | 2023-01-20 12:19:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-20 12:19:45 +0100 |
commit | 8182df94d989d3a75ccdac987ff4dd2aa2123aa3 (patch) | |
tree | d16ef3d5e7ece19777a3045ac753745592275c8a /jdisc-security-filters/src/main/java/com/yahoo/jdisc | |
parent | 3bb18ec8abcf0aed683b98f118ca7e314d49eb8d (diff) |
Use ContainerMetrics enum more places
Diffstat (limited to 'jdisc-security-filters/src/main/java/com/yahoo/jdisc')
-rw-r--r-- | jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java index 2feea00e171..f1366ceea72 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java @@ -6,6 +6,7 @@ import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Response; import com.yahoo.jdisc.http.filter.DiscFilterRequest; import com.yahoo.jdisc.http.filter.security.base.JsonSecurityRequestFilterBase; +import com.yahoo.metrics.ContainerMetrics; import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig; import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig.Rule.Action; import com.yahoo.restapi.Path; @@ -74,12 +75,12 @@ public class RuleBasedRequestFilter extends JsonSecurityRequestFilterBase { "dryrun", Boolean.toString(dryrun), "statusCode", Integer.toString(statusCode))); if (response != null) { - metric.add("jdisc.http.filter.rule.blocked_requests", 1L, metricContext); + metric.add(ContainerMetrics.JDISC_HTTP_FILTER_RULE_BLOCKED_REQUESTS.baseName(), 1L, metricContext); log.log(Level.FINE, () -> String.format( "Blocking request '%h' with status code '%d' using rule '%s' (dryrun=%b)", request, statusCode, ruleName, dryrun)); return dryrun ? Optional.empty() : Optional.of(response); } else { - metric.add("jdisc.http.filter.rule.allowed_requests", 1L, metricContext); + metric.add(ContainerMetrics.JDISC_HTTP_FILTER_RULE_ALLOWED_REQUESTS.baseName(), 1L, metricContext); log.log(Level.FINE, () -> String.format("Allowing request '%h' using rule '%s' (dryrun=%b)", request, ruleName, dryrun)); return Optional.empty(); } |