diff --git a/openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/DefaultMetricsReporter.java b/openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/DefaultMetricsReporter.java index cea88d65..c9fd6dc3 100644 --- a/openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/DefaultMetricsReporter.java +++ b/openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/DefaultMetricsReporter.java @@ -24,11 +24,6 @@ public void reportStartup(boolean isValidationEnabled) { metricsClient.increment(buildMetricName(".startup"), createTagsForStartup(isValidationEnabled)); } - @Override - public void reportValidationHeartbeat() { - metricsClient.increment(buildMetricName(".validation_heartbeat"), createTagsForValidation()); - } - private String buildMetricName(String suffix) { return configuration.getMetricName() + suffix; } @@ -56,12 +51,6 @@ private MetricTag[] createTagsForStartup(boolean isValidationEnabled) { return tags.toArray(MetricTag[]::new); } - private MetricTag[] createTagsForValidation() { - var tags = new ArrayList(); - addAdditionalTags(tags); - return tags.toArray(MetricTag[]::new); - } - private void addAdditionalTags(ArrayList tags) { if (configuration.getMetricAdditionalTags() != null) { tags.addAll(configuration.getMetricAdditionalTags()); diff --git a/openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/MetricsReporter.java b/openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/MetricsReporter.java index bfc691db..2f14db84 100644 --- a/openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/MetricsReporter.java +++ b/openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/MetricsReporter.java @@ -6,6 +6,4 @@ public interface MetricsReporter { void reportViolation(OpenApiViolation violation); void reportStartup(boolean isValidationEnabled); - - void reportValidationHeartbeat(); } diff --git a/openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/OpenApiRequestValidator.java b/openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/OpenApiRequestValidator.java index 941b1d5a..aab98264 100644 --- a/openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/OpenApiRequestValidator.java +++ b/openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/OpenApiRequestValidator.java @@ -20,14 +20,9 @@ @Slf4j public class OpenApiRequestValidator { - public static final int METRIC_REPORT_VALIDATION_HEARTBEAT_FREQUENCY_MILLIS = 60 * 60 * 1000; // 1h - private final ThreadPoolExecutor threadPoolExecutor; private final OpenApiInteractionValidatorWrapper validator; private final ValidationReportHandler validationReportHandler; - private final MetricsReporter metricsReporter; - - private long lastReportValidationDateTime = 0; public OpenApiRequestValidator( ThreadPoolExecutor threadPoolExecutor, @@ -38,7 +33,6 @@ public OpenApiRequestValidator( this.threadPoolExecutor = threadPoolExecutor; this.validator = validator; this.validationReportHandler = validationReportHandler; - this.metricsReporter = metricsReporter; metricsReporter.reportStartup(validator != null); } @@ -76,7 +70,6 @@ public ValidationResult validateRequestObject( var simpleRequest = buildSimpleRequest(request, requestBody); var result = validator.validateRequest(simpleRequest); validationReportHandler.handleValidationReport(request, response, Direction.REQUEST, requestBody, result); - reportValidationHeartbeat(); return buildValidationResult(result); } catch (Exception e) { log.error("Could not validate request", e); @@ -122,7 +115,6 @@ public ValidationResult validateResponseObject( responseBuilder.build() ); validationReportHandler.handleValidationReport(request, response, Direction.RESPONSE, responseBody, result); - reportValidationHeartbeat(); return buildValidationResult(result); } catch (Exception e) { log.error("Could not validate response", e); @@ -141,12 +133,4 @@ private ValidationResult buildValidationResult(ValidationReport validationReport return ValidationResult.INVALID; } - - private synchronized void reportValidationHeartbeat() { - var currentTimeMillis = System.currentTimeMillis(); - if (lastReportValidationDateTime + METRIC_REPORT_VALIDATION_HEARTBEAT_FREQUENCY_MILLIS < currentTimeMillis) { - lastReportValidationDateTime = currentTimeMillis; - metricsReporter.reportValidationHeartbeat(); - } - } }