try to add Apache HttpClient version to UserAgent

commercetools · Jan 22, 2025 · af1158e · af1158e
1 parent e4a95c5
commit af1158e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/...apachehttp-client/src/main/java/com/commercetools/http/apachehttp/CtApacheHttpClient.java b/...apachehttp-client/src/main/java/com/commercetools/http/apachehttp/CtApacheHttpClient.java
@@ -16,9 +16,11 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.input.AutoCloseInputStream;
+import org.apache.hc.client5.http.async.HttpAsyncClient;
 import org.apache.hc.client5.http.async.methods.SimpleBody;
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.async.methods.SimpleResponseConsumer;
+import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
@@ -33,6 +35,7 @@
 import org.apache.hc.core5.http2.HttpVersionPolicy;
 import org.apache.hc.core5.reactor.IOReactorStatus;
 import org.apache.hc.core5.reactor.ssl.TlsDetails;
+import org.apache.hc.core5.util.VersionInfo;
 
 public class CtApacheHttpClient extends HttpClientBase {
     public static final int MAX_REQUESTS = 64;
@@ -68,6 +71,10 @@ private void init() {
         }
     }
 
+    public static String clientVersion() {
+        return "ApacheHttpAsyncClient/" + VersionInfo.loadVersionInfo("org.apache.hc.client5", HttpAsyncClient.class.getClassLoader()).getRelease();
+    }
+
     public CtApacheHttpClient() {
         super();
         apacheHttpClient = clientBuilder.get().build();

diff --git a/...ols/commercetools-sdk-java-api/src/integrationTest/java/commercetools/MiddlewareTest.java b/...ols/commercetools-sdk-java-api/src/integrationTest/java/commercetools/MiddlewareTest.java
@@ -8,12 +8,14 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.commercetools.api.client.ApiRoot;
 import com.commercetools.api.client.ProjectApiRoot;
 import com.commercetools.api.defaultconfig.ApiRootBuilder;
 import com.commercetools.api.defaultconfig.ServiceRegion;
 import com.commercetools.api.models.category.Category;
 import com.commercetools.api.models.category.CategoryDraftBuilder;
 import com.commercetools.api.models.project.Project;
+import com.commercetools.http.apachehttp.CtApacheHttpClient;
 import commercetools.utils.CommercetoolsTestUtils;
 
 import io.vrap.rmf.base.client.*;
@@ -111,4 +113,16 @@ public CompletableFuture<ApiHttpResponse<byte[]>> execute(ApiHttpRequest request
         ApiHttpResponse<Project> response = client.execute(request, Project.class).get();
         Assertions.assertThat(response).isNotNull();
     }
+
+    @Test
+    public void testApacheUserAgent() {
+        ClientCredentials credentials = ClientCredentials.of()
+                .withClientId(CommercetoolsTestUtils.getClientId())
+                .withClientSecret(CommercetoolsTestUtils.getClientSecret())
+                .build();
+        ProjectApiRoot root = ApiRootBuilder.of(new CtApacheHttpClient())
+                .defaultClient(credentials, ServiceRegion.GCP_EUROPE_WEST1)
+                .build(CommercetoolsTestUtils.getProjectKey());
+        root.get().executeBlocking();
+    }
 }
diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ClientBuilder.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ClientBuilder.java
@@ -3,6 +3,8 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
@@ -737,6 +739,14 @@ public static String buildDefaultUserAgent() {
         String osName = SystemUtils.OS_NAME;
         String osArch = SystemUtils.OS_ARCH;
         String sdkVersion = BuildInfo.VERSION;
-        return userAgent + sdkVersion + " " + " Java/" + runtimeVersion + " (" + osName + "; " + osArch + ")";
+        String httpClient = "";
+        try {
+            Class<?> clazz = Class.forName("com.commercetools.http.apachehttp.CtApacheHttpClient");
+            Method method = clazz.getMethod("clientVersion");
+            httpClient = " " + method.invoke(null).toString();
+        }
+        catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
+        }
+        return userAgent + sdkVersion + " " + " Java/" + runtimeVersion + " (" + osName + "; " + osArch + ")" + httpClient;
     }
 }