Update User Agent methods and format

connector-j-5/src/main/java/com/google/cloud/sql/mysql/SocketFactory.java

@@ -31,6 +31,11 @@ public class SocketFactory implements com.mysql.jdbc.SocketFactory {
 
   private Socket socket;
 
+  static {
+    CoreSocketFactory.addArtifactId("mysql-socket-factory-connector-j-5");
+  }
+
+
   @Override
   public Socket connect(String hostname, int portNumber, Properties props) throws IOException {
     socket = CoreSocketFactory.connect(props);

connector-j-6/src/main/java/com/google/cloud/sql/mysql/SocketFactory.java

@@ -31,6 +31,10 @@ public class SocketFactory implements com.mysql.cj.api.io.SocketFactory {
 
   private Socket socket;
 
+  static {
+    CoreSocketFactory.addArtifactId("mysql-socket-factory-connector-j-6");
+  }
+
   @Override
   public Socket connect(String host, int portNumber, Properties props, int loginTimeout)
       throws IOException {

connector-j-8/src/main/java/com/google/cloud/sql/mysql/SocketFactory.java

@@ -32,6 +32,10 @@
  */
 public class SocketFactory implements com.mysql.cj.protocol.SocketFactory {
 
+  static {
+    CoreSocketFactory.addArtifactId("mysql-socket-factory-connector-j-8");
+  }
+
   @Override
   public <T extends Closeable> T connect(
       String host, int portNumber, PropertySet props, int loginTimeout) throws IOException {

core/src/main/java/com/google/cloud/sql/core/CoreSocketFactory.java

@@ -92,6 +92,10 @@ public final class CoreSocketFactory {
   private final SQLAdmin adminApi;
   private final int serverProxyPort;
 
+  private static List<String> userAgents = new ArrayList<String>();
+  private static String version = getVersion();
+
+
   @VisibleForTesting
   CoreSocketFactory(
       ListenableFuture<KeyPair> localKeyPair,
@@ -290,7 +294,7 @@ private static SQLAdmin createAdminApiClient(HttpRequestInitializer requestIniti
     JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
     SQLAdmin.Builder adminApiBuilder =
         new Builder(httpTransport, jsonFactory, requestInitializer)
-            .setApplicationName(getApplicationName());
+            .setApplicationName(getUserAgents());
     if (rootUrl != null) {
       logTestPropertyWarning(API_ROOT_URL_PROPERTY);
       adminApiBuilder.setRootUrl(rootUrl);
@@ -333,6 +337,40 @@ private static KeyPair generateRsaKeyPair() {
     return generator.generateKeyPair();
   }
 
+  private static String getVersion() {
+    try {
+      Properties packageInfo = new Properties();
+      packageInfo.load(CoreSocketFactory.class.getClassLoader().getResourceAsStream(
+          "com.google.cloud.sql/project.properties"));
+      return packageInfo.getProperty("version", "unknown");
+    } catch (IOException e) {
+      return "unknown";
+    }
+  }
+
+  /** Sets the default string which is appended to the SQLAdmin API client User-Agent header. */
+  public static void addArtifactId(String artifactId) {
+    String userAgent = artifactId + "/" + version;
+    if (!userAgents.contains(userAgent)) {
+      userAgents.add(userAgent);
+    }
+  }
+
+
+
+  /** Returns the default string which is appended to the SQLAdmin API client User-Agent header. */
+  private static String getUserAgents() {
+    return String.join(" ", userAgents) + " " + getApplicationName();
+  }
+
+  /** Returns the current User-Agent header set for the underlying SQLAdmin API client. */
+  public static String getApplicationName() {
+    if (coreSocketFactory != null) {
+      return coreSocketFactory.adminApi.getApplicationName();
+    }
+    return System.getProperty(USER_TOKEN_PROPERTY_NAME, "");
+  }
+
   /**
    * Sets the User-Agent header for requests made using the underlying SQLAdmin API client.
    *
@@ -345,12 +383,4 @@ public static void setApplicationName(String applicationName) {
     }
     System.setProperty(USER_TOKEN_PROPERTY_NAME, applicationName);
   }
-
-  /** Returns the current User-Agent header set for the underlying SQLAdmin API client. */
-  public static String getApplicationName() {
-    if (coreSocketFactory != null) {
-      return coreSocketFactory.adminApi.getApplicationName();
-    }
-    return System.getProperty(USER_TOKEN_PROPERTY_NAME, "Cloud SQL Java Socket Factory");
-  }
 }

core/src/main/resources/com.google.cloud.sql/project.properties

@@ -0,0 +1 @@
+version=${project.version}

pom.xml

@@ -87,6 +87,12 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -224,6 +230,7 @@
               </execution>
             </executions>
           </plugin>
+
         </plugins>
       </build>
     </profile>

postgres/src/main/java/com/google/cloud/sql/postgres/SocketFactory.java

@@ -38,6 +38,10 @@ public class SocketFactory extends javax.net.SocketFactory {
 
   private Properties props;
 
+  static {
+    CoreSocketFactory.addArtifactId("postgres-socket-factory");
+  }
+
   /**
    * Implements the {@link SocketFactory} constructor, which can be used to create authenticated
    * connections to a Cloud SQL instance.
@@ -52,7 +56,6 @@ public SocketFactory(Properties info) {
               DEPRECATED_SOCKET_ARG, CoreSocketFactory.CLOUD_SQL_INSTANCE_PROPERTY));
       info.setProperty(CoreSocketFactory.CLOUD_SQL_INSTANCE_PROPERTY, oldInstanceKey);
     }
-
     this.props = info;
   }