[fixup] Add missing changelog, overridable methods on options builder

Author: emerkle826

changelog/README.md

@@ -4,6 +4,7 @@
 
 ### 4.0.0-beta2 (in progress)
 
+- [new feature] JAVA-1932: Send Driver Name and Version in Startup message
 - [new feature] JAVA-1917: Add ability to set node on statement
 - [improvement] JAVA-1916: Base TimestampCodec.parse on java.util.Date.
 - [improvement] JAVA-1940: Clean up test resources when CCM integration tests finish

core/src/main/java/com/datastax/oss/driver/internal/core/context/StartupOptionsBuilder.java

@@ -91,10 +91,34 @@ public Map<String, String> build() {
       builder.put(Startup.COMPRESSION_KEY, compressionAlgorithm.trim());
     }
     // add driver name and version
-    builder
-        .put(DRIVER_NAME_KEY, MAVEN_COORDINATES.getName())
-        .put(DRIVER_VERSION_KEY, MAVEN_COORDINATES.getVersion().toString());
+    builder.put(DRIVER_NAME_KEY, getDriverName()).put(DRIVER_VERSION_KEY, getDriverVersion());
     // add any additonal options
     return builder.putAll(additionalOptions).build();
   }
+
+  /**
+   * Returns this driver's name.
+   *
+   * <p>By default, this method will pull from the bundled Driver.properties file. Subclasses should
+   * override this method if they need to report a different Driver name on Startup.
+   *
+   * <p><b>NOTE:</b> The Driver name can not be set via {@link
+   * #withAdditionalOptions(java.util.Map)}
+   */
+  protected String getDriverName() {
+    return MAVEN_COORDINATES.getName();
+  }
+
+  /**
+   * Returns this driver's version.
+   *
+   * <p>By default, this method will pull from the bundled Driver.properties file. Subclasses should
+   * override this method if they need to report a different Driver version on Startup.
+   *
+   * <p><b>NOTE:</b> The Driver version can not be set via {@link
+   * #withAdditionalOptions(java.util.Map)}
+   */
+  protected String getDriverVersion() {
+    return MAVEN_COORDINATES.getVersion().toString();
+  }
 }

integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/GuavaDriverContext.java

@@ -52,7 +52,7 @@ public GuavaDriverContext(
       RequestTracker requestTracker,
       Map<String, Predicate<Node>> nodeFilters,
       ClassLoader classLoader,
-      Map<String, String> startupOptions) {
+      Map<String, String> additionalStartupOptions) {
     super(
         configLoader,
         typeCodecs,
@@ -61,7 +61,7 @@ public GuavaDriverContext(
         requestTracker,
         nodeFilters,
         classLoader,
-        startupOptions);
+        additionalStartupOptions);
   }
 
   @Override