Skip to content

Commit bf61bdf

Browse files
otelbot[bot]otelbot[bot]
committed
./gradlew spotlessApply
1 parent 9c2603c commit bf61bdf

File tree

3 files changed

+52
-37
lines changed

3 files changed

+52
-37
lines changed

‎instrumentation/kafka/kafka-connect-2.6/testing/src/test/java/io/opentelemetry/instrumentation/kafkaconnect/v2_6/KafkaConnectSinkTaskTestBase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public abstract class KafkaConnectSinkTaskTestBase implements TelemetryRetriever
6060
protected static final InstrumentationExtension testing =
6161
SmokeTestInstrumentationExtension.create();
6262

63-
protected static final Logger logger = LoggerFactory.getLogger(KafkaConnectSinkTaskTestBase.class);
63+
protected static final Logger logger =
64+
LoggerFactory.getLogger(KafkaConnectSinkTaskTestBase.class);
6465

6566
// Using the same fake backend pattern as smoke tests (with ARM64 support)
6667
protected static GenericContainer<?> backend;

‎instrumentation/kafka/kafka-connect-2.6/testing/src/test/java/io/opentelemetry/instrumentation/kafkaconnect/v2_6/MongoKafkaConnectSinkTaskTest.java‎

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -212,42 +212,54 @@ public void testKafkaConnectMongoSinkTaskMultiTopicInstrumentation()
212212
() -> {
213213
// Wait for at least 1 trace (could be 1 batch trace or multiple individual traces)
214214
List<List<SpanData>> traces = testing.waitForTraces(1);
215-
216-
// Count total Kafka Connect consumer spans and database update spans across all traces
217-
long totalKafkaConnectSpans = traces.stream()
218-
.flatMap(trace -> trace.stream())
219-
.filter(span ->
220-
(span.getName().contains(topicName1) ||
221-
span.getName().contains(topicName2) ||
222-
span.getName().contains(topicName3))
223-
&& span.getKind() == io.opentelemetry.api.trace.SpanKind.CONSUMER)
224-
.count();
225-
226-
long totalUpdateSpans = traces.stream()
227-
.flatMap(trace -> trace.stream())
228-
.filter(span ->
229-
span.getName().contains("update")
230-
&& span.getKind() == io.opentelemetry.api.trace.SpanKind.CLIENT)
231-
.count();
232-
215+
216+
// Count total Kafka Connect consumer spans and database update spans across all
217+
// traces
218+
long totalKafkaConnectSpans =
219+
traces.stream()
220+
.flatMap(trace -> trace.stream())
221+
.filter(
222+
span ->
223+
(span.getName().contains(topicName1)
224+
|| span.getName().contains(topicName2)
225+
|| span.getName().contains(topicName3))
226+
&& span.getKind() == io.opentelemetry.api.trace.SpanKind.CONSUMER)
227+
.count();
228+
229+
long totalUpdateSpans =
230+
traces.stream()
231+
.flatMap(trace -> trace.stream())
232+
.filter(
233+
span ->
234+
span.getName().contains("update")
235+
&& span.getKind() == io.opentelemetry.api.trace.SpanKind.CLIENT)
236+
.count();
237+
233238
assertThat(totalKafkaConnectSpans).isGreaterThanOrEqualTo(1);
234239
assertThat(totalUpdateSpans).isGreaterThanOrEqualTo(3);
235-
236-
boolean hasMultiTopicSpan = traces.stream()
237-
.flatMap(trace -> trace.stream())
238-
.anyMatch(span ->
239-
span.getName().contains("[") && span.getName().contains("]") &&
240-
span.getName().contains("process") &&
241-
span.getKind() == io.opentelemetry.api.trace.SpanKind.CONSUMER);
242-
243-
boolean hasIndividualSpans = traces.stream()
244-
.flatMap(trace -> trace.stream())
245-
.anyMatch(span ->
246-
(span.getName().contains(topicName1) ||
247-
span.getName().contains(topicName2) ||
248-
span.getName().contains(topicName3)) &&
249-
!span.getName().contains("[") &&
250-
span.getKind() == io.opentelemetry.api.trace.SpanKind.CONSUMER);
240+
241+
boolean hasMultiTopicSpan =
242+
traces.stream()
243+
.flatMap(trace -> trace.stream())
244+
.anyMatch(
245+
span ->
246+
span.getName().contains("[")
247+
&& span.getName().contains("]")
248+
&& span.getName().contains("process")
249+
&& span.getKind()
250+
== io.opentelemetry.api.trace.SpanKind.CONSUMER);
251+
252+
boolean hasIndividualSpans =
253+
traces.stream()
254+
.flatMap(trace -> trace.stream())
255+
.anyMatch(
256+
span ->
257+
(span.getName().contains(topicName1)
258+
|| span.getName().contains(topicName2)
259+
|| span.getName().contains(topicName3))
260+
&& !span.getName().contains("[")
261+
&& span.getKind()
262+
== io.opentelemetry.api.trace.SpanKind.CONSUMER);
251263

252264
assertThat(hasMultiTopicSpan || hasIndividualSpans).isTrue();
253265
});

‎instrumentation/kafka/kafka-connect-2.6/testing/src/test/java/io/opentelemetry/instrumentation/kafkaconnect/v2_6/PostgresKafkaConnectSinkTaskTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,8 @@ public void testKafkaConnectPostgresSinkTaskMultiTopicInstrumentation()
272272
span.getName().contains("[")
273273
&& span.getName().contains("]")
274274
&& span.getName().contains("process")
275-
&& span.getKind() == io.opentelemetry.api.trace.SpanKind.CONSUMER);
275+
&& span.getKind()
276+
== io.opentelemetry.api.trace.SpanKind.CONSUMER);
276277

277278
boolean hasIndividualSpans =
278279
traces.stream()
@@ -283,7 +284,8 @@ public void testKafkaConnectPostgresSinkTaskMultiTopicInstrumentation()
283284
|| span.getName().contains(topicName2)
284285
|| span.getName().contains(topicName3))
285286
&& !span.getName().contains("[")
286-
&& span.getKind() == io.opentelemetry.api.trace.SpanKind.CONSUMER);
287+
&& span.getKind()
288+
== io.opentelemetry.api.trace.SpanKind.CONSUMER);
287289

288290
assertThat(hasMultiTopicSpan || hasIndividualSpans).isTrue();
289291
});

0 commit comments

Comments
 (0)