Adding mongo driver information

aws · Nov 4, 2022 · 6d14e9e · 6d14e9e
1 parent f1b1a60
commit 6d14e9e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 10 deletions.
diff --git a/src/main/java/software/amazon/documentdb/jdbc/DocumentDbConnection.java b/src/main/java/software/amazon/documentdb/jdbc/DocumentDbConnection.java
@@ -39,6 +39,7 @@
 import software.amazon.documentdb.jdbc.common.utilities.SqlError;
 import software.amazon.documentdb.jdbc.common.utilities.SqlState;
 import software.amazon.documentdb.jdbc.metadata.DocumentDbDatabaseSchemaMetadata;
+import software.amazon.documentdb.jdbc.query.DocumentDBDriverInformation;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -304,7 +305,8 @@ private void initializeClients(final DocumentDbConnectionProperties connectionPr
         // Create the mongo client.
         final MongoClientSettings settings = connectionProperties
                 .buildMongoClientSettings(getSshLocalPort());
-        mongoClient = MongoClients.create(settings);
+        mongoClient = MongoClients.create(settings,
+                DocumentDBDriverInformation.getMongoDriverInformation(connectionProperties));
         mongoDatabase = mongoClient.getDatabase(connectionProperties.getDatabase());
         pingDatabase();
     }

diff --git a/src/main/java/software/amazon/documentdb/jdbc/DocumentDbMain.java b/src/main/java/software/amazon/documentdb/jdbc/DocumentDbMain.java
@@ -58,6 +58,7 @@
 import software.amazon.documentdb.jdbc.metadata.DocumentDbSchemaColumn;
 import software.amazon.documentdb.jdbc.metadata.DocumentDbSchemaTable;
 import software.amazon.documentdb.jdbc.persist.DocumentDbSchemaSecurityException;
+import software.amazon.documentdb.jdbc.query.DocumentDBDriverInformation;
 
 import java.io.Console;
 import java.io.File;
