Skip to content

Commit 5317f66

Browse files
committed
fix ci && add test
1 parent f0b98c8 commit 5317f66

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ void assertTraces() {
3838
equalTo(MESSAGING_SYSTEM, "kafka"),
3939
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
4040
equalTo(MESSAGING_OPERATION, "publish"),
41+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
4142
satisfies(
4243
MESSAGING_CLIENT_ID,
4344
stringAssert -> stringAssert.startsWith("producer"))),
@@ -52,6 +53,7 @@ void assertTraces() {
5253
equalTo(
5354
MESSAGING_MESSAGE_BODY_SIZE,
5455
greeting.getBytes(StandardCharsets.UTF_8).length),
56+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
5557
satisfies(
5658
MESSAGING_DESTINATION_PARTITION_ID,
5759
AbstractStringAssert::isNotEmpty),

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ void assertTraces() {
4545
equalTo(MESSAGING_SYSTEM, "kafka"),
4646
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
4747
equalTo(MESSAGING_OPERATION, "publish"),
48+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
4849
satisfies(
4950
MESSAGING_CLIENT_ID,
5051
stringAssert -> stringAssert.startsWith("producer"))));
@@ -68,6 +69,7 @@ void assertTraces() {
6869
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
6970
equalTo(MESSAGING_OPERATION, "receive"),
7071
equalTo(MESSAGING_KAFKA_CONSUMER_GROUP, "test"),
72+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
7173
satisfies(
7274
MESSAGING_CLIENT_ID,
7375
stringAssert -> stringAssert.startsWith("consumer")),
@@ -84,6 +86,7 @@ void assertTraces() {
8486
equalTo(
8587
MESSAGING_MESSAGE_BODY_SIZE,
8688
greeting.getBytes(StandardCharsets.UTF_8).length),
89+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
8790
satisfies(
8891
MESSAGING_DESTINATION_PARTITION_ID,
8992
AbstractStringAssert::isNotEmpty),

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ protected static List<AttributeAssertion> sendAttributes(boolean testHeaders) {
6767
equalTo(MESSAGING_SYSTEM, "kafka"),
6868
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
6969
equalTo(MESSAGING_OPERATION, "publish"),
70+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
7071
satisfies(MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")),
7172
satisfies(MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty),
7273
satisfies(MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative)));
@@ -89,6 +90,7 @@ private static List<AttributeAssertion> processAttributes(String greeting, boole
8990
equalTo(MESSAGING_OPERATION, "process"),
9091
equalTo(
9192
MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length),
93+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
9294
satisfies(MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty),
9395
satisfies(MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative),
9496
satisfies(

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ protected static List<AttributeAssertion> sendAttributes(boolean testHeaders) {
9090
equalTo(MESSAGING_SYSTEM, "kafka"),
9191
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
9292
equalTo(MESSAGING_OPERATION, "publish"),
93+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
9394
satisfies(MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")),
9495
satisfies(MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty),
9596
satisfies(MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative)));
@@ -112,6 +113,7 @@ private static List<AttributeAssertion> processAttributes(String greeting, boole
112113
equalTo(MESSAGING_OPERATION, "process"),
113114
equalTo(
114115
MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length),
116+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
115117
satisfies(MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty),
116118
satisfies(MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative),
117119
satisfies(
@@ -138,6 +140,7 @@ protected static List<AttributeAssertion> receiveAttributes(boolean testHeaders)
138140
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
139141
equalTo(MESSAGING_OPERATION, "receive"),
140142
equalTo(MESSAGING_KAFKA_CONSUMER_GROUP, "test"),
143+
satisfies(MESSAGING_KAFKA_BOOTSTRAP_SERVERS, AbstractStringAssert::isNotEmpty),
141144
satisfies(MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")),
142145
equalTo(MESSAGING_BATCH_MESSAGE_COUNT, 1)));
143146
if (testHeaders) {

0 commit comments

Comments
 (0)