Fix tests

Author: adutra

runtime/service/src/test/java/org/apache/polaris/service/metrics/MetricsTestBase.java

@@ -39,11 +39,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @ExtendWith(TestEnvironmentExtension.class)
@@ -72,26 +71,23 @@ public void clearMetrics() {
     registry.clear();
   }
 
-  private Map<String, MetricFamily> fetchMetrics(String endpoint) {
+  private Map<String, MetricFamily> fetchMetrics() {
     AtomicReference<Map<String, MetricFamily>> value = new AtomicReference<>();
     Awaitility.await()
         .atMost(Duration.ofMinutes(2))
         .untilAsserted(
             () -> {
-              value.set(
-                  TestMetricsUtil.fetchMetrics(
-                      fixture.client, testEnv.baseManagementUri(), endpoint));
+              value.set(TestMetricsUtil.fetchMetrics(fixture.client, testEnv.baseManagementUri()));
               assertThat(value.get()).containsKey(API_METRIC_NAME);
               assertThat(value.get()).containsKey(HTTP_METRIC_NAME);
             });
     return value.get();
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"%s/metrics", "%s/q/metrics"})
-  public void testMetricsEmittedOnSuccessfulRequest(String endpoint) {
+  @Test
+  public void testMetricsEmittedOnSuccessfulRequest() {
     sendSuccessfulRequest();
-    Map<String, MetricFamily> allMetrics = fetchMetrics(endpoint);
+    Map<String, MetricFamily> allMetrics = fetchMetrics();
     assertThat(allMetrics).containsKey(API_METRIC_NAME);
     assertThat(allMetrics.get(API_METRIC_NAME).getMetrics())
         .satisfiesOnlyOnce(
@@ -138,11 +134,10 @@ public void testMetricsEmittedOnSuccessfulRequest(String endpoint) {
             });
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"%s/metrics", "%s/q/metrics"})
-  public void testMetricsEmittedOnFailedRequest(String endpoint) {
+  @Test
+  public void testMetricsEmittedOnFailedRequest() {
     sendFailingRequest();
-    Map<String, MetricFamily> allMetrics = fetchMetrics(endpoint);
+    Map<String, MetricFamily> allMetrics = fetchMetrics();
     assertThat(allMetrics).containsKey(API_METRIC_NAME);
     assertThat(allMetrics.get(API_METRIC_NAME).getMetrics())
         .satisfiesOnlyOnce(

runtime/service/src/test/java/org/apache/polaris/service/ratelimiter/RateLimiterFilterTest.java

@@ -158,7 +158,7 @@ public void testMetricsAreEmittedWhenRateLimiting() {
     // polaris_principal_roles_listPrincipalRoles_seconds_count{application="Polaris",class="org.apache.polaris.service.admin.api.PolarisPrincipalRolesApi",environment="prod",exception="none",method="listPrincipalRoles"} 50.0
 
     Map<String, MetricFamily> metrics =
-        TestMetricsUtil.fetchMetrics(fixture.client, testEnv.baseManagementUri(), "%s/q/metrics");
+        TestMetricsUtil.fetchMetrics(fixture.client, testEnv.baseManagementUri());
 
     assertThat(metrics)
         .isNotEmpty()

runtime/service/src/test/java/org/apache/polaris/service/test/DefaultTestEnvironmentResolver.java

@@ -29,7 +29,7 @@ public class DefaultTestEnvironmentResolver implements TestEnvironmentResolver {
   @Override
   public TestEnvironment resolveTestEnvironment(ExtensionContext extensionContext) {
     return new TestEnvironment(
-        String.format("http://localhost:%d", localPort),
-        String.format("http://localhost:%d", localManagementPort));
+        String.format("http://localhost:%d/", localPort),
+        String.format("http://localhost:%d/", localManagementPort));
   }
 }

runtime/service/src/test/java/org/apache/polaris/service/test/TestMetricsUtil.java

@@ -36,10 +36,8 @@
 /** Utils for working with metrics in tests */
 public class TestMetricsUtil {
 
-  public static Map<String, MetricFamily> fetchMetrics(
-      Client client, URI baseManagementUri, String endpointPath) {
-    Response response =
-        client.target(String.format(endpointPath, baseManagementUri)).request().get();
+  public static Map<String, MetricFamily> fetchMetrics(Client client, URI baseManagementUri) {
+    Response response = client.target(baseManagementUri.resolve("q/metrics")).request().get();
     if (response.getStatus() == Status.MOVED_PERMANENTLY.getStatusCode()) {
       response = client.target(response.getLocation()).request().get();
     }