mimaison commented on code in PR #13640:
URL: https://github.com/apache/kafka/pull/13640#discussion_r1179376168
##########
clients/src/main/java/org/apache/kafka/clients/ClientUtils.java:
##########
@@ -134,4 +147,112 @@ static List<InetAddress>
filterPreferredAddresses(InetAddress[] allAddresses) {
}
return preferredAddresses;
}
+
+ public static NetworkClient createNetworkClient(AbstractConfig config,
+ Metrics metrics,
+ String metricsGroupPrefix,
+ LogContext logContext,
+ ApiVersions apiVersions,
+ Time time,
+ int
maxInFlightRequestsPerConnection,
+ Metadata metadata,
+ Sensor sensor) {
+ ChannelBuilder channelBuilder = null;
+ Selector selector = null;
+
+ try {
+ channelBuilder = ClientUtils.createChannelBuilder(config, time,
logContext);
+ selector = new
Selector(config.getLong(CommonClientConfigs.CONNECTIONS_MAX_IDLE_MS_CONFIG),
+ metrics,
+ time,
+ metricsGroupPrefix,
+ channelBuilder,
+ logContext);
+ return new NetworkClient(selector,
+ metadata,
+ config.getString(CommonClientConfigs.CLIENT_ID_CONFIG),
+ maxInFlightRequestsPerConnection,
+
config.getLong(CommonClientConfigs.RECONNECT_BACKOFF_MS_CONFIG),
+
config.getLong(CommonClientConfigs.RECONNECT_BACKOFF_MAX_MS_CONFIG),
+ config.getInt(CommonClientConfigs.SEND_BUFFER_CONFIG),
+ config.getInt(CommonClientConfigs.RECEIVE_BUFFER_CONFIG),
+
config.getInt(CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG),
+
config.getLong(CommonClientConfigs.SOCKET_CONNECTION_SETUP_TIMEOUT_MS_CONFIG),
+
config.getLong(CommonClientConfigs.SOCKET_CONNECTION_SETUP_TIMEOUT_MAX_MS_CONFIG),
+ time,
+ true,
+ apiVersions,
+ sensor,
+ logContext);
+ } catch (Throwable t) {
+ closeQuietly(selector, "Selector");
+ closeQuietly(channelBuilder, "ChannelBuilder");
+ throw new KafkaException("Failed to create new NetworkClient", t);
+ }
+ }
+
+ public static NetworkClient createNetworkClient(AbstractConfig config,
Review Comment:
Could this call the other `createNetworkClient()` method below?
##########
clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java:
##########
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.kafka.clients.consumer.internals;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.kafka.clients.ClientUtils;
+import org.apache.kafka.clients.CommonClientConfigs;
+import org.apache.kafka.clients.GroupRebalanceConfig;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerInterceptor;
+import org.apache.kafka.clients.consumer.OffsetResetStrategy;
+import org.apache.kafka.common.IsolationLevel;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.metrics.KafkaMetricsContext;
+import org.apache.kafka.common.metrics.MetricConfig;
+import org.apache.kafka.common.metrics.Metrics;
+import org.apache.kafka.common.metrics.MetricsContext;
+import org.apache.kafka.common.metrics.MetricsReporter;
+import org.apache.kafka.common.metrics.Sensor;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.Time;
+
+public final class ConsumerUtils {
+
+ public static final String CLIENT_ID_METRIC_TAG = "client-id";
+ public static final String JMX_PREFIX = "kafka.consumer";
+ public static final String METRIC_GROUP_PREFIX = "consumer";
+
+ public static LogContext logContext(ConsumerConfig config,
GroupRebalanceConfig groupRebalanceConfig) {
+ Optional<String> groupId =
Optional.ofNullable(groupRebalanceConfig.groupId);
+ String clientId =
config.getString(CommonClientConfigs.CLIENT_ID_CONFIG);
+
+ // If group.instance.id is set, we will append it to the log context.
+ if (groupRebalanceConfig.groupInstanceId.isPresent()) {
+ return new LogContext("[Consumer instanceId=" +
groupRebalanceConfig.groupInstanceId.get() +
+ ", clientId=" + clientId + ", groupId=" +
groupId.orElse("null") + "] ");
+ } else {
+ return new LogContext("[Consumer clientId=" + clientId + ",
groupId=" + groupId.orElse("null") + "] ");
+ }
+ }
+
+ public static IsolationLevel isolationLevel(ConsumerConfig config) {
+ String s =
config.getString(ConsumerConfig.ISOLATION_LEVEL_CONFIG).toUpperCase(Locale.ROOT);
+ return IsolationLevel.valueOf(s);
+ }
+
+ public static SubscriptionState subscriptionState(ConsumerConfig config,
LogContext logContext) {
+ String s =
config.getString(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG).toUpperCase(Locale.ROOT);
+ OffsetResetStrategy strategy = OffsetResetStrategy.valueOf(s);
+ return new SubscriptionState(logContext, strategy);
+ }
+
+ public static Metrics metrics(ConsumerConfig config, Time time) {
+ String clientId = config.getString(ConsumerConfig.CLIENT_ID_CONFIG);
+ return metrics(config, time, clientId);
+ }
+
+ public static Metrics metrics(ConsumerConfig config, Time time, String
clientId) {
Review Comment:
This is only called from the override above, maybe we can merge both?
##########
clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchConfig.java:
##########
@@ -66,8 +67,7 @@
final int maxPollRecords;
final boolean checkCrcs;
final String clientRackId;
- final Deserializer<K> keyDeserializer;
- final Deserializer<V> valueDeserializer;
+ final Deserializers<K, V> deserializers;
final IsolationLevel isolationLevel;
public FetchConfig(int minBytes,
Review Comment:
It looks like this is only called from tests?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
