Code review follow-up fixes

Author: ygree

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java

@@ -109,11 +109,11 @@ public static ReferenceMatcher loadStaticMuzzleReferences(
 
   /**
    * @return Class names of helpers to inject into the user's classloader.
-   *     <blockquote>
-   *     <p><b>NOTE:</b> The order matters. If the muzzle check fails with a NoClassDefFoundError
-   *     (as seen in build/reports/muzzle-*.txt), it may be because some helper classes depend on
-   *     each other. In this case, the order must be adjusted accordingly.
-   *     </blockquote>
+   *     <p><b>NOTE:</b> The order of the returned helper classes matters. If a muzzle check fails
+   *     with a NoClassDefFoundError, as logged in build/reports/muzzle-*.txt, it is likely that one
+   *     helper class depends on another that appears later in the list. In this case, the returned
+   *     list must be reordered so that the referred helper class appears before the one that refers
+   *     to it.
    */
   public String[] helperClassNames() {
     return NO_HELPERS;

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

@@ -53,7 +53,7 @@ abstract class OpenAiTest extends InstrumentationSpecification {
     handlers {
       prefix("/$API_VERSION/") {
         def requestBody = request.text
-        def recFile = RequestResponseRecord.requestToFileName(request.method, requestBody.getBytes(Charsets.UTF_8))
+        def recFile = RequestResponseRecord.requestToFileName("POST", requestBody.getBytes(Charsets.UTF_8))
         def rec = cache.get(recFile)
         if (rec == null) {
           String path = request.path
@@ -122,31 +122,30 @@ abstract class OpenAiTest extends InstrumentationSpecification {
   CompletionCreateParams completionCreateParams(boolean json) {
     if (json) {
       CompletionCreateParams.builder()
-          .model("gpt-3.5-turbo-instruct")
-          .prompt("Tell me a story about building the best SDK!")
-          .build()
-
+      .model("gpt-3.5-turbo-instruct")
+      .prompt("Tell me a story about building the best SDK!")
+      .build()
     } else {
       CompletionCreateParams.builder()
-          .model(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT)
-          .prompt("Tell me a story about building the best SDK!")
-          .build()
+      .model(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT)
+      .prompt("Tell me a story about building the best SDK!")
+      .build()
     }
   }
 
   CompletionCreateParams completionCreateStreamedParams(boolean json) {
     if (json) {
       CompletionCreateParams.builder()
-          .model("gpt-3.5-turbo-instruct")
-          .prompt("Tell me a story about building the best SDK!")
-          .streamOptions(ChatCompletionStreamOptions.builder().includeUsage(true).build())
-          .build()
+      .model("gpt-3.5-turbo-instruct")
+      .prompt("Tell me a story about building the best SDK!")
+      .streamOptions(ChatCompletionStreamOptions.builder().includeUsage(true).build())
+      .build()
     } else {
       CompletionCreateParams.builder()
-          .model(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT)
-          .prompt("Tell me a story about building the best SDK!")
-          .streamOptions(ChatCompletionStreamOptions.builder().includeUsage(true).build())
-          .build()
+      .model(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT)
+      .prompt("Tell me a story about building the best SDK!")
+      .streamOptions(ChatCompletionStreamOptions.builder().includeUsage(true).build())
+      .build()
     }
   }
 

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy

@@ -239,7 +239,7 @@ class TagsAssert {
     if (expected instanceof Pattern) {
       assert value =~ expected: "Tag \"$name\": \"${value.toString()}\" does not match pattern \"$expected\""
     } else if (expected instanceof Class) {
-      assert ((Class) expected).isInstance(value): "Tag \"$name\": instance check $expected failed for \"${value.toString()}\" of class \"${value?.class}\""
+      assert ((Class) expected).isInstance(value): "Tag \"$name\": instance check $expected failed for \"${value.toString()}\" of class \"${value.class}\""
     } else if (expected instanceof Closure) {
       assert ((Closure) expected).call(value): "Tag \"$name\": closure call ${expected.toString()} failed with \"$value\""
     } else if (expected instanceof CharSequence) {

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy

@@ -426,7 +426,6 @@ class TestHttpServer implements AutoCloseable {
         this.contentLength = req.contentLength
         this.contentType = req.contentType?.split(";")
         this.body = req.inputStream.bytes
-        this.method = req.method
       }
 
       def getPath() {

dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java

@@ -167,9 +167,8 @@ public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
 
   private CharSequence llmObsSpanName(CoreSpan<?> span) {
     CharSequence operationName = span.getOperationName();
-    CharSequence resourceName = span.getResourceName();
     if ("openai.request".contentEquals(operationName)) {
-      return "OpenAI." + resourceName;
+      return "OpenAI." + span.getResourceName();
     }
     return operationName;
   }