Dev (#864)

* MONIT-40499 upgrade java-lib dependency (#862)

* Update maven.yml

* MONIT-40739: Improve proxy error handling (#863)

---------

Co-authored-by: German Laullon <glaullon@vmware.com>
Co-authored-by: Norayr25 <nchaparyan@vmware.com>

Author: 3 people

.github/workflows/maven.yml

@@ -22,6 +22,8 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: "temurin"
           cache: maven
+      - name: versions
+        run: mvn -v
       - name: Check code format
         run: mvn -f proxy git-code-format:validate-code-format
       - name: Build with Maven

proxy/pom.xml

@@ -388,7 +388,7 @@
     <dependency>
       <groupId>com.wavefront</groupId>
       <artifactId>java-lib</artifactId>
-      <version>2023-04.3</version>
+      <version>2023-07.8</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>

proxy/src/main/java/com/wavefront/agent/TokenWorkerCSP.java

@@ -3,6 +3,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Strings;
 import com.wavefront.agent.api.APIContainer;
 import com.wavefront.agent.api.CSPAPI;
@@ -32,7 +34,7 @@
 public class TokenWorkerCSP
     implements TokenWorker, TokenWorker.External, TokenWorker.Scheduled, TenantInfo {
   private static final String GET_CSP_ACCESS_TOKEN_ERROR_MESSAGE =
-      "Failed to get access token from CSP.";
+      "Failed to get access token from CSP (%s). %s";
   private static final ScheduledExecutorService executor =
       Executors.newScheduledThreadPool(1, new NamedThreadFactory("csp-token-updater"));
   private static final Logger log = Logger.getLogger(TokenWorkerCSP.class.getCanonicalName());
@@ -152,12 +154,24 @@ private long processResponse(final Response response) {
     long nextIn = 10;
     if (response.getStatusInfo().getFamily() != SUCCESSFUL) {
       errors.get().inc();
-      log.severe(
-          GET_CSP_ACCESS_TOKEN_ERROR_MESSAGE
-              + "("
-              + this.proxyAuthMethod
-              + ") Status: "
-              + response.getStatusInfo().getStatusCode());
+      String jsonString = response.readEntity(String.class);
+      // Parse the JSON response
+      ObjectMapper objectMapper = new ObjectMapper();
+      try {
+        JsonNode jsonNode = objectMapper.readTree(jsonString);
+        String message = jsonNode.get("message").asText();
+
+        log.severe(
+            String.format(GET_CSP_ACCESS_TOKEN_ERROR_MESSAGE, this.proxyAuthMethod, message)
+                + ". Status: "
+                + response.getStatusInfo().getStatusCode());
+
+      } catch (Exception e) {
+        log.severe(
+            String.format(GET_CSP_ACCESS_TOKEN_ERROR_MESSAGE, this.proxyAuthMethod, jsonString)
+                + ". Status: "
+                + response.getStatusInfo().getStatusCode());
+      }
     } else {
       try {
         final TokenExchangeResponseDTO tokenExchangeResponseDTO =

proxy/src/test/java/com/wavefront/agent/TenantInfoTest.java

@@ -146,6 +146,7 @@ public void testRun_UnsuccessfulResponseUsingOAuthApp() {
 
     // Set up expectations
     expect(mockResponse.getStatusInfo()).andReturn(statusTypeMock).times(3);
+    expect(mockResponse.readEntity(String.class)).andReturn("");
     expect(statusTypeMock.getStatusCode()).andReturn(400).times(2);
     expect(statusTypeMock.getFamily()).andReturn(Response.Status.Family.SERVER_ERROR);
     expect(
@@ -195,6 +196,7 @@ public void testRun_UnsuccessfulResponseUsingCSPAPIToken() {
     TokenWorkerCSP tokenWorkerCSP = new TokenWorkerCSP("csp-api-token", wfServer);
 
     // Set up expectations
+    expect(mockResponse.readEntity(String.class)).andReturn("");
     expect(mockResponse.getStatusInfo()).andReturn(statusTypeMock).times(3);
     expect(statusTypeMock.getStatusCode()).andReturn(400).times(2);
     expect(statusTypeMock.getFamily()).andReturn(Response.Status.Family.SERVER_ERROR);