HBASE-25895 Implement a Cluster Metrics JSON endpoint (addendum)

apache · Mar 14, 2022 · f640b7f · f640b7f
1 parent 36a5f86
commit f640b7f
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...er/src/test/java/org/apache/hadoop/hbase/master/http/TestApiV1ClusterMetricsResource.java b/...er/src/test/java/org/apache/hadoop/hbase/master/http/TestApiV1ClusterMetricsResource.java
@@ -28,6 +28,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ConnectionRule;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.MiniClusterRule;
 import org.apache.hadoop.hbase.ServerName;
@@ -72,8 +73,9 @@ public class TestApiV1ClusterMetricsResource {
       .build())
     .setConfiguration(() -> {
       // enable Master InfoServer and random port selection
-      final Configuration conf = new Configuration();
+      final Configuration conf = HBaseConfiguration.create();
       conf.setInt(HConstants.MASTER_INFO_PORT, 0);
+      conf.set("hbase.http.jersey.tracing.type", "ON_DEMAND");
       return conf;
     })
     .build();
@@ -148,6 +150,7 @@ protected void after() {
   public void testGetRoot() {
     final String response = classRule.getTarget()
       .request(MediaType.APPLICATION_JSON_TYPE)
+      .header("X-Jersey-Tracing-Accept", true)
       .get(String.class);
     assertThat(response, allOf(
       containsString("\"hbase_version\":"),
@@ -160,6 +163,7 @@ public void testGetRoot() {
   public void testGetRootHtml() {
     assertThrows(NotAcceptableException.class, () -> classRule.getTarget()
       .request(MediaType.TEXT_HTML_TYPE)
+      .header("X-Jersey-Tracing-Accept", true)
       .get(String.class));
   }
 
@@ -168,6 +172,7 @@ public void testGetLiveServers() {
     final String response = classRule.getTarget()
       .path("live_servers")
       .request(MediaType.APPLICATION_JSON_TYPE)
+      .header("X-Jersey-Tracing-Accept", true)
       .get(String.class);
     assertThat(response, allOf(
       startsWith("{\"data\":["),
@@ -179,6 +184,7 @@ public void testGetLiveServersHtml() {
     assertThrows(NotAcceptableException.class, () -> classRule.getTarget()
       .path("live_servers")
       .request(MediaType.TEXT_HTML_TYPE)
+      .header("X-Jersey-Tracing-Accept", true)
       .get(String.class));
   }
 
@@ -187,6 +193,7 @@ public void testGetDeadServers() {
     final String response = classRule.getTarget()
       .path("dead_servers")
       .request(MediaType.APPLICATION_JSON_TYPE)
+      .header("X-Jersey-Tracing-Accept", true)
       .get(String.class);
     assertThat(response, allOf(
       startsWith("{\"data\":["),
@@ -198,6 +205,7 @@ public void testGetDeadServersHtml() {
     assertThrows(NotAcceptableException.class, () -> classRule.getTarget()
       .path("dead_servers")
       .request(MediaType.TEXT_HTML_TYPE)
+      .header("X-Jersey-Tracing-Accept", true)
       .get(String.class));
   }
 }