fix ci & test

Author: wl2027

instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaClientBaseTest.java

@@ -17,6 +17,7 @@
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
@@ -74,10 +75,7 @@ protected static AttributeAssertion bootstrapServersAssertion() {
         MESSAGING_KAFKA_BOOTSTRAP_SERVERS,
         listAssert -> {
           if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) {
-            listAssert
-                .isNotEmpty()
-                .allSatisfy(
-                    server -> org.assertj.core.api.Assertions.assertThat(server).isNotEmpty());
+            listAssert.isNotEmpty().allSatisfy(server -> assertThat(server).isNotEmpty());
           } else {
             listAssert.isNullOrEmpty();
           }

instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsBaseTest.java

@@ -8,6 +8,7 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singleton;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.ImmutableMap;
 import io.opentelemetry.api.common.AttributeKey;
@@ -64,10 +65,7 @@ protected static AttributeAssertion bootstrapServersAssertion() {
         MESSAGING_KAFKA_BOOTSTRAP_SERVERS,
         listAssert -> {
           if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) {
-            listAssert
-                .isNotEmpty()
-                .allSatisfy(
-                    server -> org.assertj.core.api.Assertions.assertThat(server).isNotEmpty());
+            listAssert.isNotEmpty().allSatisfy(server -> assertThat(server).isNotEmpty());
           } else {
             listAssert.isNullOrEmpty();
           }

instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java

@@ -20,6 +20,7 @@
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singleton;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
@@ -79,10 +80,7 @@ protected static AttributeAssertion bootstrapServersAssertion() {
         MESSAGING_KAFKA_BOOTSTRAP_SERVERS,
         listAssert -> {
           if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) {
-            listAssert
-                .isNotEmpty()
-                .allSatisfy(
-                    server -> org.assertj.core.api.Assertions.assertThat(server).isNotEmpty());
+            listAssert.isNotEmpty().allSatisfy(server -> assertThat(server).isNotEmpty());
           } else {
             listAssert.isNullOrEmpty();
           }

instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java

@@ -52,10 +52,7 @@ protected static AttributeAssertion bootstrapServersAssertion() {
         MESSAGING_KAFKA_BOOTSTRAP_SERVERS,
         listAssert -> {
           if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) {
-            listAssert
-                .isNotEmpty()
-                .allSatisfy(
-                    server -> org.assertj.core.api.Assertions.assertThat(server).isNotEmpty());
+            listAssert.isNotEmpty().allSatisfy(server -> assertThat(server).isNotEmpty());
           } else {
             listAssert.isNullOrEmpty();
           }

instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractVertxKafkaTest.java

@@ -17,6 +17,7 @@
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.opentelemetry.api.common.AttributeKey;
@@ -67,10 +68,7 @@ protected static AttributeAssertion bootstrapServersAssertion() {
         MESSAGING_KAFKA_BOOTSTRAP_SERVERS,
         listAssert -> {
           if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) {
-            listAssert
-                .isNotEmpty()
-                .allSatisfy(
-                    server -> org.assertj.core.api.Assertions.assertThat(server).isNotEmpty());
+            listAssert.isNotEmpty().allSatisfy(server -> assertThat(server).isNotEmpty());
           } else {
             listAssert.isNullOrEmpty();
           }

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.AttributeKey;
@@ -40,10 +41,7 @@ protected static AttributeAssertion bootstrapServersAssertion() {
     return satisfies(
         MESSAGING_KAFKA_BOOTSTRAP_SERVERS,
         listAssert ->
-            listAssert
-                .isNotEmpty()
-                .allSatisfy(
-                    server -> org.assertj.core.api.Assertions.assertThat(server).isNotEmpty()));
+            listAssert.isNotEmpty().allSatisfy(server -> assertThat(server).isNotEmpty()));
   }
 
   @SuppressWarnings("deprecation") // using deprecated semconv