Fixed arm64 support.

Author: AlexeyKuznetsov-DD

.gitlab-ci.yml

@@ -999,7 +999,7 @@ test_inst_arm64:
     GRADLE_TARGET: ":instrumentationTest"
   parallel:
     matrix:
-      - CI_SPLIT: [ "1/8", "2/8", "3/8", "4/8", "5/8", "6/8", "7/8", "8/8" ]
+      - CI_SPLIT: [ "1/4", "2/4", "3/4", "4/4" ]
 
 test_inst_latest:
   extends: .test_job_with_test_agent

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.
    *

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();

dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java

@@ -1,7 +1,5 @@
 package com.datadog.profiling.controller;
 
-import static datadog.environment.OperatingSystem.Architecture.ARM64;
-
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.OperatingSystem;
 import datadog.environment.SystemProperties;
@@ -243,11 +241,7 @@ private static boolean extractSoFromJar(Path target, StringBuilder sb) throws Ex
           .filter(e -> e.getName().contains("libjavaProfiler.so"))
           .filter(
               e ->
-                  e.getName()
-                          .contains(
-                              OperatingSystem.architecture() == ARM64
-                                  ? "/linux-arm64/"
-                                  : "/linux-x64/")
+                  e.getName().contains(OperatingSystem.isArm64() ? "/linux-arm64/" : "/linux-x64/")
                       && (!OperatingSystem.isMusl() || e.getName().contains("-musl")))
           .findFirst()
           .map(

dd-java-agent/instrumentation/aerospike-4.0/src/test/groovy/datadog/trace/instrumentation/aerospike4/AerospikeBaseTest.groovy

@@ -1,5 +1,9 @@
 package datadog.trace.instrumentation.aerospike4
 
+import static datadog.environment.OperatingSystem.arm64
+import static datadog.trace.agent.test.utils.PortUtils.waitForPortToOpen
+import static java.util.concurrent.TimeUnit.SECONDS
+import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage
 
 import datadog.trace.agent.test.asserts.TraceAssert
 import datadog.trace.agent.test.naming.VersionedNamingTestBase
@@ -9,11 +13,9 @@ import datadog.trace.core.DDSpan
 import org.testcontainers.containers.GenericContainer
 import spock.lang.Shared
 
-import static datadog.trace.agent.test.utils.PortUtils.waitForPortToOpen
-import static java.util.concurrent.TimeUnit.SECONDS
-import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage
-
 abstract class AerospikeBaseTest extends VersionedNamingTestBase {
+  // arm64 supported only since `ce-6.2.0.2`:
+  private static final String AEROSPIKE_IMAGE = isArm64() ? 'aerospike:ce-6.2.0.2' : 'aerospike:5.5.0.9'
 
   @Shared
   def aerospike
@@ -25,7 +27,7 @@ abstract class AerospikeBaseTest extends VersionedNamingTestBase {
   int aerospikePort = 3000
 
   def setup() throws Exception {
-    aerospike = new GenericContainer('aerospike:5.5.0.9')
+    aerospike = new GenericContainer(AEROSPIKE_IMAGE)
       .withExposedPorts(3000)
       .waitingFor(forLogMessage(".*heartbeat-received.*\\n", 1))
 

dd-java-agent/instrumentation/google-pubsub-1.116/src/test/groovy/PubSubTest.groovy

@@ -1,4 +1,3 @@
-
 import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 
 import com.google.api.gax.core.NoCredentialsProvider
@@ -34,13 +33,12 @@ import datadog.trace.core.datastreams.StatsGroup
 import datadog.trace.instrumentation.grpc.client.GrpcClientDecorator
 import io.grpc.ManagedChannel
 import io.grpc.ManagedChannelBuilder
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.CountDownLatch
 import org.testcontainers.containers.PubSubEmulatorContainer
 import org.testcontainers.utility.DockerImageName
 import spock.lang.Shared
 
-import java.nio.charset.StandardCharsets
-import java.util.concurrent.CountDownLatch
-
 abstract class PubSubTest extends VersionedNamingTestBase {
   private static final String PROJECT_ID = "dd-trace-java"
 
@@ -97,7 +95,7 @@ abstract class PubSubTest extends VersionedNamingTestBase {
   }
 
   def setupSpec() {
-    emulator = new PubSubEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:495.0.0-emulators"))
+    emulator = new PubSubEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:495.0.0-emulators"))
     emulator.start()
     channel = ManagedChannelBuilder.forTarget(emulator.getEmulatorEndpoint()).usePlaintext().build()
     transportChannelProvider = FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel))

dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy

@@ -1,5 +1,9 @@
 package executor
 
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue
+
+import datadog.environment.OperatingSystem
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.Trace
 import datadog.trace.core.DDSpan
@@ -8,24 +12,21 @@ import io.netty.channel.epoll.EpollEventLoopGroup
 import io.netty.channel.local.LocalEventLoopGroup
 import io.netty.channel.nio.NioEventLoopGroup
 import io.netty.util.concurrent.DefaultEventExecutorGroup
-import runnable.JavaAsyncChild
-import spock.lang.Shared
-
 import java.lang.reflect.InvocationTargetException
 import java.util.concurrent.Callable
 import java.util.concurrent.Future
 import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.TimeUnit
-
-import static org.junit.jupiter.api.Assumptions.assumeTrue
+import runnable.JavaAsyncChild
+import spock.lang.Shared
 
 class NettyExecutorInstrumentationTest extends InstrumentationSpecification {
-
   @Shared
-  boolean isLinux = System.getProperty("os.name").toLowerCase().contains("linux")
-
+  boolean isLinux = OperatingSystem.isLinux()
+  @Shared
+  boolean isArm64 = OperatingSystem.isArm64() // TODO: check if arm64 can be supported too.
   @Shared
-  EpollEventLoopGroup epollEventLoopGroup = isLinux ? new EpollEventLoopGroup(4) : null
+  EpollEventLoopGroup epollEventLoopGroup = isLinux && !isArm64 ? new EpollEventLoopGroup(4) : null
   @Shared
   DefaultEventExecutorGroup defaultEventExecutorGroup = new DefaultEventExecutorGroup(4)
   @Shared