remove useragent customization from NettyClientBuilder

Author: xborder

flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/NettyClientBuilder.java

@@ -60,7 +60,6 @@ public class NettyClientBuilder {
   protected String overrideHostname = null;
   protected List<FlightClientMiddleware.Factory> middleware = new ArrayList<>();
   protected boolean verifyServer = true;
-  protected String userAgent;
 
   public NettyClientBuilder() {}
 
@@ -131,11 +130,6 @@ public NettyClientBuilder verifyServer(boolean verifyServer) {
     return this;
   }
 
-  public NettyClientBuilder userAgent(String userAgent) {
-    this.userAgent = userAgent;
-    return this;
-  }
-
   /** Create the client from this builder. */
   public NettyChannelBuilder build() {
     final NettyChannelBuilder builder;
@@ -232,8 +226,7 @@ public NettyChannelBuilder build() {
     builder
         .maxTraceEvents(MAX_CHANNEL_TRACE_EVENTS)
         .maxInboundMessageSize(maxInboundMessageSize)
-        .maxInboundMetadataSize(maxInboundMessageSize)
-        .userAgent(userAgent);
+        .maxInboundMetadataSize(maxInboundMessageSize);
     return builder;
   }
 }

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java

@@ -937,7 +937,6 @@ public ArrowFlightSqlClientHandler build() throws SQLException {
         if (driverVersion != null && driverVersion.versionString != null) {
           userAgent = String.format(USER_AGENT_TEMPLATE, driverVersion.versionString);
         }
-        clientBuilder.userAgent(userAgent);
 
         buildTimeMiddlewareFactories.add(new ClientCookieMiddleware.Factory());
         buildTimeMiddlewareFactories.forEach(clientBuilder::intercept);
@@ -973,6 +972,9 @@ public ArrowFlightSqlClientHandler build() throws SQLException {
         }
 
         NettyChannelBuilder channelBuilder = clientBuilder.build();
+
+        channelBuilder.userAgent(userAgent);
+
         if (connectTimeout != null) {
           channelBuilder.withOption(
               ChannelOption.CONNECT_TIMEOUT_MILLIS, (int) connectTimeout.toMillis());