skip openai-java on arm64

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/groovy/OpenAiTest.groovy

@@ -1,5 +1,3 @@
-import static datadog.environment.OperatingSystem.isArm64
-
 import com.google.common.base.Charsets
 import com.google.common.base.Strings
 import com.openai.client.OpenAIClient
@@ -69,15 +67,6 @@ abstract class OpenAiTest extends InstrumentationSpecification {
           def subpath = path.substring(API_VERSION.length() + 2)
           def recsDir = RECORDS_DIR.resolve(subpath)
           def recPath = recsDir.resolve(recFile)
-
-          // TODO: Codex generated patch to pass under arm64, revisit later.
-          if (!recPath.toFile().exists()) {
-            recPath = RequestResponseRecord.findEquivalentRequestRecord(
-            RECORDS_DIR,
-            "POST",
-            subpath,
-            requestBody.getBytes(Charsets.UTF_8))
-          }
           if (!recPath.toFile().exists()) {
             throw new RuntimeException("The record file: '" + recFile + "' is NOT found at " + RECORDS_DIR + ". Set OpenAiTest.OPENAI_TOKEN to make a real request and store the record.")
           } else {

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/RequestResponseRecord.java

@@ -1,4 +1,3 @@
-import com.openai.core.ObjectMappers;
 import com.openai.core.http.Headers;
 import com.openai.core.http.HttpRequest;
 import com.openai.core.http.HttpRequestBody;
@@ -11,10 +10,8 @@
 import java.nio.file.Path;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.security.MessageDigest;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 public class RequestResponseRecord {
   /**
@@ -36,7 +33,6 @@ public class RequestResponseRecord {
   private static final String END_RESPONSE_BODY = "-- end response body --";
   private static final String KEY_VALUE_SEP = ": ";
   private static final char LINE_SEP = '\n';
-  private static final Object UNPARSEABLE = new Object();
 
   public final int status;
   public final Map<String, String> headers;
@@ -75,28 +71,6 @@ public static boolean exists(Path recordsDir, HttpRequest request) {
     return filePath.toFile().exists();
   }
 
-  // TODO: Codex generated patch to pass under arm64, revisit later.
-  public static Path findEquivalentRequestRecord(
-      Path recordsDir, String method, String path, byte[] requestBody) {
-    Path targetDir = recordsDir.resolve(path);
-    if (!Files.isDirectory(targetDir)) {
-      return null;
-    }
-
-    Object requestJson = tryParseJson(new String(requestBody, StandardCharsets.UTF_8));
-    try (Stream<Path> files = Files.list(targetDir)) {
-      return files
-          .filter(Files::isRegularFile)
-          .filter(file -> file.getFileName().toString().endsWith("." + method + ".rec"))
-          .sorted(Comparator.comparing(Path::toString))
-          .filter(file -> requestBodiesEquivalent(requestJson, requestBody, file))
-          .findFirst()
-          .orElse(null);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   private static ByteArrayOutputStream readRequestBody(HttpRequest request) {
     ByteArrayOutputStream requestBodyBytes = new ByteArrayOutputStream();
     try (HttpRequestBody requestBody = request.body()) {
@@ -215,51 +189,4 @@ public static RequestResponseRecord read(Path recFilePath) {
     byte[] body = bodyBuilder.toString().getBytes(StandardCharsets.UTF_8);
     return new RequestResponseRecord(statusCode, headers, body);
   }
-
-  // TODO: Codex generated patch to pass under arm64, revisit later.
-  public static String readRecordedRequestBody(Path recFilePath) {
-    StringBuilder bodyBuilder = new StringBuilder();
-
-    try {
-      List<String> lines = Files.readAllLines(recFilePath, StandardCharsets.UTF_8);
-      boolean inRequestBody = false;
-
-      for (String line : lines) {
-        if (line.equals(BEGIN_REQUEST_BODY)) {
-          inRequestBody = true;
-        } else if (line.equals(END_REQUEST_BODY)) {
-          inRequestBody = false;
-        } else if (inRequestBody) {
-          if (bodyBuilder.length() > 0) {
-            bodyBuilder.append(LINE_SEP);
-          }
-          bodyBuilder.append(line);
-        }
-      }
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-
-    return bodyBuilder.toString();
-  }
-
-  private static boolean requestBodiesEquivalent(
-      Object requestJson, byte[] requestBody, Path file) {
-    String recordedRequestBody = readRecordedRequestBody(file);
-    Object recordedRequestJson = tryParseJson(recordedRequestBody);
-
-    if (requestJson != UNPARSEABLE && recordedRequestJson != UNPARSEABLE) {
-      return requestJson.equals(recordedRequestJson);
-    }
-
-    return recordedRequestBody.equals(new String(requestBody, StandardCharsets.UTF_8));
-  }
-
-  private static Object tryParseJson(String requestBody) {
-    try {
-      return ObjectMappers.jsonMapper().readValue(requestBody, Object.class);
-    } catch (Exception e) {
-      return UNPARSEABLE;
-    }
-  }
 }

settings.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Locale.getDefault
+
 pluginManagement {
   repositories {
     mavenLocal()
@@ -489,7 +491,6 @@ include(
   ":dd-java-agent:instrumentation:ognl-appsec-3.3.2",
   ":dd-java-agent:instrumentation:okhttp:okhttp-2.2",
   ":dd-java-agent:instrumentation:okhttp:okhttp-3.0",
-  ":dd-java-agent:instrumentation:openai-java:openai-java-3.0",
   ":dd-java-agent:instrumentation:opensearch:opensearch-rest-1.0",
   ":dd-java-agent:instrumentation:opensearch:opensearch-transport-1.0",
   ":dd-java-agent:instrumentation:opensearch:opensearch-common",
@@ -636,6 +637,18 @@ include(
   ":dd-java-agent:instrumentation:zio:zio-2.0",
 )
 
+val os = System.getProperty("os.name").lowercase(getDefault())
+val arch = System.getProperty("os.arch").lowercase(getDefault())
+val arm64 = arch.contains("aarch64") || arch.contains("arm64")
+val skipLinuxArm64Tests = os.contains("linux") && arm64
+
+// TODO: skip `openai-java-3.0` on arm64 Linux for now
+// it is failing in strange way
+if (!skipLinuxArm64Tests) {
+  include(
+    ":dd-java-agent:instrumentation:openai-java:openai-java-3.0"
+  )
+}
 // Optional `akka-http-10.6` instrumentation (see BUILDING.md for how to enable it):
 if (providers.gradleProperty("akkaRepositoryToken").getOrElse("").isNotBlank()) {
   include(