[DE-427] user agent

Author: rashtao

driver/src/main/java/com/arangodb/internal/http/HttpConnection.java

@@ -20,10 +20,7 @@
 
 package com.arangodb.internal.http;
 
-import com.arangodb.ArangoDBException;
-import com.arangodb.ContentType;
-import com.arangodb.DbName;
-import com.arangodb.Protocol;
+import com.arangodb.*;
 import com.arangodb.internal.net.Connection;
 import com.arangodb.internal.net.HostDescription;
 import com.arangodb.internal.serde.InternalSerde;
@@ -73,6 +70,7 @@ public class HttpConnection implements Connection {
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpConnection.class);
     private static final String CONTENT_TYPE_APPLICATION_JSON_UTF8 = "application/json; charset=utf-8";
     private static final String CONTENT_TYPE_VPACK = "application/x-velocypack";
+    private static final String USER_AGENT = "ArangoDB-JavaDriver/" + PackageVersion.VERSION;
     private static final AtomicInteger THREAD_COUNT = new AtomicInteger();
     private final InternalSerde util;
     private final ContentType contentType;
@@ -250,6 +248,7 @@ public void doExecute(final InternalRequest request, final CompletableFuture<Int
         }
         addHeader(request, httpRequest);
         httpRequest.putHeader(HttpHeaders.AUTHORIZATION.toString(), auth);
+        httpRequest.putHeader(HttpHeaders.USER_AGENT.toString(), USER_AGENT);
 
         byte[] reqBody = request.getBody();
         Buffer buffer;

driver/src/test/java/com/arangodb/PackageVersionTest.java

@@ -1,11 +1,16 @@
 package com.arangodb;
 
+import com.arangodb.internal.config.FileConfigPropertiesProvider;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import ru.lanwen.verbalregex.VerbalExpression;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-class PackageVersionTest {
+class PackageVersionTest extends BaseJunit5 {
 
     @Test
     void packageVersion() {
@@ -24,4 +29,21 @@ void packageVersion() {
                 .build();
         assertThat(PackageVersion.VERSION).matches(testRegex.toString());
     }
+
+    @ParameterizedTest
+    @EnumSource(Protocol.class)
+    void userAgentHeader(Protocol protocol) {
+        assumeTrue(protocol != Protocol.VST);
+        ArangoDB adb = new ArangoDB.Builder()
+                .loadProperties(new FileConfigPropertiesProvider())
+                .useProtocol(protocol)
+                .build();
+
+        Response<JsonNode> resp = adb.execute(Request.builder()
+                .method(Request.Method.GET)
+                .path("/_admin/echo")
+                .build(), JsonNode.class);
+        assertThat(resp.getBody().get("headers").get("user-agent").textValue()).endsWith(PackageVersion.VERSION);
+        adb.shutdown();
+    }
 }