Fixed failed tests.

Author: AlexeyKuznetsov-DD

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

@@ -1,9 +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.environment.OperatingSystem
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.Trace
 import datadog.trace.core.DDSpan
@@ -21,12 +21,9 @@ import runnable.JavaAsyncChild
 import spock.lang.Shared
 
 class NettyExecutorInstrumentationTest extends InstrumentationSpecification {
+  // TODO: check if arm64 can be supported too.
   @Shared
-  boolean isLinux = OperatingSystem.isLinux()
-  @Shared
-  boolean isArm64 = OperatingSystem.isArm64() // TODO: check if arm64 can be supported too.
-  @Shared
-  EpollEventLoopGroup epollEventLoopGroup = isLinux && !isArm64 ? new EpollEventLoopGroup(4) : null
+  EpollEventLoopGroup epollEventLoopGroup = (isLinux() && !isArm64()) ? new EpollEventLoopGroup(4) : null
   @Shared
   DefaultEventExecutorGroup defaultEventExecutorGroup = new DefaultEventExecutorGroup(4)
   @Shared
@@ -280,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,9 +147,8 @@ class StringConcatFactoryCallSiteTest extends InstrumentationSpecification {
     setup:
     StringModule iastModule = Mock(StringModule)
     InstrumentationBridge.registerIastModule(iastModule)
-    // Explicit escape for non-ASCII symbol to make test independent of container settings.
-    final utfConstant = '\uD840\uDDA2' // 𠆢
-    final expected = "${utfConstant}Hello${utfConstant}\u0001${utfConstant}World!."
+    // 𠆢Hello...
+    final expected = '\uD840\uDDA2Hello\uD840\uDDA2\u0001\uD840\uDDA2World!.'
 
     when:
     final result = TestStringConcatFactorySuite.plusWithUtfConstants('Hello', 'World!')
@@ -159,8 +158,8 @@ class StringConcatFactoryCallSiteTest extends InstrumentationSpecification {
     1 * iastModule.onStringConcatFactory(
       expected,
       ['Hello', 'World!'] as String[],
-      "${utfConstant}\u0001\u0002\u0001.",
-      ["${utfConstant}\u0001${utfConstant}"] 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,9 +5,6 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class TestStringConcatFactorySuite {
-  // Explicit escape for non-ASCII symbol to make test independent of container settings.
-  private static final String UTF_CONSTANT = "\uD840\uDDA2"; // 𠆢
-
   private static final Logger LOGGER = LoggerFactory.getLogger(TestStringConcatFactorySuite.class);
 
   private TestStringConcatFactorySuite() {}
@@ -35,8 +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 =
-        UTF_CONSTANT + left + UTF_CONSTANT + "\u0001" + UTF_CONSTANT + right + ".";
+    // 𠆢 + left + ...
+    final String result = "\uD840\uDDA2" + left + "\uD840\uDDA2\u0001\uD840\uDDA2" + right + ".";
     LOGGER.debug("After string plus {}", result);
     return result;
   }