open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate -Xmx from kafka memory options (#8022)

This commit is contained in:
Lauri Tulmin 2023-03-09 22:02:33 +02:00 committed by GitHub
parent 0dccc3ad56
commit a793c247e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ public abstract class AbstractOpenTelemetryMetricsReporterTest {
kafka = kafka =
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m") .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
.withLogConsumer(new Slf4jLogConsumer(logger)) .withLogConsumer(new Slf4jLogConsumer(logger))
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
.withStartupTimeout(Duration.ofMinutes(1)); .withStartupTimeout(Duration.ofMinutes(1));

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

@ -65,7 +65,7 @@ public abstract class KafkaClientBaseTest {
void setupClass() throws ExecutionException, InterruptedException, TimeoutException { void setupClass() throws ExecutionException, InterruptedException, TimeoutException {
kafka = kafka =
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m") .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
.withLogConsumer(new Slf4jLogConsumer(logger)) .withLogConsumer(new Slf4jLogConsumer(logger))
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
.withStartupTimeout(Duration.ofMinutes(1)); .withStartupTimeout(Duration.ofMinutes(1));

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

@ -45,7 +45,7 @@ class KafkaStreamsBaseTest extends AgentInstrumentationSpecification {
def setupSpec() { def setupSpec() {
kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m") .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
.withLogConsumer(new Slf4jLogConsumer(logger)) .withLogConsumer(new Slf4jLogConsumer(logger))
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
.withStartupTimeout(Duration.ofMinutes(1)) .withStartupTimeout(Duration.ofMinutes(1))

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

@ -47,7 +47,7 @@ class KafkaIntegrationTest {
static void setUpKafka() { static void setUpKafka() {
kafka = kafka =
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.1.9")) new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.1.9"))
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m") .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
.withStartupTimeout(Duration.ofMinutes(1)); .withStartupTimeout(Duration.ofMinutes(1));
kafka.start(); kafka.start();

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

@ -47,7 +47,7 @@ public abstract class AbstractSpringKafkaTest {
static void setUpKafka() { static void setUpKafka() {
kafka = kafka =
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m") .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
.withStartupTimeout(Duration.ofMinutes(1)); .withStartupTimeout(Duration.ofMinutes(1));
kafka.start(); kafka.start();

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

@ -61,7 +61,7 @@ public abstract class AbstractVertxKafkaTest {
static void setUpAll() { static void setUpAll() {
kafka = kafka =
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m -Xmx256m") .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
.withLogConsumer(new Slf4jLogConsumer(logger)) .withLogConsumer(new Slf4jLogConsumer(logger))
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
.withStartupTimeout(Duration.ofMinutes(1)); .withStartupTimeout(Duration.ofMinutes(1));