@@ -393,7 +394,8 @@ private static void performCommand(
 
     private static MongoClient getMongoClient(final DocumentDbConnectionProperties properties) {
         if (client == null) {
-            client = MongoClients.create(properties.buildMongoClientSettings());
+            client = MongoClients.create(properties.buildMongoClientSettings(),
+                    DocumentDBDriverInformation.getMongoDriverInformation(properties));
         }
         return client;
     }

diff --git a/src/main/java/software/amazon/documentdb/jdbc/DocumentDbQueryExecutor.java b/src/main/java/software/amazon/documentdb/jdbc/DocumentDbQueryExecutor.java
@@ -33,6 +33,7 @@
 import software.amazon.documentdb.jdbc.common.utilities.JdbcColumnMetaData;
 import software.amazon.documentdb.jdbc.common.utilities.SqlError;
 import software.amazon.documentdb.jdbc.common.utilities.SqlState;
+import software.amazon.documentdb.jdbc.query.DocumentDBDriverInformation;
 import software.amazon.documentdb.jdbc.query.DocumentDbMqlQueryContext;
 import software.amazon.documentdb.jdbc.query.DocumentDbQueryMappingService;
 
@@ -222,7 +223,8 @@ private void resetQueryState() {
 
     private void performCancel() throws SQLException {
         final MongoClientSettings settings = connectionProperties.buildMongoClientSettings();
-        try (MongoClient client = MongoClients.create(settings)) {
+        try (MongoClient client = MongoClients.create(settings,
+                DocumentDBDriverInformation.getMongoDriverInformation(connectionProperties))) {
             final MongoDatabase database = client.getDatabase("admin");
 
             // Find the opId to kill using the queryId.

diff --git a/src/main/java/software/amazon/documentdb/jdbc/metadata/DocumentDbMetadataService.java b/src/main/java/software/amazon/documentdb/jdbc/metadata/DocumentDbMetadataService.java
@@ -32,6 +32,7 @@
 import software.amazon.documentdb.jdbc.persist.DocumentDbSchemaReader;
 import software.amazon.documentdb.jdbc.persist.DocumentDbSchemaSecurityException;
 import software.amazon.documentdb.jdbc.persist.DocumentDbSchemaWriter;
+import software.amazon.documentdb.jdbc.query.DocumentDBDriverInformation;
 
 import javax.annotation.Nullable;
 import java.sql.SQLException;
@@ -390,7 +391,7 @@ private static DocumentDbSchema getCollectionMetadataDirect(
         final MongoClientSettings settings = properties.buildMongoClientSettings();
         final MongoClient mongoClient = client != null
                 ? client
-                : MongoClients.create(settings);
+                : MongoClients.create(settings, DocumentDBDriverInformation.getMongoDriverInformation(properties));
         try {
             final MongoDatabase database = mongoClient.getDatabase(databaseName);
             for (String collectionName : getFilteredCollectionNames(database)) {

diff --git a/src/main/java/software/amazon/documentdb/jdbc/persist/DocumentDbSchemaReader.java b/src/main/java/software/amazon/documentdb/jdbc/persist/DocumentDbSchemaReader.java
@@ -32,6 +32,7 @@
 import software.amazon.documentdb.jdbc.metadata.DocumentDbSchema;
 import software.amazon.documentdb.jdbc.metadata.DocumentDbSchemaColumn;
 import software.amazon.documentdb.jdbc.metadata.DocumentDbSchemaTable;
+import software.amazon.documentdb.jdbc.query.DocumentDBDriverInformation;
 
 import javax.annotation.Nullable;
 import java.sql.SQLException;
@@ -87,7 +88,8 @@ public DocumentDbSchemaReader(final @NonNull DocumentDbConnectionProperties prop
         this.properties = properties;
         this.client = client != null
                 ? client
-                : MongoClients.create(properties.buildMongoClientSettings());
+                : MongoClients.create(properties.buildMongoClientSettings(),
+                DocumentDBDriverInformation.getMongoDriverInformation(properties));
         this.closeClient = client == null;
     }
 

diff --git a/src/main/java/software/amazon/documentdb/jdbc/persist/DocumentDbSchemaWriter.java b/src/main/java/software/amazon/documentdb/jdbc/persist/DocumentDbSchemaWriter.java
@@ -40,6 +40,7 @@
 import software.amazon.documentdb.jdbc.metadata.DocumentDbSchema;
 import software.amazon.documentdb.jdbc.metadata.DocumentDbSchemaColumn;
 import software.amazon.documentdb.jdbc.metadata.DocumentDbSchemaTable;
+import software.amazon.documentdb.jdbc.query.DocumentDBDriverInformation;
 
 import java.sql.SQLException;
 import java.time.Instant;
@@ -87,7 +88,8 @@ public DocumentDbSchemaWriter(final @NonNull DocumentDbConnectionProperties prop
         this.properties = properties;
         this.client = client != null
                 ? client
-                : MongoClients.create(properties.buildMongoClientSettings());
+                : MongoClients.create(properties.buildMongoClientSettings(),
+                DocumentDBDriverInformation.getMongoDriverInformation(properties));
         this.closeClient = client == null;
     }
 

diff --git a/src/test/java/software/amazon/documentdb/jdbc/DocumentDbQueryExecutorTest.java b/src/test/java/software/amazon/documentdb/jdbc/DocumentDbQueryExecutorTest.java
@@ -38,6 +38,7 @@
 import software.amazon.documentdb.jdbc.common.test.DocumentDbFlapDoodleTest;
 import software.amazon.documentdb.jdbc.common.utilities.JdbcColumnMetaData;
 import software.amazon.documentdb.jdbc.persist.DocumentDbSchemaWriter;
+import software.amazon.documentdb.jdbc.query.DocumentDBDriverInformation;
 import software.amazon.documentdb.jdbc.query.DocumentDbQueryMappingService;
 
 import java.sql.ResultSet;
@@ -322,7 +323,8 @@ private static class MockQueryExecutor extends DocumentDbQueryExecutor {
         @Override
         protected java.sql.ResultSet runQuery(final String sql) throws SQLException {
             final MongoClientSettings settings = VALID_CONNECTION_PROPERTIES.buildMongoClientSettings();
-            try (MongoClient client = MongoClients.create(settings)) {
+            try (MongoClient client = MongoClients.create(settings,
+                    DocumentDBDriverInformation.getMongoDriverInformation(VALID_CONNECTION_PROPERTIES))) {
                 final MongoDatabase database =
                         client.getDatabase(VALID_CONNECTION_PROPERTIES.getDatabase());
                 final MongoCollection<Document> collection = database.getCollection(

diff --git a/...s/java/software/amazon/documentdb/jdbc/common/test/DocumentDbAbstractTestEnvironment.java b/...s/java/software/amazon/documentdb/jdbc/common/test/DocumentDbAbstractTestEnvironment.java
@@ -42,6 +42,7 @@
 import software.amazon.documentdb.jdbc.DocumentDbConnectionProperties;
 import software.amazon.documentdb.jdbc.DocumentDbConnectionProperty;
 import software.amazon.documentdb.jdbc.DocumentDbMetadataScanMethod;
+import software.amazon.documentdb.jdbc.query.DocumentDBDriverInformation;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -212,9 +213,10 @@ public String newCollectionName(final boolean isTemporary) {
 
     @Override
     public MongoClient createMongoClient() throws SQLException {
-        return MongoClients.create(DocumentDbConnectionProperties
-                .getPropertiesFromConnectionString(getJdbcConnectionString())
-                .buildMongoClientSettings());
+        DocumentDbConnectionProperties properties = DocumentDbConnectionProperties
+                .getPropertiesFromConnectionString(getJdbcConnectionString());
+        return MongoClients.create(properties
+                .buildMongoClientSettings(), DocumentDBDriverInformation.getMongoDriverInformation(properties));
     }
 
     @Override