Merge #891

891: Log more response errors r=Zelldon a=Zelldon Previously we only logged (not sure but current assumption) BAD_REQUEST returned from SAAS Related to #889 Co-authored-by: Christopher Zell <[email protected]>
zeebe-io · Sep 19, 2023 · 79478e3 · 79478e3
2 parents 04b012e + 0e3352a
commit 79478e3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/cloud-client/src/main/java/io/zeebe/clustertestbench/cloud/CloudAPIClientFactory.java b/cloud-client/src/main/java/io/zeebe/clustertestbench/cloud/CloudAPIClientFactory.java
@@ -1,7 +1,7 @@
 package io.zeebe.clustertestbench.cloud;
 
-import io.zeebe.clustertestbench.cloud.filter.BadRequestResponseFilter;
 import io.zeebe.clustertestbench.cloud.filter.EntityLoggingFilter;
+import io.zeebe.clustertestbench.cloud.filter.FailedResponseFilter;
 import io.zeebe.clustertestbench.cloud.oauth.OAuthInterceptor;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
@@ -24,7 +24,7 @@ public CloudAPIClient createCloudAPIClient(
     final Client client =
         ClientBuilder.newBuilder()
             .register(oauthInterceptor)
-            .register(BadRequestResponseFilter.class)
+            .register(FailedResponseFilter.class)
             .register(EntityLoggingFilter.class)
             .build();
     final WebTarget target = client.target(cloudApiUrl);

diff --git a/...loud/filter/BadRequestResponseFilter.java → ...ch/cloud/filter/FailedResponseFilter.java b/...loud/filter/BadRequestResponseFilter.java → ...ch/cloud/filter/FailedResponseFilter.java
@@ -7,26 +7,35 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class BadRequestResponseFilter implements ClientResponseFilter {
+public class FailedResponseFilter implements ClientResponseFilter {
+
+  private static final Logger LOG = LoggerFactory.getLogger(FailedResponseFilter.class);
+  public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
   @Override
   public void filter(
       final ClientRequestContext requestContext, final ClientResponseContext responseContext)
       throws IOException {
+    if (responseContext.getStatus() > 399) {
 
-    if (responseContext.getStatus() == 400) {
-      final String requestBody = new ObjectMapper().writeValueAsString(requestContext.getEntity());
+      final String requestBody = OBJECT_MAPPER.writeValueAsString(requestContext.getEntity());
       final String responseBody =
           IOUtils.toString(responseContext.getEntityStream(), StandardCharsets.UTF_8);
 
-      throw new IOException(
-          "BAD REQUEST returned from URI: "
+      final String errorMessage =
+          responseContext.getStatusInfo().toEnum()
+              + " returned from URI: "
               + requestContext.getUri()
               + ", requestBody:"
               + requestBody
               + ", responseBody: "
-              + responseBody);
+              + responseBody;
+
+      LOG.error(errorMessage);
+      throw new IOException(errorMessage);
     }
   }
 }
diff --git a/cloud-client/src/main/java/io/zeebe/clustertestbench/cloud/oauth/OAuthClientFactory.java b/cloud-client/src/main/java/io/zeebe/clustertestbench/cloud/oauth/OAuthClientFactory.java
@@ -1,6 +1,6 @@
 package io.zeebe.clustertestbench.cloud.oauth;
 
-import io.zeebe.clustertestbench.cloud.filter.BadRequestResponseFilter;
+import io.zeebe.clustertestbench.cloud.filter.FailedResponseFilter;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
 import jakarta.ws.rs.client.WebTarget;
@@ -9,8 +9,7 @@
 public class OAuthClientFactory {
 
   public OAuthClient createOAuthClient(final String authenticationURL) {
-    final Client client =
-        ClientBuilder.newBuilder().register(BadRequestResponseFilter.class).build();
+    final Client client = ClientBuilder.newBuilder().register(FailedResponseFilter.class).build();
 
     final WebTarget target = client.target(authenticationURL);
     final ResteasyWebTarget rtarget = (ResteasyWebTarget) target;

diff --git a/...src/main/java/io/zeebe/clustertestbench/internal/cloud/InternalCloudAPIClientFactory.java b/...src/main/java/io/zeebe/clustertestbench/internal/cloud/InternalCloudAPIClientFactory.java
@@ -1,6 +1,6 @@
 package io.zeebe.clustertestbench.internal.cloud;
 
-import io.zeebe.clustertestbench.cloud.filter.BadRequestResponseFilter;
+import io.zeebe.clustertestbench.cloud.filter.FailedResponseFilter;
 import io.zeebe.clustertestbench.cloud.oauth.OAuthInterceptor;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
@@ -25,7 +25,7 @@ public InternalCloudAPIClient createCloudAPIClient(
     final Client client =
         ClientBuilder.newBuilder()
             .register(oauthInterceptor)
-            .register(BadRequestResponseFilter.class)
+            .register(FailedResponseFilter.class)
             .build();
     final WebTarget target = client.target(cloudApiUrl);
     final ResteasyWebTarget rtarget = (ResteasyWebTarget) target;