Skip to content

Commit f1e7dde

Browse files
committed
./gradlew spotlessApply
1 parent 82248c4 commit f1e7dde

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetry.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,7 @@ <K, V> ConsumerRecords<K, V> addTracing(
230230
public Map<String, ?> producerInterceptorConfigProperties() {
231231
Map<String, Object> config = new HashMap<>();
232232
config.put(
233-
ProducerConfig.INTERCEPTOR_CLASSES_CONFIG,
234-
TracingProducerInterceptor.class.getName());
233+
ProducerConfig.INTERCEPTOR_CLASSES_CONFIG, TracingProducerInterceptor.class.getName());
235234
config.put(
236235
TracingProducerInterceptor.CONFIG_KEY_KAFKA_TELEMETRY_SUPPLIER,
237236
new KafkaTelemetrySupplier(this));
@@ -258,8 +257,7 @@ <K, V> ConsumerRecords<K, V> addTracing(
258257
public Map<String, ?> consumerInterceptorConfigProperties() {
259258
Map<String, Object> config = new HashMap<>();
260259
config.put(
261-
ConsumerConfig.INTERCEPTOR_CLASSES_CONFIG,
262-
TracingConsumerInterceptor.class.getName());
260+
ConsumerConfig.INTERCEPTOR_CLASSES_CONFIG, TracingConsumerInterceptor.class.getName());
263261
config.put(
264262
TracingConsumerInterceptor.CONFIG_KEY_KAFKA_TELEMETRY_SUPPLIER,
265263
new KafkaTelemetrySupplier(this));

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingConsumerInterceptor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.opentelemetry.instrumentation.api.internal.Timer;
1515
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.KafkaConsumerContext;
1616
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.KafkaConsumerContextUtil;
17-
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.KafkaTelemetrySupplier;
1817
import java.util.Map;
1918
import java.util.Objects;
2019
import java.util.function.Supplier;

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingProducerInterceptor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1111
import io.opentelemetry.api.GlobalOpenTelemetry;
1212
import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
13-
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.KafkaTelemetrySupplier;
1413
import java.util.Map;
1514
import java.util.Objects;
1615
import java.util.function.Supplier;

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/AbstractInterceptorsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
import java.nio.charset.StandardCharsets;
1414
import java.time.Duration;
1515
import java.util.Map;
16-
import org.apache.kafka.clients.consumer.ConsumerConfig;
1716
import org.apache.kafka.clients.consumer.ConsumerRecord;
1817
import org.apache.kafka.clients.consumer.ConsumerRecords;
19-
import org.apache.kafka.clients.producer.ProducerConfig;
2018
import org.apache.kafka.clients.producer.ProducerRecord;
2119
import org.junit.jupiter.api.Test;
2220
import org.junit.jupiter.api.extension.RegisterExtension;

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryInterceptorTest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,21 @@ void serializableConfig() throws IOException, ClassNotFoundException {
127127
private static void testSerialize(Map<String, Object> map)
128128
throws IOException, ClassNotFoundException {
129129
// Check that producer config has the supplier
130-
Object producerSupplier = map.get(TracingProducerInterceptor.CONFIG_KEY_KAFKA_TELEMETRY_SUPPLIER);
131-
Object consumerSupplier = map.get(TracingConsumerInterceptor.CONFIG_KEY_KAFKA_TELEMETRY_SUPPLIER);
132-
130+
Object producerSupplier =
131+
map.get(TracingProducerInterceptor.CONFIG_KEY_KAFKA_TELEMETRY_SUPPLIER);
132+
Object consumerSupplier =
133+
map.get(TracingConsumerInterceptor.CONFIG_KEY_KAFKA_TELEMETRY_SUPPLIER);
134+
133135
KafkaTelemetrySupplier supplier = null;
134136
if (producerSupplier instanceof KafkaTelemetrySupplier) {
135137
supplier = (KafkaTelemetrySupplier) producerSupplier;
136138
} else if (consumerSupplier instanceof KafkaTelemetrySupplier) {
137139
supplier = (KafkaTelemetrySupplier) consumerSupplier;
138140
}
139-
141+
140142
assertThat(supplier).isNotNull();
141143
assertThat(supplier.get()).isNotNull();
142-
144+
143145
ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
144146
try (ObjectOutputStream outputStream = new ObjectOutputStream(byteOutputStream)) {
145147
outputStream.writeObject(map);

0 commit comments

Comments
 (0)