Add query URL to recorded message exchanges

Author: russgold

samples/configurations/healthState.yml

@@ -0,0 +1,13 @@
+# Copyright 2020, Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+---
+metricsNameSnakeCase: true
+queries:
+- key: name
+  keyName: server
+  jtaRuntime:
+    key: name
+    keyName: jta
+    healthState:
+      prefix: health_

samples/configurations/servlets.yml

@@ -13,7 +13,7 @@ queries:
       type: WebAppComponentRuntime
       prefix: webapp_config_
       key: name
-      values: [openSessionsHighCount, openSessionsCurrentCount]
+      values: [deploymentState, servletReloadCheckSecs, openSessionsHighCount, openSessionsCurrentCount]
       servlets:
         prefix: weblogic_servlet_
         key: servletName

src/main/java/io/prometheus/wls/rest/ExporterServlet.java

@@ -88,12 +88,17 @@ private TreeMap<String, Object> sort(Map<String, Object> metrics) {
     }
 
     private Map<String, Object> getMetrics(WebClient webClient, MBeanSelector selector) throws IOException {
-        String request = selector.getRequest();
-        String jsonResponse = webClient.withUrl(LiveConfiguration.getUrl(getProtocol(), selector)).doPostRequest(request);
-        MessagesServlet.addExchange(request, jsonResponse);
+        String jsonResponse = requestMetrics(webClient, selector);
         if (isNullOrEmptyString(jsonResponse)) return null;
 
         return LiveConfiguration.scrapeMetrics(selector, jsonResponse);
     }
 
+    private String requestMetrics(WebClient webClient, MBeanSelector selector) throws IOException {
+        String url = LiveConfiguration.getUrl(getProtocol(), selector);
+        String jsonResponse = webClient.withUrl(url).doPostRequest(selector.getRequest());
+        MessagesServlet.addExchange(url, selector.getRequest(), jsonResponse);
+        return jsonResponse;
+    }
+
 }

src/main/java/io/prometheus/wls/rest/MessagesServlet.java

@@ -4,17 +4,16 @@
 
 package io.prometheus.wls.rest;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedDeque;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import static io.prometheus.wls.rest.ServletConstants.MESSAGES_PAGE;
 
@@ -24,7 +23,7 @@
 @WebServlet("/" + MESSAGES_PAGE)
 public class MessagesServlet extends HttpServlet {
     static final int MAX_EXCHANGES = 5;
-    private static final String TEMPLATE = "REQUEST:%n%s%nREPLY:%n%s%n";
+    private static final String TEMPLATE = "REQUEST to %s:%n%s%nREPLY:%n%s%n";
 
     private static Queue<String> messages = new ConcurrentLinkedDeque<>();
 
@@ -40,8 +39,8 @@ static void clear() {
         messages.clear();
     }
 
-    static void addExchange(String request, String response) {
-        messages.add(String.format(TEMPLATE, request, response));
+    static void addExchange(String url, String request, String response) {
+        messages.add(String.format(TEMPLATE, url, request, response));
         if (messages.size() > MAX_EXCHANGES) messages.remove();
     }
 

src/test/java/io/prometheus/wls/rest/MessagesServletTest.java

@@ -4,25 +4,33 @@
 
 package io.prometheus.wls.rest;
 
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
 import java.io.IOException;
 import java.lang.reflect.Modifier;
 import java.util.stream.IntStream;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+
+import org.hamcrest.Matcher;
+import org.junit.Before;
+import org.junit.Test;
 
-import static io.prometheus.wls.rest.MessagesServlet.MAX_EXCHANGES;
 import static io.prometheus.wls.rest.HttpServletRequestStub.createGetRequest;
 import static io.prometheus.wls.rest.HttpServletResponseStub.createServletResponse;
-import static org.hamcrest.Matchers.*;
+import static io.prometheus.wls.rest.MessagesServlet.MAX_EXCHANGES;
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.both;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
 public class MessagesServletTest {
     private static final int EXCESS_EXCHANGES = 3;
+    private static final String URL = "http://localhost:7001";
     private MessagesServlet servlet = new MessagesServlet();
     private HttpServletRequestStub request = createGetRequest();
     private HttpServletResponseStub response = createServletResponse();
@@ -56,7 +64,7 @@ public void servletAnnotationIndicatesMetricsPage() {
 
     @Test
     public void afterExchangeAdded_retrieveExchange() {
-        MessagesServlet.addExchange("request 1", "response1");
+        MessagesServlet.addExchange(URL, "request 1", "response1");
 
         assertThat(MessagesServlet.getMessages(), hasItem(both(containsString("request 1")).and(containsString("response1"))));
     }
@@ -69,7 +77,7 @@ public void afterMaximumExchangesAdded_retrieveAllExchanges() {
     }
 
     private void addTestExchange(int i) {
-        MessagesServlet.addExchange("request " + i, "response " + i);
+        MessagesServlet.addExchange(URL, "request " + i, "response " + i);
     }
 
     @SuppressWarnings("unchecked")

src/test/java/io/prometheus/wls/rest/WebClientImplTest.java

@@ -57,7 +57,8 @@ public void setUp() {
         sentHeaders.clear();
     }
 
-    @Test(expected = WebClientException.class) @Ignore("Appears not to be reliable")
+    @Ignore("seems to be unreliable on some machines")
+    @Test(expected = WebClientException.class)
     public void whenUnableToReachHost_throwException() throws Exception {
         factory.createClient().withUrl(UNDEFINED_HOST_URL).doGetRequest();
     }

src/test/java/io/prometheus/wls/rest/YamlDemo.java

@@ -4,22 +4,28 @@
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
  */
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import io.prometheus.wls.rest.domain.ExporterConfig;
 import io.prometheus.wls.rest.domain.MBeanSelector;
 
-import java.io.ByteArrayInputStream;
-
-import static io.prometheus.wls.rest.DemoInputs.*;
+import static io.prometheus.wls.rest.DemoInputs.RESPONSE;
+import static io.prometheus.wls.rest.DemoInputs.compressedJsonForm;
 
 /**
  * @author Russell Gold
  */
 public class YamlDemo {
 
-    public static void main(String... args) {
-        String yamlString = YAML_STRING3;
+    public static void main(String... args) throws IOException {
+        String yamlString = String.join("\n", Files.readAllLines(Paths.get("/Users/rgold/Desktop/mohit.yml")));
+//        String yamlString = YAML_STRING3;
         System.out.println("The following configuration:\n" + yamlString);
         ExporterConfig exporterConfig = ExporterConfig.loadConfig(new ByteArrayInputStream(yamlString.getBytes()));