update apache client

Author: EddeCCC

build.gradle

@@ -2,8 +2,8 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
     id "org.springframework.boot" version "${springBootVersion}"
-    id "org.cyclonedx.bom" version "${cyclonedxBomVersion}"
     id "io.spring.dependency-management" version "${springDependencyManangementVersion}"
+    id "org.cyclonedx.bom" version "${cyclonedxBomVersion}"
     id "org.owasp.dependencycheck" version "${owaspDependencyCheckVersion}"
     id "com.github.ben-manes.versions" version "${versionsPlugin}"
 }
@@ -13,7 +13,6 @@ repositories {
 }
 
 apply plugin: "java"
-apply plugin: "jacoco"
 
 group = "rocks.inspectit.ocelot"
 
@@ -120,17 +119,17 @@ test {
 
 dependencies {
     implementation(
-            // Spring Boot
+            // spring boot
             "org.springframework.boot:spring-boot-starter-web",
             "org.springframework.boot:spring-boot-starter-actuator",
             "org.springframework.boot:spring-boot-starter-validation",
             "org.springframework.boot:spring-boot-starter-security",
 
             "org.yaml:snakeyaml:${snakeYamlVersion}",
-            // Has to be included, but is transitive to spring
+            // has to be included, but is transitive to spring
             "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
 
-            // OpenTelemetry
+            // opentelemetry
             platform("io.opentelemetry:opentelemetry-bom-alpha:${openTelemetryAlphaVersion}"),
             platform("io.opentelemetry:opentelemetry-bom:${openTelemetryVersion}"),
             "io.opentelemetry:opentelemetry-sdk:${openTelemetryVersion}",
@@ -141,10 +140,11 @@ dependencies {
             "io.opentelemetry.semconv:opentelemetry-semconv:${openTelemetrySemConvVersion}",
             "io.opentelemetry.proto:opentelemetry-proto:${openTelemetryProtoVersion}",
 
-            // Also OpenTelemetry related
+            // also opentelemetry related
             "com.google.protobuf:protobuf-java:${protobufVersion}",
             "com.google.protobuf:protobuf-java-util:${protobufVersion}",
 
+            // utils
             "com.google.guava:guava:${guavaVersion}",
             "com.maxmind.geoip2:geoip2:${geoip2Version}",
             "commons-net:commons-net:${commonsNetVersion}",
@@ -158,13 +158,13 @@ dependencies {
 
     testImplementation(
             "org.springframework.boot:spring-boot-starter-test",
-            "org.apache.httpcomponents:httpclient:${httpClientVersion}", // TODO Update to v5
+            "org.apache.httpcomponents.client5:httpclient5:${httpClientVersion}",
 
-            // ServerExtension
+            // server-extension
             "com.linecorp.armeria:armeria-junit5:${armeriaVersion}",
             "com.linecorp.armeria:armeria-grpc-protocol:${armeriaVersion}",
 
-            // Docker test containers
+            // docker test containers
             "org.testcontainers:testcontainers:${testContainersVersion}",
             "org.testcontainers:junit-jupiter:${testContainersVersion}"
     )

gradle.properties

@@ -25,7 +25,7 @@ commonsIoVersion=2.20.0
 # testing
 armeriaVersion=1.32.5
 testContainersVersion=1.21.3
-httpClientVersion=4.5.14
+httpClientVersion=5.5
 
 ### gradle plugin versions
 springDependencyManangementVersion=1.1.7

src/test/java/rocks/inspectit/ocelot/eum/server/exporters/ExporterIntMockMvcTestBase.java

@@ -1,10 +1,10 @@
 package rocks.inspectit.ocelot.eum.server.exporters;
 
 import com.google.common.io.CharStreams;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

src/test/java/rocks/inspectit/ocelot/eum/server/exporters/GzipCompressionMethodIntTest.java

@@ -86,7 +86,7 @@ void testCompressionMethodMetricExporter() {
     }
 
     @Test
-    void verifyOtlpGrpcMetrics() throws Exception { // TODO Fix
+    void verifyOtlpGrpcMetrics() throws Exception {
         Map<String, String> beacon = getBasicBeacon();
         // fake beacon that we don't expect
         beacon.put(FAKE_BEACON_KEY_NAME, "1334");

src/test/java/rocks/inspectit/ocelot/eum/server/exporters/metrics/PrometheusExporterServiceIntTest.java

@@ -1,15 +1,14 @@
 package rocks.inspectit.ocelot.eum.server.exporters.metrics;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicResponseHandler;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.io.HttpClientResponseHandler;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.util.TestPropertyValues;
@@ -66,7 +65,7 @@ void closeClient() throws Exception {
     @Test
     void testDefaultSettings() throws Exception {
         HttpGet httpGet = new HttpGet("http://localhost:" + PROMETHEUS_PORT + "/metrics");
-        int statusCode = httpClient.execute(httpGet).getStatusLine().getStatusCode();
+        int statusCode = httpClient.execute(httpGet).getCode();
 
         assertThat(statusCode).isEqualTo(200);
     }
@@ -82,9 +81,9 @@ void expectNoViews() throws Exception {
         sendBeacon(beacon);
 
         await().atMost(15, TimeUnit.SECONDS).pollInterval(2, TimeUnit.SECONDS).untilAsserted(() -> {
-            HttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + PROMETHEUS_PORT + "/metrics)"));
-            ResponseHandler<String> responseHandler = new BasicResponseHandler();
-            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            ClassicHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + PROMETHEUS_PORT + "/metrics)"));
+            HttpClientResponseHandler<String> responseHandler = new BasicHttpClientResponseHandler();
+            assertThat(response.getCode()).isEqualTo(200);
             assertThat(responseHandler.handleResponse(response)).doesNotContain("Fake Value");
         });
     }
@@ -103,8 +102,8 @@ void expectOneView() throws Exception {
         String metricKeyName = METRIC_LOAD_TIME_KEY_NAME.replaceAll("/","_");
 
         await().atMost(15, TimeUnit.SECONDS).pollInterval(2, TimeUnit.SECONDS).untilAsserted(() -> {
-            HttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + PROMETHEUS_PORT + "/metrics)"));
-            ResponseHandler<String> responseHandler = new BasicResponseHandler();
+            ClassicHttpResponse response = httpClient.execute(new HttpGet("http://localhost:" + PROMETHEUS_PORT + "/metrics)"));
+            HttpClientResponseHandler<String> responseHandler = new BasicHttpClientResponseHandler();
             String responseString = responseHandler.handleResponse(response);
             assertThat(responseString).contains(metricKeyName+"_milliseconds_sum{COUNTRY_CODE=\"\",OS=\"\",URL=\"http://test.com/login\",otel_scope_name=\"rocks.inspectit.ocelot\"} 12.0");
         });

src/test/java/rocks/inspectit/ocelot/eum/server/utils/GeolocationResolverIntTest.java

@@ -1,9 +1,9 @@
 package rocks.inspectit.ocelot.eum.server.utils;
 
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;