Merge remote-tracking branch 'origin/main' into feature/oauth-m2m

README.md

@@ -11,6 +11,9 @@ Databricks input plugin for Embulk loads records from Databricks.
 
 - **driver_path**: path to the jar file of the JDBC driver. If not set, [the bundled JDBC driver](https://docs.databricks.com/en/integrations/jdbc/index.html) will be used. (string, optional)
 - **options**: extra JDBC properties (hash, default: {})
+- **user_agent**: set user agent property to JDBC connection. If 'UserAgentEntry' property is specified in the **options**, it will be overwritten by this value. (hash, optional)
+  - **product_name**: product name of user agent (string, default: "unknown")
+  - **product_version**: product version of user agent (string, default: "0.0.0")
 - **server_hostname**: The Databricks compute resource’s Server Hostname value, see [Compute settings for the Databricks JDBC Driver](https://docs.databricks.com/en/integrations/jdbc/compute.html). (string, required)
 - **http_path**: The Databricks compute resource’s HTTP Path value, see [Compute settings for the Databricks JDBC Driver](https://docs.databricks.com/en/integrations/jdbc/compute.html). (string, required)
 - **auth_type**: The Databricks authentication type, personal access token (PAT)-based or machine-to-machine (M2M) authentication. (`pat`, `oauth-m2m`, default: `pat`)

src/main/java/org/embulk/input/DatabricksInputPlugin.java

@@ -13,6 +13,7 @@
 import org.embulk.spi.Schema;
 import org.embulk.util.config.Config;
 import org.embulk.util.config.ConfigDefault;
+import org.embulk.util.config.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,6 +56,20 @@ public interface DatabricksPluginTask extends PluginTask {
     @ConfigDefault("null")
     public Optional<String> getSchemaName();
 
+    @Config("user_agent")
+    @ConfigDefault("{}")
+    public UserAgentEntry getUserAgentEntry();
+
+    public interface UserAgentEntry extends Task {
+      @Config("product_name")
+      @ConfigDefault("\"unknown\"")
+      public String getProductName();
+
+      @Config("product_version")
+      @ConfigDefault("\"0.0.0\"")
+      public String getProductVersion();
+    }
+
     static String fetchPersonalAccessToken(DatabricksPluginTask t) {
       return validatePresence(t.getPersonalAccessToken(), "personal_access_token");
     }
@@ -123,6 +138,11 @@ protected JdbcInputConnection newConnection(PluginTask task) throws SQLException
     }
     props.putAll(t.getOptions());
 
+    // overwrite UserAgentEntry property if the same property is set in options
+    String productName = t.getUserAgentEntry().getProductName();
+    String productVersion = t.getUserAgentEntry().getProductVersion();
+    props.put("UserAgentEntry", productName + "/" + productVersion);
+
     logConnectionProperties(url, props);
     Connection c = DriverManager.getConnection(url, props);
     return new DatabricksInputConnection(