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.

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

Fix native image warning in Kafka #32476

Merged
merged 2 commits into from
Apr 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@

/**
* The resolved factory for the native image runner.
* <p>
* Warning: This build item should not be consumed without the use of
* {@link io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild} in the {@code onlyIf} method of
* {@link io.quarkus.builder.BuildStep} because that leads to Quarkus having to resolve the container image runtime
* unnecessarily.
*/
public final class NativeImageRunnerBuildItem extends SimpleBuildItem {
private final NativeImageBuildRunner buildRunner;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
import java.util.logging.Level;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -86,10 +87,13 @@
import io.quarkus.deployment.logging.LogCleanupFilterBuildItem;
import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
import io.quarkus.deployment.pkg.builditem.NativeImageRunnerBuildItem;
import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
import io.quarkus.dev.spi.DevModeType;
import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
import io.quarkus.devconsole.spi.DevConsoleWebjarBuildItem;
import io.quarkus.kafka.client.runtime.*;
import io.quarkus.kafka.client.runtime.KafkaAdminClient;
import io.quarkus.kafka.client.runtime.KafkaBindingConverter;
import io.quarkus.kafka.client.runtime.KafkaRecorder;
import io.quarkus.kafka.client.runtime.KafkaRuntimeConfigProducer;
import io.quarkus.kafka.client.runtime.ui.KafkaTopicClient;
import io.quarkus.kafka.client.runtime.ui.KafkaUiRecorder;
Expand Down Expand Up @@ -222,7 +226,6 @@ public void build(
BuildProducer<ServiceProviderBuildItem> serviceProviders,
BuildProducer<NativeImageProxyDefinitionBuildItem> proxies,
Capabilities capabilities,
NativeImageRunnerBuildItem nativeImageRunner,
BuildProducer<UnremovableBeanBuildItem> beans,
BuildProducer<NativeImageResourceBuildItem> nativeLibs,
BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport) {
Expand Down Expand Up @@ -286,13 +289,11 @@ public void build(
handleAvro(reflectiveClass, proxies, serviceProviders, sslNativeSupport, capabilities);
handleOpenTracing(reflectiveClass, capabilities);
handleStrimziOAuth(curateOutcomeBuildItem, reflectiveClass);
if (config.snappyEnabled) {
handleSnappy(nativeImageRunner, reflectiveClass, nativeLibs);
}

}

private void handleSnappy(NativeImageRunnerBuildItem nativeImageRunner,
@BuildStep(onlyIf = { IsSnappy.class, NativeOrNativeSourcesBuild.class })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙏🏼

public void handleSnappyInNative(NativeImageRunnerBuildItem nativeImageRunner,
BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
BuildProducer<NativeImageResourceBuildItem> nativeLibs) {
reflectiveClass.produce(ReflectiveClassBuildItem.builder("org.xerial.snappy.SnappyInputStream",
Expand Down Expand Up @@ -574,4 +575,18 @@ public DevConsoleWebjarBuildItem setupWebJar(LaunchModeBuildItem launchModeBuild
.build();
}

public static final class IsSnappy implements BooleanSupplier {

private final KafkaBuildTimeConfig config;

public IsSnappy(KafkaBuildTimeConfig config) {
this.config = config;
}

@Override
public boolean getAsBoolean() {
return config.snappyEnabled;
}
}

}