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

Fix kafka clients latest dep tests #10687

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Fix kafka clients latest dep tests #10687

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
37 changes: 29 additions & 8 deletions ...pentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.metrics.data.PointData;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Instant;
Expand All @@ -33,13 +35,12 @@
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.consumer.KafkaConsumerAccess;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.KafkaProducerAccess;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.metrics.KafkaMetric;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.metrics.MetricsReporter;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.ByteArraySerializer;
Expand Down Expand Up @@ -139,14 +140,36 @@ protected Map<String, Object> consumerConfig() {

@Test
void noDuplicateMetricsReporter() {
List<MetricsReporter> producerMetricsReporters =
KafkaProducerAccess.getMetricsReporters(producer);
List<MetricsReporter> producerMetricsReporters = getMetricsReporters(producer);
assertThat(countOpenTelemetryMetricsReporters(producerMetricsReporters)).isEqualTo(1);
List<MetricsReporter> consumerMetricsReporters =
KafkaConsumerAccess.getMetricsReporters(consumer);
List<MetricsReporter> consumerMetricsReporters = getMetricsReporters(consumer);
assertThat(countOpenTelemetryMetricsReporters(consumerMetricsReporters)).isEqualTo(1);
}

private static List<MetricsReporter> getMetricsReporters(Object producerOrConsumer) {
return getMetricsRegistry(producerOrConsumer).reporters();
}

private static Metrics getMetricsRegistry(Object producerOrConsumer) {
Class<?> clazz = producerOrConsumer.getClass();
try {
Field field = clazz.getDeclaredField("metrics");
field.setAccessible(true);
return (Metrics) field.get(producerOrConsumer);
} catch (Exception ignored) {
// Ignore
}
try {
Method method = clazz.getDeclaredMethod("metricsRegistry");
method.setAccessible(true);
return (Metrics) method.invoke(producerOrConsumer);
} catch (Exception ignored) {
// Ignore
}
throw new IllegalStateException(
"Failed to get metrics registry from " + producerOrConsumer.getClass().getName());
}

private static long countOpenTelemetryMetricsReporters(List<MetricsReporter> metricsReporters) {
return metricsReporters.stream()
.filter(reporter -> reporter.getClass().getName().endsWith("OpenTelemetryMetricsReporter"))
Expand Down Expand Up @@ -176,8 +199,6 @@ void observeMetrics() {
"kafka.consumer.join_total",
"kafka.consumer.last_heartbeat_seconds_ago",
"kafka.consumer.last_rebalance_seconds_ago",
"kafka.consumer.partition_assigned_latency_avg",
"kafka.consumer.partition_assigned_latency_max",
"kafka.consumer.rebalance_latency_avg",
"kafka.consumer.rebalance_latency_max",
"kafka.consumer.rebalance_latency_total",
Expand Down
18 changes: 0 additions & 18 deletions ...nts-0.11/testing/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumerAccess.java
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions ...nts-0.11/testing/src/main/java/org/apache/kafka/clients/producer/KafkaProducerAccess.java
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies {
tasks {
withType<Test>().configureEach {
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
}

val testReceiveSpansDisabled by registering(Test::class) {
Expand Down
3 changes: 3 additions & 0 deletions ...elemetry/instrumentation/kafkaclients/v2_6/internal/OpenTelemetryMetricsReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Map;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -44,6 +45,8 @@ protected InstrumentationExtension testing() {

@Test
void badConfig() {
Assumptions.assumeFalse(Boolean.getBoolean("testLatestDeps"));

// Bad producer config
assertThatThrownBy(
() -> {
Expand Down
Loading