Simplify Kafka exception log assertion

Author: trask

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

@@ -12,9 +12,6 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
-import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
-import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
-import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID;
@@ -26,7 +23,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
@@ -36,7 +32,6 @@
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.message.MessageHeaderUtil;
-import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.sdk.trace.data.LinkData;
 import io.opentelemetry.sdk.trace.data.StatusData;
@@ -47,7 +42,6 @@
 import org.apache.kafka.clients.consumer.Consumer;
 import org.assertj.core.api.AbstractLongAssert;
 import org.assertj.core.api.AbstractStringAssert;
-import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // using deprecated semconv
@@ -187,41 +181,25 @@ void testConsumerError() {
     testing.waitAndAssertTraces(
         trace ->
             trace.hasSpansSatisfyingExactly(
-                span -> {
-                  span.hasName("unknown receive")
-                      .hasKind(SpanKind.CONSUMER)
-                      .hasNoParent()
-                      .hasStatus(StatusData.error())
-                      .hasAttributesSatisfyingExactly(
-                          equalTo(MESSAGING_SYSTEM, "kafka"),
-                          equalTo(MESSAGING_OPERATION, "receive"),
-                          equalTo(MESSAGING_BATCH_MESSAGE_COUNT, 0));
-                  if (emitExceptionAsSpanEvents()) {
-                    span.hasException(error);
-                  }
-                }));
+                span ->
+                    span.hasName("unknown receive")
+                        .hasKind(SpanKind.CONSUMER)
+                        .hasNoParent()
+                        .hasStatus(StatusData.error())
+                        .hasException(emitExceptionAsSpanEvents() ? error : null)
+                        .hasAttributesSatisfyingExactly(
+                            equalTo(MESSAGING_SYSTEM, "kafka"),
+                            equalTo(MESSAGING_OPERATION, "receive"),
+                            equalTo(MESSAGING_BATCH_MESSAGE_COUNT, 0))));
 
     if (emitExceptionAsLogs()) {
-      Awaitility.await()
-          .untilAsserted(
-              () -> {
-                List<LogRecordData> logs =
-                    testing.logRecords().stream()
-                        .filter(log -> "messaging.receive.exception".equals(log.getEventName()))
-                        .collect(toList());
-                assertThat(logs).hasSize(1);
-                assertThat(logs.get(0))
-                    .hasSeverity(Severity.WARN)
-                    .hasEventName("messaging.receive.exception")
-                    .hasAttributesSatisfyingExactly(
-                        equalTo(EXCEPTION_TYPE, error.getClass().getName()),
-                        equalTo(EXCEPTION_MESSAGE, error.getMessage()),
-                        satisfies(
-                            EXCEPTION_STACKTRACE,
-                            val ->
-                                val.contains(error.getClass().getName())
-                                    .contains("WrapperTest.testConsumerError")));
-              });
+      testing.waitAndAssertLogRecords(
+          logRecord ->
+              logRecord
+                  .hasSeverity(Severity.WARN)
+                  .hasEventName("messaging.receive.exception")
+                  .hasException(error)
+                  .hasTotalAttributeCount(3));
     }
   }
 }