Skip to content

Commit 67b6b6c

Browse files
authored
Limit kafka memory usage (#8018)
1 parent 1649a90 commit 67b6b6c

File tree

6 files changed

+9
-2
lines changed

6 files changed

+9
-2
lines changed

instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ void beforeAll() {
7676

7777
kafka =
7878
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
79+
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m")
7980
.withLogConsumer(new Slf4jLogConsumer(logger))
8081
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
8182
.withStartupTimeout(Duration.ofMinutes(1));

instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public abstract class KafkaClientBaseTest {
6565
void setupClass() throws ExecutionException, InterruptedException, TimeoutException {
6666
kafka =
6767
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
68+
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m")
6869
.withLogConsumer(new Slf4jLogConsumer(logger))
6970
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
7071
.withStartupTimeout(Duration.ofMinutes(1));

instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
7-
import java.time.Duration
87
import org.apache.kafka.clients.admin.AdminClient
98
import org.apache.kafka.clients.admin.NewTopic
109
import org.apache.kafka.clients.consumer.Consumer
@@ -22,8 +21,10 @@ import org.slf4j.LoggerFactory
2221
import org.testcontainers.containers.KafkaContainer
2322
import org.testcontainers.containers.output.Slf4jLogConsumer
2423
import org.testcontainers.containers.wait.strategy.Wait
24+
import org.testcontainers.utility.DockerImageName
2525
import spock.lang.Shared
2626

27+
import java.time.Duration
2728
import java.util.concurrent.CountDownLatch
2829
import java.util.concurrent.TimeUnit
2930

@@ -43,7 +44,8 @@ class KafkaStreamsBaseTest extends AgentInstrumentationSpecification {
4344
static CountDownLatch consumerReady = new CountDownLatch(1)
4445

4546
def setupSpec() {
46-
kafka = new KafkaContainer()
47+
kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
48+
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m")
4749
.withLogConsumer(new Slf4jLogConsumer(logger))
4850
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
4951
.withStartupTimeout(Duration.ofMinutes(1))

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/kafka/KafkaIntegrationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class KafkaIntegrationTest {
4747
static void setUpKafka() {
4848
kafka =
4949
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.1.9"))
50+
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m")
5051
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
5152
.withStartupTimeout(Duration.ofMinutes(1));
5253
kafka.start();

instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public abstract class AbstractSpringKafkaTest {
4747
static void setUpKafka() {
4848
kafka =
4949
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
50+
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m")
5051
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
5152
.withStartupTimeout(Duration.ofMinutes(1));
5253
kafka.start();

instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public abstract class AbstractVertxKafkaTest {
6161
static void setUpAll() {
6262
kafka =
6363
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
64+
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m")
6465
.withLogConsumer(new Slf4jLogConsumer(logger))
6566
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
6667
.withStartupTimeout(Duration.ofMinutes(1));

0 commit comments

Comments
 (0)