clean up

Author: ygree

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java

@@ -12,7 +12,6 @@
 import com.openai.core.http.StreamResponse;
 import com.openai.models.completions.Completion;
 import com.openai.models.completions.CompletionCreateParams;
-import datadog.context.ContextScope;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
@@ -46,20 +45,17 @@ public static class CreateAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static AgentScope enter(
         @Advice.Argument(0) final CompletionCreateParams params,
-        @Advice.FieldValue("clientOptions") ClientOptions clientOptions,
-        @Advice.Local("llmScope") ContextScope llmScope) {
+        @Advice.FieldValue("clientOptions") ClientOptions clientOptions) {
       AgentSpan span = DECORATE.startSpan(clientOptions);
-      // llmScope = LLMObsContext.attach(span.context());
-      // TODO why would we ever need to activate llmScope in this instrumentation if we never expect
-      // inner llmobs spans
+      // NOTE: skip LLMObsContext.attach(span.context()) here because never expect an inner
+      // LLMObsSpan
       CompletionDecorator.DECORATE.withCompletionCreateParams(span, params);
       return activateSpan(span);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void exit(
         @Advice.Enter final AgentScope scope,
-        @Advice.Local("llmScope") ContextScope llmScope,
         @Advice.Return(readOnly = false) HttpResponseFor<Completion> response,
         @Advice.Thrown final Throwable err) {
       AgentSpan span = scope.span();
@@ -70,7 +66,6 @@ public static void exit(
             HttpResponseWrapper.wrap(response, span, CompletionDecorator.DECORATE::withCompletion);
       }
       scope.close();
-      // llmScope.close();
     }
   }
 

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseDecorator.java

@@ -64,7 +64,7 @@ public void withResponseCreateParams(AgentSpan span, ResponseCreateParams params
               inputMessages.add(LLMObs.LLMMessage.from("system", instructions));
             });
 
-    Optional<String> textOpt = params._input().asString(); // TODO cover with unit tests
+    Optional<String> textOpt = params._input().asString();
     if (textOpt.isPresent()) {
       inputMessages.add(LLMObs.LLMMessage.from("user", textOpt.get()));
     }
@@ -75,7 +75,7 @@ public void withResponseCreateParams(AgentSpan span, ResponseCreateParams params
       if (input.isText()) {
         inputMessages.add(LLMObs.LLMMessage.from("user", input.asText()));
       } else if (input.isResponse()) {
-        List<ResponseInputItem> inputItems = input.asResponse(); // TODO cover with unit tests
+        List<ResponseInputItem> inputItems = input.asResponse();
         for (ResponseInputItem item : inputItems) {
           LLMObs.LLMMessage message = extractInputItemMessage(item);
           if (message != null) {

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

@@ -256,7 +256,8 @@ class ChatCompletionServiceTest extends OpenAiTest {
     assertChatCompletionTrace(true, outputTag)
     and:
     outputTag.size() == 3
-    outputTag.each { msg ->
+    outputTag.each {
+      msg ->
       assert msg.role == "assistant"
       assert msg.content == "Hello, world!"
     }

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

@@ -161,9 +161,8 @@ class ResponseServiceTest extends OpenAiTest {
   }
 
   def "create streaming response with tool input test"() {
-    // Tests the strongly-typed path: ResponseInputItem objects → params._input().asKnown()
     runnableUnderTrace("parent") {
-      StreamResponse<ResponseStreamEvent> streamResponse = openAiClient.responses().createStreaming(responseCreateParamsWithToolInput(true)) // TODO
+      StreamResponse<ResponseStreamEvent> streamResponse = openAiClient.responses().createStreaming(responseCreateParamsWithToolInput(true))
       try (Stream stream = streamResponse.stream()) {
         stream.forEach {
           // consume the stream
@@ -175,17 +174,6 @@ class ResponseServiceTest extends OpenAiTest {
     assertResponseTrace(true, "gpt-4.1", "gpt-4.1-2025-04-14", null)
   }
 
-  // NOTE: responseCreateParamsWithToolInput(true) creates raw JSON via JsonValue.from()
-  // This exercises the asUnknown() → asArray() parsing path in ResponseDecorator
-  // However, it cannot be unit tested here because:
-  // 1. Raw JSON serializes differently than typed objects
-  // 2. No matching HTTP recording exists in the mock backend
-  // 3. The test would fail with InternalServerException
-  //
-  // This path IS tested by the shared integration test:
-  // llm-obs/test/test_openai.py::test_responses_create_tool_input
-  // which represents the real cross-language use case (Python → Java test server)
-
   private void assertResponseTrace(boolean isStreaming, String reqModel, String respModel, Map reasoning) {
     assertTraces(1) {
       trace(3) {
@@ -207,7 +195,7 @@ class ResponseServiceTest extends OpenAiTest {
             "_ml_obs_tag.model_name" String
             "_ml_obs_tag.metadata" Map
             "_ml_obs_tag.input" List
-            "_ml_obs_tag.output" List // TODO capture to validate tool calls
+            "_ml_obs_tag.output" List
             "_ml_obs_metric.input_tokens" Long
             "_ml_obs_metric.output_tokens" Long
             "_ml_obs_metric.total_tokens" Long