reduce nesting in telemetry middlewares

Author: jenschude

commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogMiddleware.java

@@ -57,13 +57,11 @@ public CompletableFuture<ApiHttpResponse<byte[]>> invoke(ApiHttpRequest request,
             if (response != null) {
                 statusCode = response.getStatusCode();
             }
+            else if (throwable instanceof ApiHttpException && ((ApiHttpException) throwable).getResponse() != null) {
+                statusCode = ((ApiHttpException) throwable).getResponse().getStatusCode();
+            }
             else {
-                if (throwable instanceof ApiHttpException && ((ApiHttpException) throwable).getResponse() != null) {
-                    statusCode = ((ApiHttpException) throwable).getResponse().getStatusCode();
-                }
-                else {
-                    statusCode = 0;
-                }
+                statusCode = 0;
             }
             try {
                 submitClientDurationMetric(request, apiInstance, Duration.between(start, Instant.now()).toMillis(),

commercetools/commercetools-monitoring-newrelic/src/main/java/com/commercetools/monitoring/newrelic/NewRelicTelemetryMiddleware.java

@@ -71,17 +71,16 @@ public CompletableFuture<ApiHttpResponse<byte[]>> invoke(ApiHttpRequest request,
                 statusCode = response.getStatusCode();
                 message = response.getMessage();
             }
+            else if (throwable instanceof ApiHttpException && ((ApiHttpException) throwable).getResponse() != null) {
+                ApiHttpResponse<byte[]> errorResponse = ((ApiHttpException) throwable).getResponse();
+                statusCode = errorResponse.getStatusCode();
+                message = errorResponse.getMessage();
+            }
             else {
-                if (throwable instanceof ApiHttpException && ((ApiHttpException) throwable).getResponse() != null) {
-                    ApiHttpResponse<byte[]> errorResponse = ((ApiHttpException) throwable).getResponse();
-                    statusCode = errorResponse.getStatusCode();
-                    message = errorResponse.getMessage();
-                }
-                else {
-                    statusCode = 0;
-                    message = throwable.getMessage();
-                }
+                statusCode = 0;
+                message = throwable.getMessage();
             }
+
             segment.ifPresent(s -> s.reportAsExternal(HttpParameters.library("commercetools-sdk-java-v2")
                     .uri(request.getUri())
                     .procedure(request.getMethod().name())