Fixed tests for arm64

Author: AlexeyKuznetsov-DD

.gitlab-ci.yml

@@ -839,6 +839,7 @@ muzzle-dep-report:
     TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ddbuild.io/images/mirror/"
     JETTY_AVAILABLE_PROCESSORS: 4
   before_script:
+    - source .gitlab/gitlab-utils.sh
     - apt-get update
     - apt-get install -y --no-install-recommends git
     - export ORG_GRADLE_PROJECT_mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY
@@ -854,6 +855,12 @@ muzzle-dep-report:
     - export GRADLE_USER_HOME=$(pwd)/.gradle
     - sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
     - *normalize_node_index
+    - gitlab_section_start "gradle-dance" "Fix .gradle directory permissions"
+    - cp -r .gradle .gradle-copy
+    - rm -rf .gradle
+    - mv .gradle-copy .gradle
+    - ls -la
+    - gitlab_section_end "gradle-dance"
     - *prepare_test_env
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEMORY_MIN -Xmx$GRADLE_MEMORY_MAX -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djava.util.prefs.userRoot=/tmp/.java/.userPrefs-${CI_JOB_ID}' -Ddatadog.forkedMinHeapSize=128M -Ddatadog.forkedMaxHeapSize=1024M"
     - export GRADLE_ARGS="--build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"

communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java

@@ -1,6 +1,7 @@
 package datadog.communication.serialization.msgpack;
 
 import static datadog.trace.util.stacktrace.StackTraceEvent.DEFAULT_LANGUAGE;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -19,7 +20,6 @@
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -33,6 +33,9 @@
 import org.msgpack.core.MessageUnpacker;
 
 public class MsgPackWriterTest {
+  private static final String NON_ASCII_STRING = "foobár";
+  private static final byte[] NON_ASCII_BYTES = NON_ASCII_STRING.getBytes(UTF_8);
+  private static final int NON_ASCII_BUFFER_CAPACITY = NON_ASCII_BYTES.length + 4;
 
   @Test
   public void testOverflow() {
@@ -141,13 +144,12 @@ public void testWriteBinaryNoArgVariant() {
                   MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
                   try {
                     assertEquals(unpacker.unpackBinaryHeader(), 6);
-                    assertArrayEquals(
-                        unpacker.readPayload(6), "foobar".getBytes(StandardCharsets.UTF_8));
+                    assertArrayEquals(unpacker.readPayload(6), "foobar".getBytes(UTF_8));
                   } catch (IOException e) {
                     Assertions.fail(e.getMessage());
                   }
                 }));
-    writer.writeBinary("foobar".getBytes(StandardCharsets.UTF_8));
+    writer.writeBinary("foobar".getBytes(UTF_8));
   }
 
   @Test
@@ -628,16 +630,17 @@ public void testWriteObjectArray() {
 
   @Test
   public void testWriteStringUTF8BytesString() {
-    UTF8BytesString value = UTF8BytesString.create("foobár");
+    UTF8BytesString value = UTF8BytesString.create(NON_ASCII_STRING);
+    int encodedLength = value.encodedLength();
     MsgPackWriter writer =
         new MsgPackWriter(
             newBuffer(
-                20,
+                (encodedLength + 4) * 2,
                 (messageCount, buffer) -> {
                   MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
                   try {
-                    assertEquals(unpacker.unpackString(), "foobár");
-                    assertEquals(unpacker.unpackString(), "foobár");
+                    assertEquals(unpacker.unpackString(), NON_ASCII_STRING);
+                    assertEquals(unpacker.unpackString(), NON_ASCII_STRING);
                   } catch (IOException e) {
                     Assertions.fail(e.getMessage());
                   }
@@ -671,7 +674,7 @@ public void testWriteObjectStringGeneralPath() {
         new Object() {
           @Override
           public String toString() {
-            return "foobár";
+            return NON_ASCII_STRING;
           }
         };
     MsgPackWriter writer =
@@ -681,31 +684,31 @@ public String toString() {
                 (messageCount, buffer) -> {
                   MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
                   try {
-                    assertEquals(unpacker.unpackString(), "foobár");
+                    assertEquals(unpacker.unpackString(), NON_ASCII_STRING);
                     assertEquals(unpacker.unpackString(), "foobàr");
                   } catch (IOException e) {
                     Assertions.fail(e.getMessage());
                   }
                 }));
     writer.writeObjectString(value, null);
-    writer.writeObjectString(value, s -> "foobàr".getBytes(StandardCharsets.UTF_8));
+    writer.writeObjectString(value, s -> "foobàr".getBytes(UTF_8));
   }
 
   @Test
   public void testWriteStringGeneralCharSequence() {
     MsgPackWriter writer =
         new MsgPackWriter(
             newBuffer(
-                10,
+                NON_ASCII_BUFFER_CAPACITY,
                 (messageCount, buffer) -> {
                   MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
                   try {
-                    assertEquals(unpacker.unpackString(), "foobár");
+                    assertEquals(unpacker.unpackString(), NON_ASCII_STRING);
                   } catch (IOException e) {
                     Assertions.fail(e.getMessage());
                   }
                 }));
-    CharBuffer charSeq = CharBuffer.wrap("foobár");
+    CharBuffer charSeq = CharBuffer.wrap(NON_ASCII_STRING);
     writer.writeString(charSeq, null);
   }
 
@@ -714,16 +717,16 @@ public void testWriteStringEncodingCache() {
     MsgPackWriter writer =
         new MsgPackWriter(
             newBuffer(
-                10,
+                NON_ASCII_BUFFER_CAPACITY,
                 (messageCount, buffer) -> {
                   MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer);
                   try {
-                    assertEquals(unpacker.unpackString(), "foobár");
+                    assertEquals(unpacker.unpackString(), NON_ASCII_STRING);
                   } catch (IOException e) {
                     Assertions.fail(e.getMessage());
                   }
                 }));
-    writer.writeString("", s -> "foobár".getBytes(StandardCharsets.UTF_8));
+    writer.writeString("", s -> NON_ASCII_BYTES);
   }
 
   @Test