tomcat fixed headers

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java

@@ -142,10 +142,6 @@ public void testErrorHandling() throws IOException {
     assertThat(response.stringBody()).contains("Simulating an error.");
   }
 
-  protected boolean headReturnsContentLength() {
-    return true;
-  }
-
   @Test
   public void testHeadRequest() throws IOException {
     start();
@@ -154,11 +150,7 @@ public void testHeadRequest() throws IOException {
     assertThat(size).isGreaterThan(0);
     Response headResponse = scrape("HEAD", "");
     assertThat(headResponse.status).isEqualTo(200);
-    if (headReturnsContentLength()) {
-      assertThat(headResponse.getHeader("Content-Length")).isEqualTo(Integer.toString(size));
-    } else {
-      assertThat(headResponse.getHeader("Content-Length")).isNull();
-    }
+    assertThat(headResponse.getHeader("Content-Length")).isEqualTo(Integer.toString(size));
     assertThat(headResponse.body).isEmpty();
   }
 

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/TomcatIT.java

@@ -7,11 +7,4 @@ class TomcatIT extends ExporterIT {
   public TomcatIT() throws IOException, URISyntaxException {
     super("exporter-servlet-tomcat-sample");
   }
-
-  @Override
-  protected boolean headReturnsContentLength() {
-    // not any more since
-    // https://tomcat.apache.org/tomcat-11.0-doc/changelog.html#Tomcat_11.0.0-M3_(markt)
-    return false;
-  }
 }