fix it & apply spotless

Author: Cirilla-zmh

messaging-wrappers/README.md

@@ -47,15 +47,15 @@ detailed example, please check out [KafkaClientTest](./kafka-clients/src/test/ja
 To use OpenTelemetry in your project, you need to add the necessary dependencies. Below are the configurations for both
 Gradle and Maven.
 
-#### Gradle
+### [Given] Gradle
 
 ```kotlin
 dependencies {
     implementation("io.opentelemetry.contrib:opentelemetry-messaging-wrappers-kafka-clients:${latest_version}")
 }
 ```
 
-#### Maven
+### [Given] Maven
 
 ```xml
 <dependency>
@@ -125,15 +125,15 @@ custom message protocol. For detailed example, please check out [UserDefinedMess
 
 ### [Manual] Step 1 Add dependencies
 
-#### Gradle
+#### [Manual] Gradle
 
 ```kotlin
 dependencies {
     implementation("io.opentelemetry.contrib:opentelemetry-messaging-wrappers-api:${latest_version}")
 }
 ```
 
-#### Maven
+#### [Manual] Maven
 
 ```xml
 <dependency>
@@ -209,4 +209,3 @@ public class Demo {
 - [Steve Rao](https://github.com/steverao), Alibaba
 
 Learn more about component owners in [component_owners.yml](../.github/component_owners.yml).
-

messaging-wrappers/aliyun-mns-sdk/build.gradle.kts

@@ -31,3 +31,10 @@ tasks {
     jvmArgs("-Dotel.logs.exporter=logging")
   }
 }
+
+configurations.testRuntimeClasspath {
+  resolutionStrategy {
+    force("ch.qos.logback:logback-classic:1.2.12")
+    force("org.slf4j:slf4j-api:1.7.35")
+  }
+}

messaging-wrappers/aliyun-mns-sdk/src/test/java/io/opentelemetry/contrib/messaging/wrappers/mns/AliyunMnsSdkTest.java

@@ -8,6 +8,7 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE;
+import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_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;
@@ -30,6 +31,7 @@
 import io.opentelemetry.contrib.messaging.wrappers.mns.semconv.MnsProcessRequest;
 import io.opentelemetry.contrib.messaging.wrappers.testing.AbstractBaseTest;
 import java.nio.charset.StandardCharsets;
+import org.apache.commons.codec.binary.Base64;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -140,11 +142,15 @@ public void assertTraces() {
                         .hasKind(SpanKind.CONSUMER)
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(MESSAGING_SYSTEM, "guava-eventbus"),
+                            equalTo(MESSAGING_SYSTEM, "smq"),
                             equalTo(MESSAGING_DESTINATION_NAME, QUEUE),
                             equalTo(
                                 MESSAGING_MESSAGE_BODY_SIZE,
                                 MESSAGE_BODY.getBytes(StandardCharsets.UTF_8).length),
+                            equalTo(
+                                MESSAGING_MESSAGE_ENVELOPE_SIZE,
+                                Base64.encodeBase64(MESSAGE_BODY.getBytes(StandardCharsets.UTF_8))
+                                    .length),
                             equalTo(MESSAGING_OPERATION, "process")),
                 span ->
                     span.hasName("process child")

messaging-wrappers/aliyun-mns-sdk/src/test/java/io/opentelemetry/contrib/messaging/wrappers/mns/broker/SmqMockedBroker.java

@@ -49,18 +49,22 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 @SpringBootApplication
-@SuppressWarnings({"JavaUtilDate", "LockNotBeforeTry", "SystemOut"})
+@SuppressWarnings({
+  "JavaUtilDate",
+  "LockNotBeforeTry",
+  "SystemOut",
+  "PrivateConstructorForUtilityClass"
+})
 public class SmqMockedBroker {
 
   public static void main(String[] args) {
-    System.out.println(System.getProperty("java.class.path"));
     SpringApplication.run(SmqMockedBroker.class, args);
   }
 
   @Controller
   @Scope("singleton")
   public static class BrokerController {
-    
+
     Lock queuesLock = new ReentrantLock();
 
     Map<String, Deque<Message>> queues = new HashMap<>();
@@ -225,7 +229,4 @@ public ResponseEntity<Void> serveDeleteMessage(
           .build();
     }
   }
-
-  private SmqMockedBroker() {
-  }
 }

messaging-wrappers/aliyun-mns-sdk/src/test/java/io/opentelemetry/contrib/messaging/wrappers/mns/broker/SmqUtils.java

@@ -41,7 +41,11 @@ public static String generateRandomMessageId() {
   }
 
   public static String generateRandomRequestId() {
-    return UUID.randomUUID().toString().replaceAll("-", "").substring(0, 24).toUpperCase(Locale.ROOT);
+    return UUID.randomUUID()
+        .toString()
+        .replaceAll("-", "")
+        .substring(0, 24)
+        .toUpperCase(Locale.ROOT);
   }
 
   public static ErrorMessage createErrorMessage(String requestId) {
@@ -68,6 +72,5 @@ private static String bytesToHex(byte[] bytes) {
     return sb.toString();
   }
 
-  private SmqUtils() {
-  }
+  private SmqUtils() {}
 }

messaging-wrappers/kafka-clients/build.gradle.kts

@@ -38,3 +38,9 @@ tasks {
     jvmArgs("-Dotel.logs.exporter=logging")
   }
 }
+
+configurations.all {
+  resolutionStrategy {
+    force("org.apache.kafka:kafka-clients:0.11.0.0")
+  }
+}

messaging-wrappers/kafka-clients/src/test/java/io/opentelemetry/contrib/messaging/wrappers/kafka/KafkaClientBaseTest.java

@@ -135,7 +135,7 @@ public void awaitUntilConsumerIsReady() throws InterruptedException {
       return;
     }
     for (int i = 0; i < 60; i++) {
-      consumer.poll(Duration.ZERO);
+      consumer.poll(0L);
       if (consumerReady.await(3, TimeUnit.SECONDS)) {
         break;
       }

messaging-wrappers/kafka-clients/src/test/java/io/opentelemetry/contrib/messaging/wrappers/kafka/KafkaClientTest.java

@@ -104,7 +104,7 @@ public void sendWithParent(Tracer tracer) {
   public void consumeWithChild(
       Tracer tracer, MessagingProcessWrapper<KafkaProcessRequest> wrapper) {
     // check that the message was received
-    ConsumerRecords<?, ?> records = consumer.poll(Duration.ofSeconds(5));
+    ConsumerRecords<?, ?> records = consumer.poll(Duration.ofSeconds(5).toMillis());
     assertThat(records.count()).isEqualTo(1);
     ConsumerRecord<?, ?> record = records.iterator().next();
     assertThat(record.value()).isEqualTo(greeting);