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

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
   )
+
+  // TODO: Codex patch to fix 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

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/AerospikeAsyncClientTest.groovy

@@ -1,5 +1,7 @@
 package datadog.trace.instrumentation.aerospike4
 
+import static org.junit.jupiter.api.Assertions.fail
+
 import com.aerospike.client.AerospikeClient
 import com.aerospike.client.AerospikeException
 import com.aerospike.client.Bin
@@ -9,27 +11,23 @@ import com.aerospike.client.async.NioEventLoops
 import com.aerospike.client.listener.WriteListener
 import com.aerospike.client.policy.ClientPolicy
 import datadog.trace.api.Config
-import spock.lang.Shared
-
-import static org.junit.jupiter.api.Assertions.fail
 
 abstract class AerospikeAsyncClientTest extends AerospikeBaseTest {
-
-  @Shared
-  AerospikeClient client
-
-  @Shared
-  EventLoops eventLoops = new NioEventLoops(1)
+  private AerospikeClient client
+  private EventLoops eventLoops
 
   def setup() throws Exception {
+    eventLoops = new NioEventLoops(1)
+
     ClientPolicy clientPolicy = new ClientPolicy()
     clientPolicy.eventLoops = eventLoops
+
     client = new AerospikeClient(clientPolicy, aerospikeHost, aerospikePort)
   }
 
   def cleanup() throws Exception {
-    client.close()
-    eventLoops.close()
+    client?.close()
+    eventLoops?.close()
   }
 
   def "test put then get"() {
@@ -95,4 +93,3 @@ class AerospikeAsyncClientV1ForkedTest extends AerospikeAsyncClientTest {
     return "aerospike.query"
   }
 }
-

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

@@ -1,5 +1,11 @@
 package datadog.trace.instrumentation.aerospike4
 
+import static datadog.environment.OperatingSystem.isArm64
+import static datadog.environment.OperatingSystem.isLinux
+import static datadog.trace.agent.test.utils.PortUtils.waitForPortToOpen
+import static java.util.concurrent.TimeUnit.SECONDS
+import static org.junit.jupiter.api.Assumptions.assumeFalse
+import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage
 
 import datadog.trace.agent.test.asserts.TraceAssert
 import datadog.trace.agent.test.naming.VersionedNamingTestBase
@@ -9,10 +15,6 @@ 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 {
 
   @Shared
@@ -25,6 +27,9 @@ abstract class AerospikeBaseTest extends VersionedNamingTestBase {
   int aerospikePort = 3000
 
   def setup() throws Exception {
+    // TODO: skip aerospike under arm46 Linux, as supported since ce-6.2.0.2 only
+    assumeFalse(isArm64() && isLinux())
+
     aerospike = new GenericContainer('aerospike:5.5.0.9')
       .withExposedPorts(3000)
       .waitingFor(forLogMessage(".*heartbeat-received.*\\n", 1))
@@ -37,9 +42,7 @@ abstract class AerospikeBaseTest extends VersionedNamingTestBase {
   }
 
   def cleanup() throws Exception {
-    if (aerospike) {
-      aerospike.stop()
-    }
+    aerospike?.stop()
   }
 
   def aerospikeSpan(TraceAssert trace, int index, String methodName, Object parentSpan = null) {

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

@@ -4,19 +4,16 @@ import com.aerospike.client.AerospikeClient
 import com.aerospike.client.Bin
 import com.aerospike.client.Key
 import datadog.trace.api.Config
-import spock.lang.Shared
 
 abstract class AerospikeClientTest extends AerospikeBaseTest {
-
-  @Shared
-  AerospikeClient client
+  private AerospikeClient client
 
   def setup() throws Exception {
     client = new AerospikeClient(aerospikeHost, aerospikePort)
   }
 
   def cleanup() throws Exception {
-    client.close()
+    client?.close()
   }
 
   def "test put then get"() {

dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle

@@ -107,6 +107,20 @@ tasks.named("test", Test) {
   dependsOn "test_before_1_11_106"
 }
 
+def isLinuxArm64 = {
+  def os = System.getProperty("os.name").toLowerCase()
+  def arch = System.getProperty("os.arch").toLowerCase()
+  os.contains("linux") && (arch.contains("arm64") || arch.contains("aarch64"))
+}
+
+tasks.withType(Test).configureEach {
+  if ((name == "forkedTest" || name.endsWith("ForkedTest"))
+    && isLinuxArm64()) {
+    // TODO: Remove this Linux arm64 workaround once the forked AWS SDK 1.11 tests are stable there.
+    maxParallelForks = 1
+  }
+}
+
 tasks.named("forkedTest", Test) {
   dependsOn "test_before_1_11_106ForkedTest"
 }

dd-java-agent/instrumentation/couchbase/couchbase-2.0/build.gradle

@@ -52,3 +52,8 @@ dependencies {
   latestDepTestImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.+'
   latestDepTestImplementation group: 'com.couchbase.client', name: 'encryption', version: '+'
 }
+
+tasks.withType(Test).configureEach {
+  // same setting as agent-tooling to avoid Byte Buddy/ConfigTransformSpockExtension failures on newer JDKs
+  jvmArgs += ["-Dnet.bytebuddy.raw=true"]
+}

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 datadog.environment.OperatingSystem.arm64
+import static datadog.environment.OperatingSystem.linux
+import static org.junit.jupiter.api.Assumptions.assumeTrue
+
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.Trace
 import datadog.trace.core.DDSpan
@@ -8,24 +12,18 @@ 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")
-
+  // 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
@@ -279,6 +277,6 @@ class NettyExecutorInstrumentationTest extends InstrumentationSpecification {
 
   def epollExecutor() {
     // EPoll only works on linux
-    isLinux ? epollEventLoopGroup.next() : null
+    epollEventLoopGroup?.next()
   }
 }

dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy

@@ -147,7 +147,8 @@ class StringConcatFactoryCallSiteTest extends InstrumentationSpecification {
     setup:
     StringModule iastModule = Mock(StringModule)
     InstrumentationBridge.registerIastModule(iastModule)
-    final expected = '𠆢Hello𠆢\u0001𠆢World!.'
+    // 𠆢Hello...
+    final expected = '\uD840\uDDA2Hello\uD840\uDDA2\u0001\uD840\uDDA2World!.'
 
     when:
     final result = TestStringConcatFactorySuite.plusWithUtfConstants('Hello', 'World!')
@@ -157,8 +158,8 @@ class StringConcatFactoryCallSiteTest extends InstrumentationSpecification {
     1 * iastModule.onStringConcatFactory(
       expected,
       ['Hello', 'World!'] as String[],
-      '𠆢\u0001\u0002\u0001.',
-      ['𠆢\u0001𠆢'] as Object[],
+      '\uD840\uDDA2\u0001\u0002\u0001.',
+      ['\uD840\uDDA2\u0001\uD840\uDDA2'] as Object[],
       [-2, 0, -5, 1, -1] as int[])
     0 * _
   }

dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java

@@ -5,7 +5,6 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class TestStringConcatFactorySuite {
-
   private static final Logger LOGGER = LoggerFactory.getLogger(TestStringConcatFactorySuite.class);
 
   private TestStringConcatFactorySuite() {}
@@ -33,7 +32,8 @@ public static String plusWithConstantsAndTags(final String left, final String ri
 
   public static String plusWithUtfConstants(final String left, final String right) {
     LOGGER.debug("Before string plus {} {}", left, right);
-    final String result = "𠆢" + left + "𠆢\u0001𠆢" + right + ".";
+    // 𠆢 + left + ...
+    final String result = "\uD840\uDDA2" + left + "\uD840\uDDA2\u0001\uD840\uDDA2" + right + ".";
     LOGGER.debug("After string plus {}", result);
     return result;
   }
@@ -50,7 +50,8 @@ public static String stringPlusWithMultipleObjects(final Object... target) {
     LOGGER.debug("Before string plus {}", Arrays.toString(target));
     String result = "";
     for (final Object item : target) {
-      result += item;
+      //noinspection StringConcatenationInLoop
+      result += item; // intentional `+` in loop for test.
     }
     LOGGER.debug("After string plus {}", result);
     return result;

dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy

@@ -5,8 +5,13 @@ import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.propagation.CodecModule
 import datadog.trace.api.iast.propagation.PropagationModule
 import foo.bar.TestURLEncoderCallSiteSuite
+import java.nio.charset.Charset
 
 class URLEncoderCallSiteTest extends InstrumentationSpecification {
+  // Explicit escape for non-ASCII `ståle` to make test independent of container settings.
+  private static final String NON_ASCII_QUERY = 'my test.asp?name=st\u00E5le&car=saab'
+  private static final String DEFAULT_CHARSET_ENCODED =
+  URLEncoder.encode(NON_ASCII_QUERY, Charset.defaultCharset().name())
 
   @Override
   protected void configurePreAgent() {
@@ -27,9 +32,9 @@ class URLEncoderCallSiteTest extends InstrumentationSpecification {
     0 * _
 
     where:
-    args                                         | expected
-    ['my test.asp?name=ståle&car=saab']          | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
-    ['my test.asp?name=ståle&car=saab', 'UTF-8'] | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
+    args                       | expected
+    [NON_ASCII_QUERY]          | DEFAULT_CHARSET_ENCODED
+    [NON_ASCII_QUERY, 'UTF-8'] | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
   }
 
   void 'test encode with null args'() {