Experimental PR to test dd-trace-java on Windows OS on GitLab CI

.gitlab-ci.yml

@@ -38,6 +38,7 @@ stages:
   - benchmarks
   - macrobenchmarks
   - tests
+  - tests-arm64
   - test-summary
   - exploration-tests
   - ci-visibility-tests
@@ -54,6 +55,8 @@ variables:
   GRADLE_VERSION: "8.14.4" # must match gradle-wrapper.properties
   MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
   GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
+  ARM64_BUILDER_IMAGE_REPO: "registry.ddbuild.io/images/mirror/dd-trace-java-docker-build"
+  ARM64_BUILDER_IMAGE_TAG: "alexeyk_arm64-test-arm64-base"
   BUILDER_IMAGE_REPO: "registry.ddbuild.io/images/mirror/dd-trace-java-docker-build" # images are pinned in images/mirror.lock.yaml in the DataDog/images repo
   BUILDER_IMAGE_VERSION_PREFIX: "ci-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "ci-" or "123_merge-")
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
@@ -674,6 +677,123 @@ muzzle-dep-report:
       - scheduler_failure
       - data_integrity_failure
 
+.test_job_arm64:
+  image: ${ARM64_BUILDER_IMAGE_REPO}:${ARM64_BUILDER_IMAGE_TAG}
+  tags: [ "docker-in-docker:arm64" ]
+  stage: tests-arm64
+  needs: []
+  variables:
+    # arm64 docker image installs only these JVMs; override the global default regex.
+    DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/
+    GRADLE_PARAMS: "-PskipFlakyTests"
+    GRADLE_WORKERS: 6
+    GRADLE_MEMORY_MIN: 1G
+    GRADLE_MEMORY_MAX: 4G
+    # Sized for the arm64 microvm runner pool (smaller than amd64).
+    # Observed peak on equivalent amd64 workload: ~14.5 GB / ~1.5 vCPU avg.
+    # Bump back up if jobs OOM or we see CPU throttling in cgroup-info.
+    KUBERNETES_CPU_REQUEST: 6
+    KUBERNETES_MEMORY_REQUEST: 12Gi
+    KUBERNETES_MEMORY_LIMIT: 16Gi
+    TESTCONTAINERS_CHECKS_DISABLE: "true"
+    TESTCONTAINERS_RYUK_DISABLED: "true"
+    TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ddbuild.io/images/mirror/"
+    JETTY_AVAILABLE_PROCESSORS: 4
+    GIT_SUBMODULE_STRATEGY: normal
+    GIT_SUBMODULE_DEPTH: 1
+  rules:
+    - if: $testJvm =~ $DEFAULT_TEST_JVMS
+      when: manual
+      allow_failure: true
+  cache:
+    - key: dependency-$CACHE_TYPE
+      paths:
+        - .gradle/wrapper
+        - .gradle/caches
+        - .gradle/notifications
+        - .mvn/caches
+      policy: pull
+      fallback_keys:
+        - dependency-base
+        - dependency-lib
+      unprotect: true
+  before_script:
+    - git config --global --add safe.directory "$CI_PROJECT_DIR"
+    - export ORG_GRADLE_PROJECT_mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY
+    - export ORG_GRADLE_PROJECT_gradlePluginProxy=$GRADLE_PLUGIN_PROXY
+    - |
+      JAVA_HOMES=$(env | grep -E '^JAVA_[A-Z0-9_]+_HOME=' | sed 's/=.*//' | paste -sd,)
+      cat >> gradle.properties <<EOF
+      org.gradle.java.installations.auto-detect=false
+      org.gradle.java.installations.auto-download=false
+      org.gradle.java.installations.fromEnv=$JAVA_HOMES
+      EOF
+    - mkdir -p .gradle .mvn/caches
+    # The `dependency-$CACHE_TYPE` cache is populated by amd64's `populate_dep_cache`
+    # (running as root). arm64 runs as `non-root-user`, so when Gradle does `chmod 700`
+    # on the restored .gradle directory it fails with EPERM. Rewrite the tree under
+    # the runner user's ownership before invoking Gradle. Mirrors the dance in
+    # `.gradle_build` (.gitlab-ci.yml:239-247).
+    - cp -r .gradle .gradle-copy
+    - rm -rf .gradle
+    - mv .gradle-copy .gradle
+    - 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
+    - *prepare_test_env
+    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xshare:off -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"
+    # Disable CDS (Class Data Sharing) for the Gradle daemon.
+    # Temurin 11 on the arm64 microvm runner SIGSEGVs in ClassLoaderData::add_handle
+    # while restoring archived class mirrors from classes.jsa during JVM startup;
+    # -Xshare:off bypasses the crashing path.
+    - ./gradlew --version
+  script:
+    - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -Pslot=$CI_NODE_INDEX/$CI_NODE_TOTAL $GRADLE_ARGS --continue
+  after_script:
+    - *cgroup_info
+    - gitlab_section_start "collect-reports" "Collecting reports"
+    - .gitlab/collect_reports.sh
+    - gitlab_section_end "collect-reports"
+  artifacts:
+    when: always
+    paths:
+      - ./reports.tar
+      - ./profiles.tar
+      - ./results
+      - './test_counts_*.json'
+      - '.gradle/daemon/*/*.out.log'
+    reports:
+      junit: results/*.xml
+  retry:
+    max: 2
+    when:
+      - unknown_failure
+      - stuck_or_timeout_failure
+      - runner_system_failure
+      - unmet_prerequisites
+      - scheduler_failure
+      - data_integrity_failure
+
+.test_job_arm64_with_test_agent:
+  extends: .test_job_arm64
+  variables:
+    CI_USE_TEST_AGENT: "true"
+    CI_AGENT_HOST: local-agent
+  services:
+    - name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.44.0
+      alias: local-agent
+      variables:
+        LOG_LEVEL: "DEBUG"
+        TRACE_LANGUAGE: "java"
+        DD_SUPPRESS_TRACE_PARSE_ERRORS: "true"
+        DD_POOL_TRACE_CHECK_FAILURES: "true"
+        DD_DISABLE_ERROR_RESPONSES: "true"
+        ENABLED_CHECKS: "trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service"
+  script:
+    - !reference [.test_job_arm64, script]
+    - .gitlab/check_test_agent_results.sh
+
 .test_job_with_test_agent:
   extends: .test_job
   variables:
@@ -721,6 +841,14 @@ test_base:
     - if [ "$testJvm" == "8" ]; then export GRADLE_PARAMS="-PskipFlakyTests -PcheckCoverage"; fi
     - !reference [.test_job, script]
 
+test_base_arm64:
+  extends: .test_job_arm64
+  variables:
+    GRADLE_TARGET: ":baseTest"
+    CACHE_TYPE: "base"
+  parallel:
+    matrix: *test_matrix_4
+
 test_inst:
   extends: .test_job_with_test_agent
   variables:
@@ -729,6 +857,14 @@ test_inst:
   parallel:
     matrix: *test_matrix_8
 
+test_inst_arm64:
+  extends: .test_job_arm64_with_test_agent
+  variables:
+    GRADLE_TARGET: ":instrumentationTest"
+    CACHE_TYPE: "inst"
+  parallel:
+    matrix: *test_matrix_8
+
 test_inst_latest:
   extends: .test_job_with_test_agent
   variables:
@@ -741,6 +877,18 @@ test_inst_latest:
         # This emulates "parallel" by including it in the matrix
         CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
 
+test_inst_latest_arm64:
+  extends: .test_job_arm64_with_test_agent
+  variables:
+    GRADLE_TARGET: ":instrumentationLatestDepTest"
+    CACHE_TYPE: "latestdep"
+  parallel:
+    matrix:
+      - testJvm: ["8", "17", "21", "25"] # the latest "tip" version is LTS v25
+        # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
+        # This emulates "parallel" by including it in the matrix
+        CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
+
 test_flaky:
   extends: .test_job_with_test_agent
   variables:
@@ -781,6 +929,14 @@ test_profiling:
   parallel:
     matrix: *test_matrix
 
+test_profiling_arm64:
+  extends: .test_job_arm64
+  variables:
+    GRADLE_TARGET: ":profilingTest"
+    CACHE_TYPE: "profiling"
+  parallel:
+    matrix: *test_matrix
+
 # specific jvms list for debugger project because J9-based JVMs have issues with local vars
 # so need to test at least against one J9-based JVM
 test_debugger:
@@ -792,6 +948,14 @@ test_debugger:
   parallel:
     matrix: *test_matrix
 
+test_debugger_arm64:
+  extends: .test_job_arm64
+  variables:
+    GRADLE_TARGET: ":debuggerTest"
+    CACHE_TYPE: "base"
+  parallel:
+    matrix: *test_matrix
+
 test_smoke:
   extends: .test_job
   variables:
@@ -801,6 +965,15 @@ test_smoke:
   parallel:
     matrix: *test_matrix_8
 
+test_smoke_arm64:
+  extends: .test_job_arm64
+  variables:
+    GRADLE_TARGET: "stageMainDist :smokeTest"
+    GRADLE_PARAMS: "-PskipFlakyTests"
+    CACHE_TYPE: "smoke"
+  parallel:
+    matrix: *test_matrix_8
+
 test_ssi_smoke:
   extends: .test_job
   rules:
@@ -818,6 +991,16 @@ test_ssi_smoke:
   parallel:
     matrix: *test_matrix_8
 
+test_ssi_smoke_arm64:
+  extends: .test_job_arm64
+  variables:
+    GRADLE_TARGET: "stageMainDist :smokeTest"
+    CACHE_TYPE: "smoke"
+    DD_INJECT_FORCE: "true"
+    DD_INJECTION_ENABLED: "tracer"
+  parallel:
+    matrix: *test_matrix_8
+
 test_smoke_graalvm:
   extends: .test_job
   tags: [ "arch:amd64" ]
@@ -830,6 +1013,16 @@ test_smoke_graalvm:
     matrix:
       - testJvm: ["graalvm17", "graalvm21", "graalvm25"]
 
+test_smoke_graalvm_arm64:
+  extends: .test_job_arm64
+  variables:
+    GRADLE_TARGET: "stageMainDist :dd-smoke-test:spring-boot-3.0-native:test"
+    CACHE_TYPE: "smoke"
+    CI_NO_SPLIT: "true"
+  parallel:
+    matrix:
+      - testJvm: ["graalvm21"]
+
 test_smoke_semeru8_debugger:
   extends: .test_job
   tags: [ "arch:amd64" ]

build.gradle.kts

@@ -82,6 +82,14 @@ allprojects {
     dependsOn(tasks.withType<AbstractCompile>())
   }
 
+  // Temurin 11/21 on Linux arm64 SIGSEGVs in SystemDictionary::define_instance_class
+  // during CDS shared-class restore. GRADLE_OPTS / org.gradle.jvmargs only reaches the
+  // Gradle daemon, so every forked JVM (Test executor, JavaCompile worker daemon when
+  // the toolchain differs from the daemon's JDK) must disable CDS on its own.
+  val os = System.getProperty("os.name").lowercase()
+  val arch = System.getProperty("os.arch").lowercase()
+  val isLinuxArm64 = os.contains("linux") && (arch.contains("aarch64") || arch.contains("arm64"))
+
   tasks.configureEach {
     if (this is JavaForkOptions) {
       maxHeapSize = System.getProperty("datadog.forkedMaxHeapSize")
@@ -91,6 +99,18 @@ allprojects {
         "-XX:+HeapDumpOnOutOfMemoryError",
         "-XX:HeapDumpPath=/tmp"
       )
+      if (isLinuxArm64) {
+        jvmArgs("-Xshare:off")
+      }
+    }
+  }
+
+  if (isLinuxArm64) {
+    tasks.withType<JavaCompile>().configureEach {
+      options.forkOptions.jvmArgs?.add("-Xshare:off")
+    }
+    tasks.withType<GroovyCompile>().configureEach {
+      groovyOptions.forkOptions.jvmArgs?.add("-Xshare:off")
     }
   }
 }

buildSrc/src/main/kotlin/dd-trace-java.test-jvm-constraints.gradle.kts

@@ -4,6 +4,7 @@ import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension.Comp
 import datadog.gradle.plugin.testJvmConstraints.TestJvmSpec
 import datadog.gradle.plugin.testJvmConstraints.isJavaVersionAllowed
 import datadog.gradle.plugin.testJvmConstraints.isTestJvmAllowed
+import java.util.Locale.getDefault
 
 plugins {
   java
@@ -79,6 +80,19 @@ private fun Test.configureTestJvm(extension: TestJvmConstraintsExtension) {
     ),
     extension.allowReflectiveAccessToJdk
   )
+
+  // Fix for arm64 Linux for ByteBuddy error:
+  // "Could not self-attach to current VM using external process"
+  val os = System.getProperty("os.name").lowercase(getDefault())
+  val arch = System.getProperty("os.arch").lowercase(getDefault())
+  val arm64 = arch.contains("aarch64") || arch.contains("arm64")
+
+  if (os.contains("linux") && arm64) {
+    conditionalJvmArgs(
+      JavaVersion.VERSION_1_9,
+      listOf("-Djdk.attach.allowAttachSelf=true")
+    )
+  }
 }
 
 // Jacoco plugin is not applied on every project

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

@@ -33,8 +33,7 @@
 import org.msgpack.core.MessageUnpacker;
 
 public class MsgPackWriterTest {
-  // Explicit escapes for non-ASCII chars to make test independent of container settings.
-  private static final String NON_ASCII_STRING = "foob\u00E1r_\u263a"; // foobár_☺
+  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 + 1;
 

components/environment/src/main/java/datadog/environment/OperatingSystem.java

@@ -1,5 +1,6 @@
 package datadog.environment;
 
+import static datadog.environment.OperatingSystem.Architecture.ARM64;
 import static datadog.environment.OperatingSystem.Type.LINUX;
 import static datadog.environment.OperatingSystem.Type.MACOS;
 import static datadog.environment.OperatingSystem.Type.WINDOWS;
@@ -25,6 +26,15 @@ public final class OperatingSystem {
 
   private OperatingSystem() {}
 
+  /**
+   * Checks whether the architecture is arm64.
+   *
+   * @return @{@code true} if architecture is arm64, {@code false} otherwise.
+   */
+  public static boolean isArm64() {
+    return ARCHITECTURE == ARM64;
+  }
+
   /**
    * Checks whether the operating system is Linux based.
    *

components/json/src/test/java/datadog/json/JsonReaderTest.java

@@ -215,8 +215,7 @@ void testStringEscaping() {
       assertEquals("\n", reader.nextString());
       assertEquals("\r", reader.nextString());
       assertEquals("\t", reader.nextString());
-      // Explicit escape for non-ASCII `É` to make test independent of container settings.
-      assertEquals("\u00C9", reader.nextString());
+      assertEquals("É", reader.nextString());
       reader.endArray();
     } catch (IOException e) {
       fail("Failed to read escaped JSON strings", e);

dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java

@@ -1,6 +1,5 @@
 package datadog.crashtracking.buildid;
 
-import static datadog.environment.OperatingSystem.Architecture.ARM64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -138,7 +137,7 @@ private static Stream<Arguments> elfBinaries() {
   @MethodSource("elfBinaries")
   void testElfBuildIdExtraction(String containerPath, String description) throws Exception {
     // TODO: check if arm64 can be supported too.
-    assumeFalse(OperatingSystem.architecture() == ARM64, "Skipping for arm64");
+    assumeFalse(OperatingSystem.isArm64(), "Skipping for arm64");
     Path localBinary = copyFromContainer(linuxContainer, containerPath);
 
     ElfBuildIdExtractor extractor = new ElfBuildIdExtractor();