Skip to content

Remove heartbeat metric #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2023
Merged

Remove heartbeat metric #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a2f4eb
Remove heartbeat metric
pboos Aug 23, 2023
fc525a5
Merge branch 'main' into update/remove-heartbeat
pboos Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions ...src/main/java/com/getyourguide/openapi/validation/api/metrics/DefaultMetricsReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -56,12 +51,6 @@ private MetricTag[] createTagsForStartup(boolean isValidationEnabled) {
return tags.toArray(MetricTag[]::new);
}

private MetricTag[] createTagsForValidation() {
var tags = new ArrayList<MetricTag>();
addAdditionalTags(tags);
return tags.toArray(MetricTag[]::new);
}

private void addAdditionalTags(ArrayList<MetricTag> tags) {
if (configuration.getMetricAdditionalTags() != null) {
tags.addAll(configuration.getMetricAdditionalTags());
Expand Down
2 changes: 0 additions & 2 deletions ...on-api/src/main/java/com/getyourguide/openapi/validation/api/metrics/MetricsReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ public interface MetricsReporter {
void reportViolation(OpenApiViolation violation);

void reportStartup(boolean isValidationEnabled);

void reportValidationHeartbeat();
}
16 changes: 0 additions & 16 deletions ...-core/src/main/java/com/getyourguide/openapi/validation/core/OpenApiRequestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -38,7 +33,6 @@ public OpenApiRequestValidator(
this.threadPoolExecutor = threadPoolExecutor;
this.validator = validator;
this.validationReportHandler = validationReportHandler;
this.metricsReporter = metricsReporter;

metricsReporter.reportStartup(validator != null);
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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();
}
}
}