Test APM Server client with configured proxy server_url (#2253)

Author: eyalkoren

apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerClientTest.java

@@ -78,15 +78,15 @@ public class ApmServerClientTest {
     @Before
     public void setUp() throws IOException {
         URL url1 = new URL("http", "localhost", apmServer1.port(), "/");
-        URL url2 = new URL("http", "localhost", apmServer2.port(), "/");
+        URL url2 = new URL("http", "localhost", apmServer2.port(), "/proxy");
         // APM server 6.x style
         apmServer1.stubFor(get(urlEqualTo("/")).willReturn(okForJson(Map.of("ok", Map.of("version", "6.7.0-SNAPSHOT")))));
         apmServer1.stubFor(get(urlEqualTo("/test")).willReturn(notFound()));
         apmServer1.stubFor(get(urlEqualTo("/not-found")).willReturn(notFound()));
         // APM server 7+ style
-        apmServer2.stubFor(get(urlEqualTo("/")).willReturn(okForJson(Map.of("version", "7.3.0-RC1"))));
-        apmServer2.stubFor(get(urlEqualTo("/test")).willReturn(ok("hello from server 2")));
-        apmServer2.stubFor(get(urlEqualTo("/not-found")).willReturn(notFound()));
+        apmServer2.stubFor(get(urlEqualTo("/proxy/")).willReturn(okForJson(Map.of("version", "7.3.0-RC1"))));
+        apmServer2.stubFor(get(urlEqualTo("/proxy/test")).willReturn(ok("hello from server 2")));
+        apmServer2.stubFor(get(urlEqualTo("/proxy/not-found")).willReturn(notFound()));
 
         config = SpyConfiguration.createSpyConfig();
         reporterConfiguration = config.getConfig(ReporterConfiguration.class);
@@ -176,7 +176,7 @@ public void testUseNextUrlOnError() throws Exception {
         apmServerClient.execute("/test", HttpURLConnection::getResponseCode);
 
         apmServer1.verify(0, getRequestedFor(urlEqualTo("/test")));
-        apmServer2.verify(1, getRequestedFor(urlEqualTo("/test")));
+        apmServer2.verify(1, getRequestedFor(urlEqualTo("/proxy/test")));
         assertThat(apmServerClient.getErrorCount()).isEqualTo(1);
     }
 
@@ -194,7 +194,7 @@ public void testRetry() throws Exception {
         assertThat(apmServerClient.<String>execute("/test", conn -> new String(conn.getInputStream().readAllBytes()))).isEqualTo("hello from server 2");
         assertThat(Objects.requireNonNull(apmServerClient.getCurrentUrl()).getPort()).isEqualTo(apmServer2.port());
         apmServer1.verify(1, getRequestedFor(urlEqualTo("/test")));
-        apmServer2.verify(1, getRequestedFor(urlEqualTo("/test")));
+        apmServer2.verify(1, getRequestedFor(urlEqualTo("/proxy/test")));
         assertThat(apmServerClient.getErrorCount()).isEqualTo(1);
     }
 
@@ -204,7 +204,7 @@ public void testRetryFailure() {
             .isInstanceOf(FileNotFoundException.class)
             .matches(t -> t.getSuppressed().length == 1, "should have a suppressed exception");
         apmServer1.verify(1, getRequestedFor(urlEqualTo("/not-found")));
-        apmServer2.verify(1, getRequestedFor(urlEqualTo("/not-found")));
+        apmServer2.verify(1, getRequestedFor(urlEqualTo("/proxy/not-found")));
         // two failures -> urls wrap
         assertThat(Objects.requireNonNull(apmServerClient.getCurrentUrl()).getPort()).isEqualTo(apmServer1.port());
         assertThat(apmServerClient.getErrorCount()).isEqualTo(2);
@@ -217,7 +217,7 @@ public void testExecuteSuccessfullyForAllUrls() {
             return null;
         });
         apmServer1.verify(1, getRequestedFor(urlEqualTo("/not-found")));
-        apmServer2.verify(1, getRequestedFor(urlEqualTo("/not-found")));
+        apmServer2.verify(1, getRequestedFor(urlEqualTo("/proxy/not-found")));
         // no failures -> urls in initial state
         assertThat(Objects.requireNonNull(apmServerClient.getCurrentUrl()).getPort()).isEqualTo(apmServer1.port());
         assertThat(apmServerClient.getErrorCount()).isZero();
@@ -231,7 +231,7 @@ public void testExecuteFailureForAllUrls() {
             return null;
         });
         apmServer1.verify(1, getRequestedFor(urlEqualTo("/not-found")));
-        apmServer2.verify(1, getRequestedFor(urlEqualTo("/not-found")));
+        apmServer2.verify(1, getRequestedFor(urlEqualTo("/proxy/not-found")));
         assertThat(apmServerClient.getErrorCount()).isEqualTo(0);
     }