Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kafka 3.8.0 #1058

Open
wants to merge 4 commits into
base: 5.7.x
Choose a base branch
from
Open

Kafka 3.8.0 #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31ea7ae
Kafka 3.38
sdelamo Aug 23, 2024
00b3f2c
micronaut 4.6.2
sdelamo Aug 23, 2024
ffd8734
cache 5.0.0
sdelamo Aug 23, 2024
3e8bf1d
fix compilation
sdelamo Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[versions]
micronaut = "4.6.1"
micronaut = "4.6.2"
micronaut-platform = "4.1.2"
micronaut-docs = "2.0.0"
micronaut-gradle-plugin = "4.4.2"

# Required to keep catalog compatibility with 3.4.x. Can be removed for 4.0.0
managed-kafka-compat = "3.8.0"
managed-kafka = '3.7.0'
managed-kafka = '3.8.0'

groovy = "4.0.15"
groovy = "4.0.22"

awaitility = '4.2.2'
opentracing-kafka-client = '0.1.15'
opentracing-mock = '0.33.0'

zipkin-brave-kafka-clients = '6.0.3'

micronaut-cache = "4.3.0"
micronaut-cache = "5.0.0"
micronaut-logging = "1.4.0"
micronaut-micrometer = "5.8.0"
micronaut-reactor = "3.5.0"
Expand Down
3 changes: 2 additions & 1 deletion kafka/src/main/java/io/micronaut/configuration/kafka/health/DefaultNetworkClientCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import jdk.jfr.Experimental;
import org.apache.kafka.clients.ApiVersions;
import org.apache.kafka.clients.Metadata;
import org.apache.kafka.clients.MetadataRecoveryStrategy;
import org.apache.kafka.clients.NetworkClient;
import org.apache.kafka.clients.admin.AdminClientConfig;
import org.apache.kafka.common.ClusterResourceListener;
Expand Down Expand Up @@ -91,7 +92,7 @@ public NetworkClient create(@NonNull ClusterResourceListener... listeners) {
return new NetworkClient(selector, metadata(listeners), clientId, 1,
reconnectBackoff, reconnectBackoffMax, socketSendBuffer, socketReceiveBuffer,
(int) HOURS.toMillis(1), connectionSetupTimeout, connectionSetupTimeoutMax,
SYSTEM, true, new ApiVersions(), logContext);
SYSTEM, true, new ApiVersions(), logContext, MetadataRecoveryStrategy.NONE);
} catch (Throwable e) {
closeQuietly(metrics, "Metrics");
closeQuietly(selector, "Selector");
Expand Down
5 changes: 3 additions & 2 deletions kafka/src/main/java/io/micronaut/configuration/kafka/health/KafkaHealthIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import io.micronaut.management.health.indicator.HealthResult;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.apache.kafka.clients.LeastLoadedNode;
import org.apache.kafka.clients.NetworkClient;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.Config;
Expand Down Expand Up @@ -225,9 +226,9 @@ private Optional<HealthResult> hasReadyNodes(NetworkClient networkClient) {

private HealthResult waitForLeastLoadedNode(NetworkClient networkClient) {
final long requestTimeoutMs = defaultConfiguration.getHealthTimeout().toMillis();
final Node node = networkClient.leastLoadedNode(SYSTEM.milliseconds());
final LeastLoadedNode node = networkClient.leastLoadedNode(SYSTEM.milliseconds());
try {
return result(awaitReady(networkClient, node, SYSTEM, requestTimeoutMs), null).build();
return result(awaitReady(networkClient, node.node(), SYSTEM, requestTimeoutMs), null).build();
} catch (IOException e) {
return failure(e, Collections.emptyMap());
}
Expand Down
Loading