Skip to content

Lower Kafka log level in product tests #14149

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

Merged
kokosing merged 1 commit into from
Sep 19, 2022
Merged

Lower Kafka log level in product tests #14149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion ...roduct-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,24 @@

package io.trino.tests.product.launcher.env.common;

import io.trino.tests.product.launcher.docker.DockerFiles;
import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
import io.trino.tests.product.launcher.env.DockerContainer;
import io.trino.tests.product.launcher.env.Environment;
import io.trino.tests.product.launcher.testcontainers.PortBinder;
import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
import org.testcontainers.utility.MountableFile;

import javax.inject.Inject;

import java.time.Duration;

import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC;
import static java.util.Objects.requireNonNull;
import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage;
import static org.testcontainers.utility.MountableFile.forHostPath;

public class Kafka
implements EnvironmentExtender
Expand All @@ -36,11 +42,15 @@ public class Kafka
static final String SCHEMA_REGISTRY = "schema-registry";
static final String ZOOKEEPER = "zookeeper";

private final ResourceProvider configDir;

private final PortBinder portBinder;

@Inject
public Kafka(PortBinder portBinder)
public Kafka(DockerFiles dockerFiles, PortBinder portBinder)
{
this.configDir = requireNonNull(dockerFiles, "dockerFiles is null")
.getDockerFilesHostDirectory("common/kafka");
this.portBinder = requireNonNull(portBinder, "portBinder is null");
}

Expand All @@ -50,6 +60,13 @@ public void extendEnvironment(Environment.Builder builder)
builder.addContainers(createZookeeper(), createKafka(), createSchemaRegistry())
.containerDependsOn(KAFKA, ZOOKEEPER)
.containerDependsOn(SCHEMA_REGISTRY, KAFKA);

MountableFile logConfigFile = forHostPath(configDir.getPath("log.properties"));
builder.configureContainers(container -> {
if (isPrestoContainer(container.getLogicalName())) {
Copy link
Copy Markdown
Member

@kokosing kokosing Sep 19, 2022

Choose a reason for hiding this comment

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

would like to rename isPrestoContainer to isTrinoContainer as separate PR?

Copy link
Copy Markdown
Member Author

@nevillelyh nevillelyh Sep 19, 2022

Choose a reason for hiding this comment

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

Created #14195

container.withCopyFileToContainer(logConfigFile, CONTAINER_PRESTO_ETC + "/log.properties");
}
});
}

@SuppressWarnings("resource")
Expand Down
1 change: 1 addition & 0 deletions ...tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.kafka=WARN