Skip to content

Refactor Error Handling #119

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
SerhiiNahornyi merged 1 commit into from
Nov 28, 2023
Merged

Refactor Error Handling #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 41 additions & 59 deletions src/main/java/org/prebid/cache/handlers/CacheHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.prebid.cache.exceptions.BadRequestException;
import org.prebid.cache.exceptions.DuplicateKeyException;
import org.prebid.cache.exceptions.PrebidException;
import org.prebid.cache.exceptions.RepositoryException;
import org.prebid.cache.exceptions.RequestParsingException;
import org.prebid.cache.exceptions.ResourceNotFoundException;
Expand All @@ -19,6 +18,7 @@
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Signal;

import java.util.concurrent.TimeoutException;

Expand Down Expand Up @@ -59,30 +59,32 @@ public String toString() {

<T> Mono<T> validateErrorResult(final Mono<T> mono) {
return mono.doOnSuccess(v -> log.debug("{}: {}", type, v))
.onErrorResume(t -> {
// skip overwrite, report first prebid error
if (t instanceof PrebidException) {
// TODO: 19.09.18 move to handleErrorMetrics
applyMetrics(t);

if (t instanceof DuplicateKeyException) {
return Mono.error(new BadRequestException(UUID_DUPLICATION));
}
return Mono.error(t);
} else if (t instanceof org.springframework.core.codec.DecodingException) {
return Mono.error(new RequestParsingException(t.toString()));
} else if (t instanceof org.springframework.web.server.UnsupportedMediaTypeStatusException) {
return Mono.error(new UnsupportedMediaTypeException(t.toString()));
} else {
return Mono.error(t);
}
});
.onErrorMap(DuplicateKeyException.class, error -> {
metricsRecorder.getExistingKeyError().increment();
return new BadRequestException(UUID_DUPLICATION);
})
.onErrorMap(org.springframework.core.codec.DecodingException.class, error ->
new RequestParsingException(error.toString()))
.onErrorMap(org.springframework.web.server.UnsupportedMediaTypeStatusException.class, error ->
new UnsupportedMediaTypeException(error.toString()));
}

// TODO: 19.09.18 refactor this to normal interaction with mono instead of "casting" exceptions to status codes
private Mono<ServerResponse> handleErrorMetrics(final Throwable error,
final ServerRequest request) {
if (error instanceof ResourceNotFoundException) {
Mono<ServerResponse> finalizeResult(final Mono<ServerResponse> mono,
final ServerRequest request,
final MetricsRecorderTimer timerContext) {
// transform to error, if needed and send metrics
return mono
.onErrorResume(throwable -> handleErrorMetrics(throwable, request))
.doOnEach(signal -> {
if (timerContext != null)
timerContext.stop();
});
}

private Mono<ServerResponse> handleErrorMetrics(final Throwable error, final ServerRequest request) {
if (error instanceof RepositoryException) {
recordMetric(MetricsRecorder.MeasurementTag.ERROR_DB);
} else if (error instanceof ResourceNotFoundException) {
conditionalLogger.info(
error.getMessage()
+ ". Refererring URLs: " + request.headers().header(HttpHeaders.REFERER)
Expand All @@ -103,45 +105,25 @@ private Mono<ServerResponse> handleErrorMetrics(final Throwable error,
}

return builder.error(Mono.just(error), request)
.doOnEach(signal -> {
final var response = signal.get();
HttpMethod method = request.method();
if (method == null || signal.isOnError() || response == null) {
metricsRecorder.markMeterForTag(this.metricTagPrefix,
MetricsRecorder.MeasurementTag.ERROR_UNKNOWN);
} else {
if (response.statusCode() == HttpStatus.INTERNAL_SERVER_ERROR) {
metricsRecorder.markMeterForTag(this.metricTagPrefix,
MetricsRecorder.MeasurementTag.ERROR_UNKNOWN);
} else if (response.statusCode() == HttpStatus.BAD_REQUEST) {
metricsRecorder.markMeterForTag(this.metricTagPrefix,
MetricsRecorder.MeasurementTag.ERROR_BAD_REQUEST);
} else if (response.statusCode() == HttpStatus.NOT_FOUND) {
metricsRecorder.markMeterForTag(this.metricTagPrefix,
MetricsRecorder.MeasurementTag.ERROR_MISSINGID);
}
}
});
.doOnEach(signal -> handleErrorStatusCodes(request, signal));
}

Mono<ServerResponse> finalizeResult(final Mono<ServerResponse> mono,
final ServerRequest request,
final MetricsRecorderTimer timerContext) {
// transform to error, if needed and send metrics
return mono.onErrorResume(throwable -> handleErrorMetrics(throwable, request))
.doOnEach(signal -> {
if (timerContext != null)
timerContext.stop();
});
}

void applyMetrics(Throwable t) {
if (t instanceof RepositoryException) {
metricsRecorder.markMeterForTag(this.metricTagPrefix, MetricsRecorder.MeasurementTag.ERROR_DB);
private void handleErrorStatusCodes(ServerRequest request, Signal<ServerResponse> signal) {
final var response = signal.get();
HttpMethod method = request.method();
if (method == null || signal.isOnError() || response == null) {
recordMetric(MetricsRecorder.MeasurementTag.ERROR_UNKNOWN);
} else if (response.statusCode() == HttpStatus.INTERNAL_SERVER_ERROR) {
recordMetric(MetricsRecorder.MeasurementTag.ERROR_UNKNOWN);
} else if (response.statusCode() == HttpStatus.BAD_REQUEST) {
recordMetric(MetricsRecorder.MeasurementTag.ERROR_BAD_REQUEST);
} else if (response.statusCode() == HttpStatus.NOT_FOUND) {
recordMetric(MetricsRecorder.MeasurementTag.ERROR_MISSINGID);
}
}

if (t instanceof DuplicateKeyException) {
metricsRecorder.getExistingKeyError().increment();
}
private void recordMetric(MetricsRecorder.MeasurementTag tag) {
metricsRecorder.markMeterForTag(this.metricTagPrefix, tag);
}

}
3 changes: 1 addition & 2 deletions src/main/java/org/prebid/cache/repository/aerospike/AerospikeRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ && getRetryCodes().contains(((AerospikeException) e).getResultCode()))
}

private <T> Mono<T> handleAerospikeError(Throwable throwable) {
if (throwable instanceof AerospikeException) {
AerospikeException aerospikeException = (AerospikeException) throwable;
if (throwable instanceof AerospikeException aerospikeException) {
if (aerospikeException.getResultCode() == ResultCode.KEY_EXISTS_ERROR) {
return Mono.error(new DuplicateKeyException(throwable.toString(), throwable));
}
Expand Down